summaryrefslogtreecommitdiff
path: root/apps/dbtree.c
diff options
context:
space:
mode:
authorJean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>2005-02-12 12:29:41 +0000
committerJean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>2005-02-12 12:29:41 +0000
commit8758713f84bb731e03b080cb984275608369c9ca (patch)
tree01ba3a6042c16cf0f143d9d4719cc743eac5d504 /apps/dbtree.c
parent39eb8e134f4dc8b5005c88100718b38ed8f706d0 (diff)
downloadrockbox-8758713f84bb731e03b080cb984275608369c9ca.tar.gz
rockbox-8758713f84bb731e03b080cb984275608369c9ca.zip
long policy
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5931 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/dbtree.c')
-rw-r--r--apps/dbtree.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/dbtree.c b/apps/dbtree.c
index ea561eddc4..1b2cabf783 100644
--- a/apps/dbtree.c
+++ b/apps/dbtree.c
@@ -131,9 +131,9 @@ int db_load(struct tree_context* c)
131 int i, offset, rc; 131 int i, offset, rc;
132 int dcachesize = global_settings.max_files_in_dir * sizeof(struct entry); 132 int dcachesize = global_settings.max_files_in_dir * sizeof(struct entry);
133 int itemcount, stringlen, hits=0; 133 int itemcount, stringlen, hits=0;
134 unsigned int* nptr = (void*) c->name_buffer; 134 unsigned long* nptr = (void*) c->name_buffer;
135 unsigned int* dptr = c->dircache; 135 unsigned long* dptr = c->dircache;
136 unsigned int* safeplace = NULL; 136 unsigned long* safeplace = NULL;
137 int safeplacelen = 0; 137 int safeplacelen = 0;
138 138
139 int table = c->currtable; 139 int table = c->currtable;
@@ -169,7 +169,7 @@ int db_load(struct tree_context* c)
169 169
170 for (i=0; i < 4; i++) { 170 for (i=0; i < 4; i++) {
171 strcpy(nbuf, labels[i]); 171 strcpy(nbuf, labels[i]);
172 dptr[0] = (unsigned int)nbuf; 172 dptr[0] = (unsigned long)nbuf;
173 dptr[1] = tables[i]; 173 dptr[1] = tables[i];
174 nbuf += strlen(nbuf) + 1; 174 nbuf += strlen(nbuf) + 1;
175 dptr += 2; 175 dptr += 2;
@@ -189,7 +189,7 @@ int db_load(struct tree_context* c)
189 189
190 for (i=0; i < 3; i++) { 190 for (i=0; i < 3; i++) {
191 strcpy(nbuf, labels[i]); 191 strcpy(nbuf, labels[i]);
192 dptr[0] = (unsigned int)nbuf; 192 dptr[0] = (unsigned long)nbuf;
193 dptr[1] = tables[i]; 193 dptr[1] = tables[i];
194 nbuf += strlen(nbuf) + 1; 194 nbuf += strlen(nbuf) + 1;
195 dptr += 2; 195 dptr += 2;
@@ -345,7 +345,7 @@ int db_load(struct tree_context* c)
345 } 345 }
346 346
347 /* store name pointer in dir cache */ 347 /* store name pointer in dir cache */
348 dptr[0] = (unsigned int)nptr; 348 dptr[0] = (unsigned long)nptr;
349 349
350 if (skip) 350 if (skip)
351 lseek(fd, skip, SEEK_CUR); 351 lseek(fd, skip, SEEK_CUR);
@@ -374,7 +374,7 @@ int db_load(struct tree_context* c)
374 374
375 if (c->currtable == albums4artist && !c->dirfull) { 375 if (c->currtable == albums4artist && !c->dirfull) {
376 strcpy((char*)nptr, str(LANG_ID3DB_ALL_SONGS)); 376 strcpy((char*)nptr, str(LANG_ID3DB_ALL_SONGS));
377 dptr[0] = (unsigned int)nptr; 377 dptr[0] = (unsigned long)nptr;
378 dptr[1] = extra; /* offset to artist */ 378 dptr[1] = extra; /* offset to artist */
379 hits++; 379 hits++;
380 } 380 }
@@ -560,7 +560,7 @@ static int db_play_folder(struct tree_context* c)
560 lseek(fd, pathoffset, SEEK_SET); 560 lseek(fd, pathoffset, SEEK_SET);
561 rc = read(fd, buf, sizeof(buf)); 561 rc = read(fd, buf, sizeof(buf));
562 if (rc < songlen) { 562 if (rc < songlen) {
563 DEBUGF("short path read(%d) = %d\n", sizeof(buf), rc); 563 DEBUGF("short path read(%ld) = %d\n", sizeof(buf), rc);
564 return -2; 564 return -2;
565 } 565 }
566 566