From 011a325e32c05f6e4817dcdc555615e6b7b6c102 Mon Sep 17 00:00:00 2001
From: Kevin Ferrare <kevin@rockbox.org>
Date: Fri, 20 Jul 2007 17:06:55 +0000
Subject: 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
---
 apps/plugins/doom/rockdoom.c   |  8 ++++----
 apps/plugins/doom/rockmacros.h | 11 +----------
 2 files changed, 5 insertions(+), 14 deletions(-)

(limited to 'apps/plugins/doom')

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
    char           *startpt;
    struct menu_item *temp;
 
-   filedir=opendir(directory);
+   filedir=rb->opendir(directory);
 
    if(filedir==NULL)
    {
@@ -345,8 +345,8 @@ int Dbuild_filelistm(struct menu_item **names, char *firstentry, char *directory
       i++;
 
    // Reset the directory
-   closedir(filedir);
-   filedir=opendir(directory);
+   rb->closedir(filedir);
+   filedir=rb->opendir(directory);
 
    i++;
    temp=malloc(i*sizeof(struct opt_items));
@@ -365,7 +365,7 @@ int Dbuild_filelistm(struct menu_item **names, char *firstentry, char *directory
          i++;
       }
    }
-   closedir(filedir);
+   rb->closedir(filedir);
    *names=temp;
    return i;
 }
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 );
 #define read_line(a,b,c)   rb->read_line((a),(b),(c))
 
 #ifdef SIMULATOR
-#undef opendir
-#undef closedir
-#undef mkdir
 #undef open
 #undef lseek
 #undef filesize
-#define opendir(a)         rb->sim_opendir((a))
-#define closedir(a)        rb->sim_closedir((a))
-#define mkdir(a)           rb->sim_mkdir((a))
 #define open(a,b)          rb->sim_open((a),(b))
 #define lseek(a,b,c)       rb->sim_lseek((a),(b),(c))
 #define filesize(a)        rb->sim_filesize((a))
 #else /* !SIMULATOR */
-#define opendir(a)         rb->opendir((a))
-#define closedir(a)        rb->closedir((a))
-#define filesize(a)        rb->filesize((a))
-#define mkdir(a)           rb->mkdir((a))
 #define open(a,b)          my_open((a),(b))
 #define close(a)           my_close((a))
 #define lseek(a,b,c)       rb->lseek((a),(b),(c))
+#define filesize(a)        rb->filesize((a))
 #endif /* !SIMULATOR */
 
 #define strtok(a,b)        my_strtok((a),(b))
-- 
cgit v1.2.3