diff options
author | Kevin Ferrare <kevin@rockbox.org> | 2007-07-20 17:06:55 +0000 |
---|---|---|
committer | Kevin Ferrare <kevin@rockbox.org> | 2007-07-20 17:06:55 +0000 |
commit | 011a325e32c05f6e4817dcdc555615e6b7b6c102 (patch) | |
tree | ab22ab91b99524dba823cda861b17520db030911 /apps/plugins/doom | |
parent | 930278bcc0fd944ec50f30074b53b4c7cf0e3ccf (diff) | |
download | rockbox-011a325e32c05f6e4817dcdc555615e6b7b6c102.tar.gz rockbox-011a325e32c05f6e4817dcdc555615e6b7b6c102.zip |
Makes apps and plugins interract with directories using a posix-like api instead of calling dircache / simulator functions (no additionnal layer added, only a cosmetic change)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13943 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/doom')
-rw-r--r-- | apps/plugins/doom/rockdoom.c | 8 | ||||
-rw-r--r-- | apps/plugins/doom/rockmacros.h | 11 |
2 files changed, 5 insertions, 14 deletions
diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c index 90c446b9eb..a9e348160f 100644 --- a/apps/plugins/doom/rockdoom.c +++ b/apps/plugins/doom/rockdoom.c | |||
@@ -329,7 +329,7 @@ int Dbuild_filelistm(struct menu_item **names, char *firstentry, char *directory | |||
329 | char *startpt; | 329 | char *startpt; |
330 | struct menu_item *temp; | 330 | struct menu_item *temp; |
331 | 331 | ||
332 | filedir=opendir(directory); | 332 | filedir=rb->opendir(directory); |
333 | 333 | ||
334 | if(filedir==NULL) | 334 | if(filedir==NULL) |
335 | { | 335 | { |
@@ -345,8 +345,8 @@ int Dbuild_filelistm(struct menu_item **names, char *firstentry, char *directory | |||
345 | i++; | 345 | i++; |
346 | 346 | ||
347 | // Reset the directory | 347 | // Reset the directory |
348 | closedir(filedir); | 348 | rb->closedir(filedir); |
349 | filedir=opendir(directory); | 349 | filedir=rb->opendir(directory); |
350 | 350 | ||
351 | i++; | 351 | i++; |
352 | temp=malloc(i*sizeof(struct opt_items)); | 352 | temp=malloc(i*sizeof(struct opt_items)); |
@@ -365,7 +365,7 @@ int Dbuild_filelistm(struct menu_item **names, char *firstentry, char *directory | |||
365 | i++; | 365 | i++; |
366 | } | 366 | } |
367 | } | 367 | } |
368 | closedir(filedir); | 368 | rb->closedir(filedir); |
369 | *names=temp; | 369 | *names=temp; |
370 | return i; | 370 | return i; |
371 | } | 371 | } |
diff --git a/apps/plugins/doom/rockmacros.h b/apps/plugins/doom/rockmacros.h index 86de4cbe13..1541ef48fd 100644 --- a/apps/plugins/doom/rockmacros.h +++ b/apps/plugins/doom/rockmacros.h | |||
@@ -40,26 +40,17 @@ char *my_strtok( char * s, const char * delim ); | |||
40 | #define read_line(a,b,c) rb->read_line((a),(b),(c)) | 40 | #define read_line(a,b,c) rb->read_line((a),(b),(c)) |
41 | 41 | ||
42 | #ifdef SIMULATOR | 42 | #ifdef SIMULATOR |
43 | #undef opendir | ||
44 | #undef closedir | ||
45 | #undef mkdir | ||
46 | #undef open | 43 | #undef open |
47 | #undef lseek | 44 | #undef lseek |
48 | #undef filesize | 45 | #undef filesize |
49 | #define opendir(a) rb->sim_opendir((a)) | ||
50 | #define closedir(a) rb->sim_closedir((a)) | ||
51 | #define mkdir(a) rb->sim_mkdir((a)) | ||
52 | #define open(a,b) rb->sim_open((a),(b)) | 46 | #define open(a,b) rb->sim_open((a),(b)) |
53 | #define lseek(a,b,c) rb->sim_lseek((a),(b),(c)) | 47 | #define lseek(a,b,c) rb->sim_lseek((a),(b),(c)) |
54 | #define filesize(a) rb->sim_filesize((a)) | 48 | #define filesize(a) rb->sim_filesize((a)) |
55 | #else /* !SIMULATOR */ | 49 | #else /* !SIMULATOR */ |
56 | #define opendir(a) rb->opendir((a)) | ||
57 | #define closedir(a) rb->closedir((a)) | ||
58 | #define filesize(a) rb->filesize((a)) | ||
59 | #define mkdir(a) rb->mkdir((a)) | ||
60 | #define open(a,b) my_open((a),(b)) | 50 | #define open(a,b) my_open((a),(b)) |
61 | #define close(a) my_close((a)) | 51 | #define close(a) my_close((a)) |
62 | #define lseek(a,b,c) rb->lseek((a),(b),(c)) | 52 | #define lseek(a,b,c) rb->lseek((a),(b),(c)) |
53 | #define filesize(a) rb->filesize((a)) | ||
63 | #endif /* !SIMULATOR */ | 54 | #endif /* !SIMULATOR */ |
64 | 55 | ||
65 | #define strtok(a,b) my_strtok((a),(b)) | 56 | #define strtok(a,b) my_strtok((a),(b)) |