Changeset 1153 for trunk

Timestamp:

04/24/11 04:52:52 (2 years ago)

Author:

reyalP

Message:

include stdlib.h in wrappers to keep prototypes in sync and avoid duplicating structures

Location:

trunk

Files:

• include/lolevel.h (modified) (3 diffs)
• include/stdlib.h (modified) (1 diff)
• platform/generic/wrappers.c (modified) (10 diffs)

trunk/include/lolevel.h

@@ -72 +72 @@
 extern int _Open (const char *name, int flags, int mode );
 extern int _Close (int fd);
-extern int _Write (int fd, void *buffer, long nbytes);
+extern int _Write (int fd, const void *buffer, long nbytes);
 extern int _Read (int fd, void *buffer, long nbytes);
 extern int _Lseek (int fd, long offset, int whence);
@@ -221 +221 @@
 
 /* time */
-extern int _utime(char *file, void *newTimes);
+extern int _utime(const char *file, void *newTimes);
 extern unsigned long _time(unsigned long *timer);
 extern void *_localtime(const unsigned long *_tod);
@@ -241 +241 @@
 extern int   _closedir(void *d);
 extern void  _rewinddir(void *d);
-extern int   _stat(char *name, void *pStat);
+extern int   _stat(const char *name, void *pStat);
 extern unsigned long _GetDrive_ClusterSize(int drive);
 extern unsigned long _GetDrive_TotalClusters(int drive);

trunk/include/stdlib.h

@@ -232 +232 @@
 typedef struct {
     DIR_dryos *dh;
+    union {
+        struct dirent de;
 #ifdef CAM_DRYOS_2_3_R39
-    char de_buf[64];
-#else
-    char de_buf[40];
-#endif
+        char de_buf[64];
+#else
+        char de_buf[40];
+#endif
+    };
 } DIR;
 #endif

trunk/platform/generic/wrappers.c

@@ -5 +5 @@
 #include "math.h"
 #include "levent.h"
+#include "stdlib.h"
 
 //----------------------------------------------------------------------------
@@ -95 +96 @@
 
 #ifndef CAM_DRYOS
-void task_lock()
-{
-    _taskLock();
-}
-
-void task_unlock()
-{
-    _taskUnlock();
+long task_lock()
+{
+    return _taskLock();
+}
+
+long task_unlock()
+{
+    return _taskUnlock();
 }
 
@@ -338 +339 @@
 }
 
-int write (int fd, void *buffer, long nbytes)
+int write (int fd, const void *buffer, long nbytes)
 {
     return _Write(fd, buffer, nbytes);
@@ -365 +366 @@
 // directory wrappers
 #ifndef CAM_DRYOS
-void *opendir(const char* name) {
+DIR *opendir(const char* name) {
     return _opendir(name);
 }
-void* readdir(void *d) {
+struct dirent* readdir(DIR *d) {
     return _readdir(d);
 }
-int closedir(void *d) {
+int closedir(DIR *d) {
     return _closedir(d);
 }
 
-void rewinddir(void *d) {
+void rewinddir(DIR *d) {
     return _rewinddir(d);
 }
 #else // dryos
-// TODO duplicated in stdlib.h!
-// structure returned by dryos
-// actual size may vary depending on version
-typedef struct {
-    int fh;
-    int unk[4];
-} DIR_dryos;
-
-// struct returned by our wrappers around opendir
-typedef struct {
-    DIR_dryos *dh;
-#ifdef CAM_DRYOS_2_3_R39
-    char de_buf[64];
-#else
-    char de_buf[40];
-#endif
-} DIR;
-
 DIR *opendir(const char* name) {
     DIR *d;
@@ -406 +389 @@
     if(!d) {
         _closedir(dh);
-        return (void *)0;
+        return NULL;
     }
     d->dh = dh;
@@ -412 +395 @@
 }
 
-void* readdir(DIR *d) {
+struct dirent * readdir(DIR *d) {
   _ReadFastDir(d->dh, d->de_buf);
-  return d->de_buf[0]? d->de_buf : (void*)0;
+  return d->de_buf[0]? &d->de : NULL;
 }
 
@@ -435 +418 @@
 #endif // dryos dir functions
 
-int stat(char *name, void *pStat) {
+int stat(const char *name, struct stat *pStat) {
     return _stat(name, pStat);
 }
 
-long fopen(const char *filename, const char *mode) {
+FILE *fopen(const char *filename, const char *mode) {
 #ifdef CAM_DRYOS
     if(!filename || filename[0]!='A') {
-        return 0;
+        return NULL;
     }
 #endif
-    return _Fopen_Fut(filename,mode);
-}
-
-long fclose(long f) {
+    return (FILE *)_Fopen_Fut(filename,mode);
+}
+
+long fclose(FILE *f) {
     return _Fclose_Fut((long)f);
 }
 
-long fread(void *buf, long elsize, long count, long f) {
+long fread(void *buf, long elsize, long count, FILE *f) {
     return _Fread_Fut(buf,elsize,count,(long)f);
 }
 
-long fwrite(const void *buf, long elsize, long count, long f) {
+long fwrite(const void *buf, long elsize, long count, FILE *f) {
     return _Fwrite_Fut(buf,elsize,count,(long)f);
 }
 
-long fseek(long file, long offset, long whence) {
+long fseek(FILE *file, long offset, long whence) {
     return _Fseek_Fut((long)file,offset,whence);
 }
 
-long feof(long file) {
+long feof(FILE * file) {
     return _Feof_Fut((long)file);
 }
 
-long fflush(long file) {
+long fflush(FILE * file) {
     return _Fflush_Fut((long)file);
 }
 
-char *fgets(char *buf, int n, long f) {
+char *fgets(char *buf, int n, FILE *f) {
     return _Fgets_Fut(buf,n,(int)f);
 }
 
-long rename(const char *oldname, const char *newname) {
+int rename(const char *oldname, const char *newname) {
  return _RenameFile_Fut(oldname, newname);
 }
@@ -605 +588 @@
 }
 
-int utime(char *file, void *newTimes) {
+int utime(const char *file, struct utimbuf *newTimes) {
 #if !CAM_DRYOS
   return _utime(file, newTimes);
@@ -629 +612 @@
 }
 
-void *localtime(const unsigned long *_tod) {
+struct tm *localtime(const unsigned long *_tod) {
 #if !CAM_DRYOS
     return _localtime(_tod);
@@ -639 +622 @@
 }
 
-long strftime(char *s, unsigned long maxsize, const char *format, /*const struct tm*/ void *timp) {
+long strftime(char *s, unsigned long maxsize, const char *format, const struct tm *timp) {
         return _strftime(s,maxsize,format,timp);
 }
 
-/*time_t*/ long mktime(/*struct tm*/ void *timp) {
+time_t mktime(struct tm *timp) {
 #if !CAM_DRYOS
         return _mktime(timp);