More external function flatening (less external symbols)

diff --git a/fs.c b/fs.c
index 1461bf9ee5876ff9b59c3f277fcc98185914d81a..e66e440a26da5c23ac6a289b30e26948c96ab646 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -165,11 +165,6 @@ int fs_file_seek(FILE *fp, long int off, int whence) {
     return fseek(fp, off, whence);
 }
 
     return fseek(fp, off, whence);
 }
 

-int fs_file_putc(FILE *fp, int ch) {
-    /* Invokes file_exception on windows if fp is null */
-    return fputc(ch, fp);
-}
-

 int fs_file_flush(FILE *fp) {
     /* Invokes file_exception on windows if fp is null */
     return fflush(fp);
 int fs_file_flush(FILE *fp) {
     /* Invokes file_exception on windows if fp is null */
     return fflush(fp);

diff --git a/ftepp.c b/ftepp.c
index a1b5f07e9a446321966707dde62f08b068b9efa4..7337ba3571efec36117426617adadc856757991f 100644 (file)
--- a/ftepp.c
+++ b/ftepp.c
@@ -422,7 +422,7 @@ static bool ftepp_define_body(ftepp_t *ftepp, ppmacro *macro)
                         return false;
                     }
 
                         return false;
                     }
 

-                    index = atoi(ftepp_tokval(ftepp));
+                    index = (int)strtol(ftepp_tokval(ftepp), NULL, 10);

 
                     if (ftepp_next(ftepp) != ']') {
                         ftepp_error(ftepp, "expected `]` in __VA_ARGS__ subscript");
 
                     if (ftepp_next(ftepp) != ']') {
                         ftepp_error(ftepp, "expected `]` in __VA_ARGS__ subscript");

diff --git a/gmqcc.h b/gmqcc.h
index 2cc0864126451a10d4d13b7fa6328ca654c2f0e6..3539155df83549b6cbeb175a4d5041f2621a250b 100644 (file)
--- a/gmqcc.h
+++ b/gmqcc.h
@@ -469,7 +469,6 @@ int            fs_file_getc   (FILE *);
 int            fs_file_flush  (FILE *);
 int            fs_file_printf (FILE *, const char *, ...);
 int            fs_file_puts   (FILE *, const char *);
 int            fs_file_flush  (FILE *);
 int            fs_file_printf (FILE *, const char *, ...);
 int            fs_file_puts   (FILE *, const char *);

-int            fs_file_putc   (FILE *, int);

 int            fs_file_seek   (FILE *, long int, int);
 long int       fs_file_tell   (FILE *); 
 
 int            fs_file_seek   (FILE *, long int, int);
 long int       fs_file_tell   (FILE *);