Changeset 1119

Timestamp:

04/02/11 02:47:42 (2 years ago)

Author:

reyalP

Message:

stidio inline cleanup from philmoz in ​http://chdk.setepontos.com/index.php?topic=650.msg63691#msg63691

Location:

trunk

Files:

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

trunk/core/main.c

@@ -179 +179 @@
     }
 }
+
+long ftell(FILE *file) {
+    if(!file) return -1;
+    return file->pos;
+}

trunk/include/stdlib.h

@@ -137 +137 @@
 extern long taskUnlock();
 
-extern long Fopen_Fut(const char *filename, const char *mode);
-extern long Fclose_Fut(long file);
-extern long Fread_Fut(void *buf, long elsize, long count, long f);
-extern long Fwrite_Fut(const void *buf, long elsize, long count, long f);
-extern long Fseek_Fut(long file, long offset, long whence);
 // TODO can we just use these all the time ?
 extern long RenameFile_Fut(const char *oldname, const char *newname);
 extern long MakeDirectory_Fut(const char *name);
 extern long DeleteFile_Fut(const char *name);
-extern long Feof_Fut(long file);
-extern long Fflush_Fut(long file);
-extern char *Fgets_Fut(char *buf, int n, long f);
 
 extern int creat (const char *name, int flags);
@@ -172 +164 @@
     // ...name
 } FILE;
-// these tiny inlines provide type safety, and should optimize away
-static inline FILE *fopen(const char *filename, const char *mode) {
-    return (FILE *)Fopen_Fut(filename,mode);
-}
-static inline long fclose(FILE *f) {
-    return Fclose_Fut((long)f);
-}
-static inline long fread(void *buf, long elsize, long count, FILE *f) {
-    return Fread_Fut(buf,elsize,count,(long)f);
-}
-static inline long fwrite(const void *buf, long elsize, long count, FILE *f) {
-    return Fwrite_Fut(buf,elsize,count,(long)f);
-}
-static inline long fseek(FILE *file, long offset, long whence) {
-    return Fseek_Fut((long)file,offset,whence);
-}
-static inline long fflush(FILE *file) {
-    return Fflush_Fut((long)file);
-}
-static inline long feof(FILE *file) {
-    return Feof_Fut((long)file);
-}
-static inline long ftell(FILE *file) {
-    if(!file) return -1;
-    return file->pos;
-}
-static inline char *fgets(char *buf, int n, FILE *f) {
-    return Fgets_Fut(buf,n,(int)f);
-}
+
+extern FILE *fopen(const char *filename, const char *mode);
+extern long fclose(FILE *f);
+extern long fread(void *buf, long elsize, long count, FILE *f);
+extern long fwrite(const void *buf, long elsize, long count, FILE *f);
+extern long fseek(FILE *file, long offset, long whence);
+extern long fflush(FILE *file);
+extern long feof(FILE *file);
+extern long ftell(FILE *file);
+extern char *fgets(char *buf, int n, FILE *f);
 #define fdelete(a) DeleteFile_Fut(a)
+
 /**
  * No STUBS!
@@ -293 +267 @@
 extern time_t mktime(struct tm *timp);
 
-static inline int abs( int v ) {
-  return v<0 ? -v : v;
-}
-
-#endif
+extern int abs( int v );
+
+#endif

trunk/platform/generic/wrappers.c

@@ -735 +735 @@
 }
 
-long Fopen_Fut(const char *filename, const char *mode){
- return _Fopen_Fut(filename,mode);
-}
-
-long Fclose_Fut(long file){
- return _Fclose_Fut(file);
-}
-
-long Fread_Fut(void *buf, long elsize, long count, long f){
- return _Fread_Fut(buf,  elsize,  count, f);
-}
-
-long Fwrite_Fut(const void *buf, long elsize, long count, long f){
-  return _Fwrite_Fut(buf, elsize, count, f);
-}
-
-long Fseek_Fut(long file, long offset, long whence){
- return  _Fseek_Fut(file, offset, whence);
-}
-
-long Feof_Fut(long file) {
- return _Feof_Fut(file);
-}
-
-long Fflush_Fut(long file) {
- return _Fflush_Fut(file);
-}
-
-char *Fgets_Fut(char *buf, int n, long f) {
- return _Fgets_Fut(buf,n,f);
+long fopen(const char *filename, const char *mode) {
+    return _Fopen_Fut(filename,mode);
+}
+
+long fclose(long f) {
+    return _Fclose_Fut((long)f);
+}
+
+long fread(void *buf, long elsize, long count, long f) {
+    return _Fread_Fut(buf,elsize,count,(long)f);
+}
+
+long fwrite(const void *buf, long elsize, long count, long f) {
+    return _Fwrite_Fut(buf,elsize,count,(long)f);
+}
+
+long fseek(long file, long offset, long whence) {
+    return _Fseek_Fut((long)file,offset,whence);
+}
+
+long feof(long file) {
+    return _Feof_Fut((long)file);
+}
+
+long fflush(long file) {
+    return _Fflush_Fut((long)file);
+}
+
+char *fgets(char *buf, int n, long f) {
+    return _Fgets_Fut(buf,n,(int)f);
 }