From 98ed5ed17a246e01805b6d187bdfc445fe7d0f7b Mon Sep 17 00:00:00 2001
From: Felix Arends <edx@rockbox.org>
Date: Sun, 28 Apr 2002 19:27:16 +0000
Subject: [PATCH] renamed file-win32.c/h to dir-win32.c/h corrected function
 definition for directory access functions.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@302 a1c6a512-1295-4272-9138-f99709370657
---
 .../win32/{file-win32.c => dir-win32.c}       |  15 +++++++--------
 .../win32/{file-win32.h => dir-win32.h}       |  17 +----------------
 uisimulator/win32/uisw32.suo                  | Bin 9728 -> 11264 bytes
 uisimulator/win32/uisw32.vcproj               |   6 +++---
 4 files changed, 11 insertions(+), 27 deletions(-)
 rename uisimulator/win32/{file-win32.c => dir-win32.c} (89%)
 rename uisimulator/win32/{file-win32.h => dir-win32.h} (70%)

diff --git a/uisimulator/win32/file-win32.c b/uisimulator/win32/dir-win32.c
similarity index 89%
rename from uisimulator/win32/file-win32.c
rename to uisimulator/win32/dir-win32.c
index 57431e92a2..3a30d57ae1 100644
--- a/uisimulator/win32/file-win32.c
+++ b/uisimulator/win32/dir-win32.c
@@ -19,8 +19,8 @@
 
 #include <io.h>
 #include <malloc.h>
-#include "file-win32.h"
-#include "file.h"
+#include "dir-win32.h"
+#include "dir.h"
 
 // Directory operations
 //
@@ -36,7 +36,7 @@ DIR *opendir (
     if ((p->handle = _findfirst (dirname, &fd)) == -1)
     {
         free (p);
-        return NULL;
+        return 0;
     }
     return p;
 }
@@ -53,14 +53,13 @@ int closedir (
 
 // read dir
 // read next entry in directory
-dirent *readdir (
-                 DIR *dir
-                 )
+struct dirent *readdir (
+                        DIR *dir
+                        )
 {
     struct _finddata_t fd;
     if (_findnext (dir->handle, &fd) == -1)
-        return NULL;
+        return 0;
     memcpy (dir->fd.d_name, fd.name, 256);
-    dir->fd.d_reclen = sizeof (dirent);
     return &dir->fd;
 }
\ No newline at end of file
diff --git a/uisimulator/win32/file-win32.h b/uisimulator/win32/dir-win32.h
similarity index 70%
rename from uisimulator/win32/file-win32.h
rename to uisimulator/win32/dir-win32.h
index a89ee4319d..e51dfba747 100644
--- a/uisimulator/win32/file-win32.h
+++ b/uisimulator/win32/dir-win32.h
@@ -21,22 +21,7 @@
 #define __FILE_WIN32_H__
 
 #include <io.h>
+#include "dir.h"
 
-struct direnttag
-{
-    long            d_ino; /* inode number */
-    long            d_off; /* offset to the next dirent */
-    unsigned short  d_reclen;/* length of this record */
-    unsigned char   d_type; /* type of file */
-    char            d_name[256]; /* filename */
-};
-typedef struct direnttag dirent;
-
-struct DIRtag
-{
-    dirent          fd;
-    intptr_t        handle;
-};
-typedef struct DIRtag DIR;
 
 #endif // #ifndef __FILE_WIN32_H__
\ No newline at end of file
diff --git a/uisimulator/win32/uisw32.suo b/uisimulator/win32/uisw32.suo
index fa961efe48979e9f459a62bedaa44bcbd440f034..b14fa237287e103089020dad68578d2fea27a1f2 100644
GIT binary patch
delta 841
zcmaKoPe@cz6vofJZwB5t&J#yttj2NXjoGLf>G%f(qmd>EMIEiivCK^Ee+sow3{tnX
zNzW<-aS^nYxe&Qi+z4)T*P>-qw1~ik)uQM3L}kbs@8fsxJ@?#qzVDvt_UYcG%hKf~
zq9RbNVp54Y#}i|5T)z78b5&?KrPFHC@j*`YVcP*ZK^I7XZg34e2G_w2kOaLT1@3^G
z;1=iyx4{7TXIa)D*1KQ`41*DH58MY2z(eo|*muEfPa>`V)?`|$zwQN5T_#Cuuavm3
zH<sEe<vL=qAD<I1C`NU3#YsA^dCoW^NO*b6Q#5BxNVl6OjhEt!`eS_70`n!v4Z_G%
z{BQxEJ=bGy#Q9sb?VZW<1+&Yk*QIgc3*|_D3$%!!nLT-Elz#;_xF9s^d<V5twnP3H
zdc!-x68^5|pBP3Xo>2{rV;!X^T%D&Oer~3CQ!g((lI1b8))&q$sgmJV5%JMiZB*tF
zSyqK4k*kLdwi6dDp%WN(<hM5`?df1hYCh;QU-G}tVQHl-8LO>}qE3eP*<-X({;)2^
zsR<V1yl7tJKGSgSJsHm&LzLzUM*&~;FXT`*N>fe$=|+y%t;%@Ma)ur%$!I;t^alRq
Q$#)sB7zV{^wY*yF0w3a}u>b%7

delta 412
zcmZpOXz<zK!o>J*W8iwmi3vQDSaSFdX#Z@U^6nrbGXoHaZmwe4#w7di|NsAfK(0R!
z2LN#(5C;J<Nc`W#z|EUDelRofFmC?EJ&#dag^7XLX9Xir8VojguV6d@<iiAX7^@i^
z8H^a*SQ%I+ALdnM6$dGse34gp5?=+=b+*Y>e07WyHvi<i!z@=V0hCH)NM^_dYA^so
z5NQG=&4A*Sn?DORa*3;Aw{CN{tSh6q8V<?la<+^L>ewYA4rOA{nfyWS^kja;iL6_J
zwi$t3IC+QSgvrlkgeE(vZ}K)V1-e3<;Tdxt6Bh%+|Nmg)_QAZ#u)%vD(BJ#u{<Z-5
dTLZh5o5Piz7$*yJs56>wzN)3oIQapK2mr5EW)=Vd

diff --git a/uisimulator/win32/uisw32.vcproj b/uisimulator/win32/uisw32.vcproj
index 00d87f610b..4419bef715 100644
--- a/uisimulator/win32/uisw32.vcproj
+++ b/uisimulator/win32/uisw32.vcproj
@@ -115,6 +115,9 @@
 			<File
 				RelativePath="..\..\firmware\chartables.c">
 			</File>
+			<File
+				RelativePath="dir-win32.c">
+			</File>
 			<File
 				RelativePath="kernel.c">
 			</File>
@@ -134,9 +137,6 @@
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc">
-			<File
-				RelativePath="file-win32.h">
-			</File>
 			<File
 				RelativePath="lcd-win32.h">
 			</File>