Some updates in order to compile with tcc.

1 files changed, 23 insertions, 24 deletions

diff --git a/src/cli-gaa.c b/src/cli-gaa.c
index 0311a1a527..d52e78ed59 100644
--- a/src/cli-gaa.c
+++ b/src/cli-gaa.c
@@ -1,4 +1,4 @@
-/* File generated by GAA 1.6.5
+/* File generated by GAA 1.6.6
  */
 #define GAA_NO_WIN32
 #line 1 "cli.gaa"
@@ -21,7 +21,7 @@ void cli_version(void);
 #endif
 #endif
 
-void* gaa_malloc( size_t size) {
+static void* gaa_malloc( size_t size) {
 void* ret;
 	ret = malloc(size);
 	if (ret==NULL) {
@@ -31,7 +31,7 @@ void* ret;
 	return ret;
 }
 
-void __gaa_helpsingle(char short_name, char *name, 
+static void __gaa_helpsingle(char short_name, char *name, 
 	char *arg_desc, char *opt_help)
 {
      int col1, col3, col4, tabsize = 3, curr;
@@ -253,7 +253,7 @@ extern "C"
 
     void gaa_help(void);
     
-    int gaa_file(char *name, gaainfo *gaaval);
+    int gaa_file(const char *name, gaainfo *gaaval);
     
 #ifdef __cplusplus
 }
@@ -272,8 +272,8 @@ gaa_error = 1;      \
 return x;        \
 }
 
-char *gaa_current_option;
-int gaa_error = 0;
+static char *gaa_current_option;
+static int gaa_error = 0;
 
 /* Generated by gaa */
 
@@ -467,13 +467,13 @@ if(k > 1)                                                            \
 }
         
 
-char **GAAargv;
-int GAAargc;
-char *gaa_arg_used;
-int gaa_processing_file = 0;
-int inited = 0;
+static char **GAAargv;
+static int GAAargc;
+static char *gaa_arg_used;
+static int gaa_processing_file = 0;
+static int inited = 0;
 
-int gaa_getint(char *arg)
+static int gaa_getint(char *arg)
 {
     int tmp;
     char a;
@@ -485,7 +485,7 @@ int gaa_getint(char *arg)
     return tmp;
 }
 
-char gaa_getchar(char *arg)
+static char gaa_getchar(char *arg)
 {
     if(strlen(arg) != 1)
     {
@@ -495,11 +495,11 @@ char gaa_getchar(char *arg)
     return arg[0];
 }
 
-char* gaa_getstr(char *arg)
+static char* gaa_getstr(char *arg)
 {
     return arg;
 }
-float gaa_getfloat(char *arg)
+static float gaa_getfloat(char *arg)
 {
     float tmp;
     char a;
@@ -634,7 +634,7 @@ struct GAAREST
 };
          
 #line 349 "gaa.skel"
-int gaa_is_an_argument(char *str)
+static int gaa_is_an_argument(char *str)
 {
 #ifdef GAA_WIN32
     if(str[0] == '/' && str[1] != 0)
@@ -657,7 +657,7 @@ int gaa_is_an_argument(char *str)
         return GAA_MULTIPLE_OPTION;
 }
 
-int gaa_get_option_num(char *str, int status)
+static int gaa_get_option_num(char *str, int status)
 {
     switch(status)
         {
@@ -738,7 +738,7 @@ int gaa_get_option_num(char *str, int status)
     return GAA_ERROR_NOMATCH;
 }
 
-int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
+static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 {
     int OK = 0;
     int gaa_last_non_option;
@@ -1200,11 +1200,10 @@ struct gaastrnode
 
 typedef struct gaastrnode gaa_str_node;
 
-int gaa_internal_get_next_str(FILE *file, gaa_str_node *tmp_str, int argc)
+static int gaa_internal_get_next_str(FILE *file, gaa_str_node *tmp_str, int argc)
 {
     int pos_ini;
     int a;
-    char ca;
     int i = 0, len = 0, newline = 0;
 
     if(argc == 1) {
@@ -1253,12 +1252,12 @@ int gaa_internal_get_next_str(FILE *file, gaa_str_node *tmp_str, int argc)
     fseek(file,pos_ini, SEEK_SET);
     do
     {
-        if(fscanf(file, "%c", &ca) != 1)
-        {
+        a = fgetc( file);
+
+        if (a == EOF) {
             i+=2;
             break;
         }
-	a = ca;
         tmp_str->str[i] = a;
         i++;
     }
@@ -1272,7 +1271,7 @@ int gaa_internal_get_next_str(FILE *file, gaa_str_node *tmp_str, int argc)
     return -1;
 }
 
-int gaa_file(char *name, gaainfo *gaaval)
+int gaa_file(const char *name, gaainfo *gaaval)
 {
     gaa_str_node *first_str, **tmp_str, *tmp_str2;
     int rval, i;