summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-09-01 21:45:58 +0000
committerThomas Martitz <kugel@rockbox.org>2010-09-01 21:45:58 +0000
commiteac36d5a097c0c91ba7204cccc6001bf5bec2513 (patch)
treeef90c0f0abd27ab2c354ab8dff842d36849c7f2d
parentdc8ad8684c48e60b45bdbf2bd837941e2172a476 (diff)
downloadrockbox-eac36d5a097c0c91ba7204cccc6001bf5bec2513.tar.gz
rockbox-eac36d5a097c0c91ba7204cccc6001bf5bec2513.zip
struct DIR -> DIR, should fix most if not all reds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27970 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugin.h2
-rw-r--r--firmware/common/filefuncs.c2
-rw-r--r--firmware/export/filefuncs.h3
-rw-r--r--firmware/include/dircache.h1
4 files changed, 5 insertions, 3 deletions
diff --git a/apps/plugin.h b/apps/plugin.h
index ddd913088f..bafd4070f6 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -894,7 +894,7 @@ struct plugin_api {
894 894
895 /* new stuff at the end, sort into place next time 895 /* new stuff at the end, sort into place next time
896 the API gets incompatible */ 896 the API gets incompatible */
897 struct dirinfo (*dir_get_info)(struct DIR* parent, struct dirent *entry); 897 struct dirinfo (*dir_get_info)(DIR* parent, struct dirent *entry);
898}; 898};
899 899
900/* plugin header */ 900/* plugin header */
diff --git a/firmware/common/filefuncs.c b/firmware/common/filefuncs.c
index c8ab468bcb..ea5984e485 100644
--- a/firmware/common/filefuncs.c
+++ b/firmware/common/filefuncs.c
@@ -90,7 +90,7 @@ bool dir_exists(const char *path)
90} 90}
91 91
92#if !(CONFIG_PLATFORM & PLATFORM_ANDROID) 92#if !(CONFIG_PLATFORM & PLATFORM_ANDROID)
93struct dirinfo dir_get_info(struct DIR* parent, struct dirent *entry) 93struct dirinfo dir_get_info(DIR* parent, struct dirent *entry)
94{ 94{
95 (void)parent; 95 (void)parent;
96 return entry->info; 96 return entry->info;
diff --git a/firmware/export/filefuncs.h b/firmware/export/filefuncs.h
index f69c6da29c..3d4e73ad9f 100644
--- a/firmware/export/filefuncs.h
+++ b/firmware/export/filefuncs.h
@@ -24,6 +24,7 @@
24 24
25#include <stdbool.h> 25#include <stdbool.h>
26#include "config.h" 26#include "config.h"
27#include "file.h"
27#include "dir.h" 28#include "dir.h"
28 29
29#ifdef HAVE_MULTIVOLUME 30#ifdef HAVE_MULTIVOLUME
@@ -34,6 +35,6 @@ int strip_volume(const char* name, char* namecopy);
34bool file_exists(const char *file); 35bool file_exists(const char *file);
35bool dir_exists(const char *path); 36bool dir_exists(const char *path);
36#endif 37#endif
37extern struct dirinfo dir_get_info(struct DIR* parent, struct dirent *entry); 38extern struct dirinfo dir_get_info(DIR* parent, struct dirent *entry);
38 39
39#endif /* __INCLUDE_FILEFUNCS_H_ */ 40#endif /* __INCLUDE_FILEFUNCS_H_ */
diff --git a/firmware/include/dircache.h b/firmware/include/dircache.h
index 37a803c63c..87aaa008a7 100644
--- a/firmware/include/dircache.h
+++ b/firmware/include/dircache.h
@@ -21,6 +21,7 @@
21#ifndef _DIRCACHE_H 21#ifndef _DIRCACHE_H
22#define _DIRCACHE_H 22#define _DIRCACHE_H
23 23
24#include "config.h"
24#include "dir_uncached.h" 25#include "dir_uncached.h"
25 26
26#ifdef HAVE_DIRCACHE 27#ifdef HAVE_DIRCACHE