Use more warnings. Fix warnings.

diff --git a/configure.ac b/configure.ac
index b7a4bece9146868ad1cb1eac943b5316b6b3261d..21b59e8ab6d6e5090cacff2b426962834f54f6c4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -173,7 +173,17 @@ AC_PROG_LIBTOOL
 gl_INIT
 
 # These are warnings we could enable:
-# -W -Wchar-subscripts -Wformat-security -Wnonnull -Winit-self -Wmissing-include-dirs -Wunused -Wno-unused-parameter -Wfloat-equal -Wdeclaration-after-statement -Wshadow -Wunsafe-loop-optimizations -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wlogical-op -Waggregate-return -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -Wmissing-format-attribute -Wpacked -Wredundant-decls -Wnested-externs -Winline -Wvla -Wvolatile-register-var -Wdisabled-optimization -Wstack-protector -Woverlength-strings
+#
+# -Wchar-subscripts -Wformat-security -Wnonnull -Winit-self
+# --Wmissing-include-dirs -Wunused -Wno-unused-parameter -Wfloat-equal
+# --Wdeclaration-after-statement -Wshadow -Wunsafe-loop-optimizations
+# --Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align
+# --Wlogical-op -Waggregate-return -Wstrict-prototypes
+# --Wold-style-definition -Wmissing-prototypes -Wmissing-declarations
+# --Wmissing-noreturn -Wmissing-format-attribute -Wpacked
+# --Wredundant-decls -Wnested-externs -Winline -Wvla
+# --Wvolatile-register-var -Wdisabled-optimization -Wstack-protector
+# --Woverlength-strings
 #
 # These are warnings we have tried but have turned out not to be useful:
 #
@@ -181,13 +191,17 @@ gl_INIT
 # -Wundef: warns on '#if GNULIB_PORTCHECK' etc in gnulib headers
 # -Wpadded: many of our structs are not optimized for padding
 # -Wtraditional-conversion: we catch missing prototypes anyway
-# -Wno-unused-parameter: added because -Wunused cause too many warns
 # -Wunreachable-code: appears to return many false positives
 # -Wconversion: too many warnings for now
 # -Wswitch-default: too many warnings for now
 # -Wswitch-enum: too many warnings for now
+#
+# These are warnings that we had to explicitly disable:
+#
+# -Wno-pointer-sign: too many warnings for now
+# -Wno-unused-parameter: added because -Wunused cause too many warns
 
-for w in -Wall -Wno-pointer-sign; do
+for w in -Wall -W -Wno-pointer-sign -Wno-unused-parameter; do
   gl_WARN_ADD([$w])
 done
 export WARN_CFLAGS

diff --git a/doc/examples/ex-serv-export.c b/doc/examples/ex-serv-export.c
index 0cf11f322ae60a5e9c62b2fc2c69fe60462d8a43..12e0588bb2d15a4f84d2535b4f018769ae981c53 100644 (file)
--- a/doc/examples/ex-serv-export.c
+++ b/doc/examples/ex-serv-export.c
@@ -272,10 +272,10 @@ main (void)
 typedef struct
 {
   char session_id[MAX_SESSION_ID_SIZE];
-  int session_id_size;
+  size_t session_id_size;
 
   char session_data[MAX_SESSION_DATA_SIZE];
-  int session_data_size;
+  size_t session_data_size;
 } CACHE;
 
 static CACHE *cache_db;

diff --git a/libextra/gnutls_ia.c b/libextra/gnutls_ia.c
index a538c0ced7736664d4847c10de441ac8dbbf3980..03403b9617d2e21e0854874a463b693022b24c83 100644 (file)
--- a/libextra/gnutls_ia.c
+++ b/libextra/gnutls_ia.c
@@ -111,6 +111,7 @@ _gnutls_recv_inner_application (gnutls_session_t session,
                                opaque * data, size_t sizeofdata)
 {
   ssize_t len;
+  uint32_t len24;
   opaque pkt[4];
 
   len = _gnutls_recv_int (session, GNUTLS_INNER_APPLICATION, -1, pkt, 4);
@@ -121,28 +122,28 @@ _gnutls_recv_inner_application (gnutls_session_t session,
     }
 
   *msg_type = pkt[0];
-  len = _gnutls_read_uint24 (&pkt[1]);
+  len24 = _gnutls_read_uint24 (&pkt[1]);
 
-  if (*msg_type != GNUTLS_IA_APPLICATION_PAYLOAD && len != CHECKSUM_SIZE)
+  if (*msg_type != GNUTLS_IA_APPLICATION_PAYLOAD && len24 != CHECKSUM_SIZE)
     {
       gnutls_assert ();
       return GNUTLS_E_UNEXPECTED_PACKET_LENGTH;
     }
 
-  if (sizeofdata < len)
+  if (sizeofdata < len24)
     {
       /* XXX push back pkt to IA buffer? */
       gnutls_assert ();
       return GNUTLS_E_SHORT_MEMORY_BUFFER;
     }
 
-  if (len > 0)
+  if (len24 > 0)
     {
-      int tmplen = len;
+      uint32_t tmplen = len24;
 
-      len = _gnutls_recv_int (session, GNUTLS_INNER_APPLICATION, -1,
-                             data, tmplen);
-      if (len != tmplen)
+      len24 = _gnutls_recv_int (session, GNUTLS_INNER_APPLICATION, -1,
+                               data, tmplen);
+      if (len24 != tmplen)
        {
          gnutls_assert ();
          /* XXX Correct? */
@@ -150,7 +151,7 @@ _gnutls_recv_inner_application (gnutls_session_t session,
        }
     }
 
-  return len;
+  return len24;
 }
 
 /* Apply the TLS PRF using the TLS/IA inner secret as keying material,

diff --git a/src/Makefile.am b/src/Makefile.am
index 228d31d3e6fb9848091a260a43a7ed6b20332cad..0bc02b4ee083867a5a9feed6b6334fad61ec4e4d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,14 +21,14 @@ EXTRA_DIST = README README.srptool
 
 SUBDIRS = cfg
 
-AM_CPPFLAGS = \
-       $(WARN_CFLAGS)                          \
+INCS = \
        -I$(srcdir)/../gl                       \
        -I$(builddir)/../gl                     \
        -I$(builddir)/../lib/includes           \
        -I$(srcdir)/../lib/includes             \
        -I$(srcdir)/../libextra/includes        \
        -I$(srcdir)/cfg
+AM_CPPFLAGS = $(WARN_CFLAGS) $(INCS)
 
 bin_PROGRAMS = gnutls-serv gnutls-cli psktool gnutls-cli-debug
 if ENABLE_PKI
@@ -67,10 +67,13 @@ certtool_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \
 if HAVE_LIBCFG
 certtool_LDADD += -lcfg+
 else
-certtool_SOURCES += cfg/cfg+.c cfg/cfgfile.c cfg/cmdline.c cfg/parse.c \
+noinst_LTLIBRARIES = libcfg.la
+libcfg_la_CPPFLAGS = $(INCS)
+libcfg_la_SOURCES = cfg/cfg+.c cfg/cfgfile.c cfg/cmdline.c cfg/parse.c \
        cfg/props.c cfg/shared.c cfg/platon/str/dynfgets.c              \
        cfg/platon/str/strctype.c cfg/platon/str/strdyn.c               \
        cfg/platon/str/strplus.c
+certtool_LDADD += libcfg.la
 endif
 
 noinst_PROGRAMS = errcodes printlist

diff --git a/src/certtool-gaa.c b/src/certtool-gaa.c
index 6accc09274c6ea0219a40847bffd2375a7e2db0a..89b6a10c87c884958bcfc5d695f52326e756c03a 100644 (file)
--- a/src/certtool-gaa.c
+++ b/src/certtool-gaa.c
@@ -1123,16 +1123,19 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 int gaa(int argc, char **argv, gaainfo *gaaval)
 {
     int tmp1, tmp2;
-    int i, j;
+    int l;
+    size_t i, j;
     char *opt_list;
 
+    i = 0;
+
     GAAargv = argv;
     GAAargc = argc;
 
     opt_list = (char*) gaa_malloc(GAA_NB_OPTION + 1);
 
-    for(i = 0; i < GAA_NB_OPTION + 1; i++)
-        opt_list[i] = 0;
+    for(l = 0; l < GAA_NB_OPTION + 1; l++)
+        opt_list[l] = 0;
     /* initialization */
     if(inited == 0)
     {
@@ -1153,27 +1156,27 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
       gaa_arg_used = gaa_malloc(argc * sizeof(char));
     }
 
-    for(i = 1; i < argc; i++)
-        gaa_arg_used[i] = 0;
-    for(i = 1; i < argc; i++)
+    for(l = 1; l < argc; l++)
+        gaa_arg_used[l] = 0;
+    for(l = 1; l < argc; l++)
     {
-        if(gaa_arg_used[i] == 0)
+        if(gaa_arg_used[l] == 0)
         {
             j = 0;
-            tmp1 = gaa_is_an_argument(GAAargv[i]);
+            tmp1 = gaa_is_an_argument(GAAargv[l]);
             switch(tmp1)
             {
             case GAA_WORD_OPTION:
                 j++;
             case GAA_LETTER_OPTION:
                 j++;
-                tmp2 = gaa_get_option_num(argv[i]+j, tmp1);
+                tmp2 = gaa_get_option_num(argv[l]+j, tmp1);
                 if(tmp2 == GAA_ERROR_NOMATCH)
                 {
-                    printf("Invalid option '%s'\n", argv[i]+j);
+                    printf("Invalid option '%s'\n", argv[l]+j);
                     return 0;
                 }
-                switch(gaa_try(tmp2, i+1, gaaval, opt_list))
+                switch(gaa_try(tmp2, l+1, gaaval, opt_list))
                 {
                 case GAA_ERROR_NOTENOUGH_ARGS:
                     printf("'%s': not enough arguments\n",gaa_current_option);
@@ -1186,18 +1189,18 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
                 default:
                     printf("Unknown error\n");
                 }
-                gaa_arg_used[i] = 1;
+                gaa_arg_used[l] = 1;
                 break;
             case GAA_MULTIPLE_OPTION:
-                for(j = 1; j < strlen(argv[i]); j++)
+                for(j = 1; j < strlen(argv[l]); j++)
                 {
-                    tmp2 = gaa_get_option_num(argv[i]+j, tmp1);
+                    tmp2 = gaa_get_option_num(argv[l]+j, tmp1);
                     if(tmp2 == GAA_ERROR_NOMATCH)
                     {
-                        printf("Invalid option '%c'\n", *(argv[i]+j));
+                        printf("Invalid option '%c'\n", *(argv[l]+j));
                         return 0;
                     }
-                    switch(gaa_try(tmp2, i+1, gaaval, opt_list))
+                    switch(gaa_try(tmp2, l+1, gaaval, opt_list))
                     {
                     case GAA_ERROR_NOTENOUGH_ARGS:
                         printf("'%s': not enough arguments\n",gaa_current_option);
@@ -1211,7 +1214,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
                         printf("Unknown error\n");
                     }
                 }
-                gaa_arg_used[i] = 1;
+                gaa_arg_used[l] = 1;
                 break;
             default: break;
             }
@@ -1237,9 +1240,9 @@ if(gaa_processing_file == 0)
     }
 #endif
 }
-    for(i = 1; i < argc; i++)
+    for(l = 1; l < argc; l++)
     {
-        if(gaa_arg_used[i] == 0)
+        if(gaa_arg_used[l] == 0)
         {
             printf("Too many arguments\n");
             return 0;

diff --git a/src/cli-gaa.c b/src/cli-gaa.c
index 27f1b7e8e26fd7c1c7f7a910f8cedb2ee1b0a96e..a6016dd101e60178faab79c9b3d1e0dd72b343a3 100644 (file)
--- a/src/cli-gaa.c
+++ b/src/cli-gaa.c
@@ -1136,16 +1136,19 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 int gaa(int argc, char **argv, gaainfo *gaaval)
 {
     int tmp1, tmp2;
-    int i, j;
+    int l;
+    size_t i, j;
     char *opt_list;
 
+    i = 0;
+
     GAAargv = argv;
     GAAargc = argc;
 
     opt_list = (char*) gaa_malloc(GAA_NB_OPTION + 1);
 
-    for(i = 0; i < GAA_NB_OPTION + 1; i++)
-        opt_list[i] = 0;
+    for(l = 0; l < GAA_NB_OPTION + 1; l++)
+        opt_list[l] = 0;
     /* initialization */
     if(inited == 0)
     {
@@ -1171,27 +1174,27 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
       gaa_arg_used = gaa_malloc(argc * sizeof(char));
     }
 
-    for(i = 1; i < argc; i++)
-        gaa_arg_used[i] = 0;
-    for(i = 1; i < argc; i++)
+    for(l = 1; l < argc; l++)
+        gaa_arg_used[l] = 0;
+    for(l = 1; l < argc; l++)
     {
-        if(gaa_arg_used[i] == 0)
+        if(gaa_arg_used[l] == 0)
         {
             j = 0;
-            tmp1 = gaa_is_an_argument(GAAargv[i]);
+            tmp1 = gaa_is_an_argument(GAAargv[l]);
             switch(tmp1)
             {
             case GAA_WORD_OPTION:
                 j++;
             case GAA_LETTER_OPTION:
                 j++;
-                tmp2 = gaa_get_option_num(argv[i]+j, tmp1);
+                tmp2 = gaa_get_option_num(argv[l]+j, tmp1);
                 if(tmp2 == GAA_ERROR_NOMATCH)
                 {
-                    printf("Invalid option '%s'\n", argv[i]+j);
+                    printf("Invalid option '%s'\n", argv[l]+j);
                     return 0;
                 }
-                switch(gaa_try(tmp2, i+1, gaaval, opt_list))
+                switch(gaa_try(tmp2, l+1, gaaval, opt_list))
                 {
                 case GAA_ERROR_NOTENOUGH_ARGS:
                     printf("'%s': not enough arguments\n",gaa_current_option);
@@ -1204,18 +1207,18 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
                 default:
                     printf("Unknown error\n");
                 }
-                gaa_arg_used[i] = 1;
+                gaa_arg_used[l] = 1;
                 break;
             case GAA_MULTIPLE_OPTION:
-                for(j = 1; j < strlen(argv[i]); j++)
+                for(j = 1; j < strlen(argv[l]); j++)
                 {
-                    tmp2 = gaa_get_option_num(argv[i]+j, tmp1);
+                    tmp2 = gaa_get_option_num(argv[l]+j, tmp1);
                     if(tmp2 == GAA_ERROR_NOMATCH)
                     {
-                        printf("Invalid option '%c'\n", *(argv[i]+j));
+                        printf("Invalid option '%c'\n", *(argv[l]+j));
                         return 0;
                     }
-                    switch(gaa_try(tmp2, i+1, gaaval, opt_list))
+                    switch(gaa_try(tmp2, l+1, gaaval, opt_list))
                     {
                     case GAA_ERROR_NOTENOUGH_ARGS:
                         printf("'%s': not enough arguments\n",gaa_current_option);
@@ -1229,7 +1232,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
                         printf("Unknown error\n");
                     }
                 }
-                gaa_arg_used[i] = 1;
+                gaa_arg_used[l] = 1;
                 break;
             default: break;
             }
@@ -1255,9 +1258,9 @@ if(gaa_processing_file == 0)
     }
 #endif
 }
-    for(i = 1; i < argc; i++)
+    for(l = 1; l < argc; l++)
     {
-        if(gaa_arg_used[i] == 0)
+        if(gaa_arg_used[l] == 0)
         {
             printf("Too many arguments\n");
             return 0;

diff --git a/src/crypt-gaa.c b/src/crypt-gaa.c
index 87e03380adfce65e3cf52abb970b631d8ad9d0b4..8ec3b033ed3269625d93e1853dfa11cf17d0653f 100644 (file)
--- a/src/crypt-gaa.c
+++ b/src/crypt-gaa.c
@@ -615,16 +615,19 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 int gaa(int argc, char **argv, gaainfo *gaaval)
 {
     int tmp1, tmp2;
-    int i, j;
+    int l;
+    size_t i, j;
     char *opt_list;
 
+    i = 0;
+
     GAAargv = argv;
     GAAargc = argc;
 
     opt_list = (char*) gaa_malloc(GAA_NB_OPTION + 1);
 
-    for(i = 0; i < GAA_NB_OPTION + 1; i++)
-        opt_list[i] = 0;
+    for(l = 0; l < GAA_NB_OPTION + 1; l++)
+        opt_list[l] = 0;
     /* initialization */
     if(inited == 0)
     {
@@ -643,27 +646,27 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
       gaa_arg_used = gaa_malloc(argc * sizeof(char));
     }
 
-    for(i = 1; i < argc; i++)
-        gaa_arg_used[i] = 0;
-    for(i = 1; i < argc; i++)
+    for(l = 1; l < argc; l++)
+        gaa_arg_used[l] = 0;
+    for(l = 1; l < argc; l++)
     {
-        if(gaa_arg_used[i] == 0)
+        if(gaa_arg_used[l] == 0)
         {
             j = 0;
-            tmp1 = gaa_is_an_argument(GAAargv[i]);
+            tmp1 = gaa_is_an_argument(GAAargv[l]);
             switch(tmp1)
             {
             case GAA_WORD_OPTION:
                 j++;
             case GAA_LETTER_OPTION:
                 j++;
-                tmp2 = gaa_get_option_num(argv[i]+j, tmp1);
+                tmp2 = gaa_get_option_num(argv[l]+j, tmp1);
                 if(tmp2 == GAA_ERROR_NOMATCH)
                 {
-                    printf("Invalid option '%s'\n", argv[i]+j);
+                    printf("Invalid option '%s'\n", argv[l]+j);
                     return 0;
                 }
-                switch(gaa_try(tmp2, i+1, gaaval, opt_list))
+                switch(gaa_try(tmp2, l+1, gaaval, opt_list))
                 {
                 case GAA_ERROR_NOTENOUGH_ARGS:
                     printf("'%s': not enough arguments\n",gaa_current_option);
@@ -676,18 +679,18 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
                 default:
                     printf("Unknown error\n");
                 }
-                gaa_arg_used[i] = 1;
+                gaa_arg_used[l] = 1;
                 break;
             case GAA_MULTIPLE_OPTION:
-                for(j = 1; j < strlen(argv[i]); j++)
+                for(j = 1; j < strlen(argv[l]); j++)
                 {
-                    tmp2 = gaa_get_option_num(argv[i]+j, tmp1);
+                    tmp2 = gaa_get_option_num(argv[l]+j, tmp1);
                     if(tmp2 == GAA_ERROR_NOMATCH)
                     {
-                        printf("Invalid option '%c'\n", *(argv[i]+j));
+                        printf("Invalid option '%c'\n", *(argv[l]+j));
                         return 0;
                     }
-                    switch(gaa_try(tmp2, i+1, gaaval, opt_list))
+                    switch(gaa_try(tmp2, l+1, gaaval, opt_list))
                     {
                     case GAA_ERROR_NOTENOUGH_ARGS:
                         printf("'%s': not enough arguments\n",gaa_current_option);
@@ -701,7 +704,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
                         printf("Unknown error\n");
                     }
                 }
-                gaa_arg_used[i] = 1;
+                gaa_arg_used[l] = 1;
                 break;
             default: break;
             }
@@ -727,9 +730,9 @@ if(gaa_processing_file == 0)
     }
 #endif
 }
-    for(i = 1; i < argc; i++)
+    for(l = 1; l < argc; l++)
     {
-        if(gaa_arg_used[i] == 0)
+        if(gaa_arg_used[l] == 0)
         {
             printf("Too many arguments\n");
             return 0;

diff --git a/src/psk-gaa.c b/src/psk-gaa.c
index 7ad8cc525384a40f564d124e14ab698f92bb3bf7..82d8383e5bf7a09e296e66c4e2483658568e530b 100644 (file)
--- a/src/psk-gaa.c
+++ b/src/psk-gaa.c
@@ -556,16 +556,19 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 int gaa(int argc, char **argv, gaainfo *gaaval)
 {
     int tmp1, tmp2;
-    int i, j;
+    int l;
+    size_t i, j;
     char *opt_list;
 
+    i = 0;
+
     GAAargv = argv;
     GAAargc = argc;
 
     opt_list = (char*) gaa_malloc(GAA_NB_OPTION + 1);
 
-    for(i = 0; i < GAA_NB_OPTION + 1; i++)
-        opt_list[i] = 0;
+    for(l = 0; l < GAA_NB_OPTION + 1; l++)
+        opt_list[l] = 0;
     /* initialization */
     if(inited == 0)
     {
@@ -582,27 +585,27 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
       gaa_arg_used = gaa_malloc(argc * sizeof(char));
     }
 
-    for(i = 1; i < argc; i++)
-        gaa_arg_used[i] = 0;
-    for(i = 1; i < argc; i++)
+    for(l = 1; l < argc; l++)
+        gaa_arg_used[l] = 0;
+    for(l = 1; l < argc; l++)
     {
-        if(gaa_arg_used[i] == 0)
+        if(gaa_arg_used[l] == 0)
         {
             j = 0;
-            tmp1 = gaa_is_an_argument(GAAargv[i]);
+            tmp1 = gaa_is_an_argument(GAAargv[l]);
             switch(tmp1)
             {
             case GAA_WORD_OPTION:
                 j++;
             case GAA_LETTER_OPTION:
                 j++;
-                tmp2 = gaa_get_option_num(argv[i]+j, tmp1);
+                tmp2 = gaa_get_option_num(argv[l]+j, tmp1);
                 if(tmp2 == GAA_ERROR_NOMATCH)
                 {
-                    printf("Invalid option '%s'\n", argv[i]+j);
+                    printf("Invalid option '%s'\n", argv[l]+j);
                     return 0;
                 }
-                switch(gaa_try(tmp2, i+1, gaaval, opt_list))
+                switch(gaa_try(tmp2, l+1, gaaval, opt_list))
                 {
                 case GAA_ERROR_NOTENOUGH_ARGS:
                     printf("'%s': not enough arguments\n",gaa_current_option);
@@ -615,18 +618,18 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
                 default:
                     printf("Unknown error\n");
                 }
-                gaa_arg_used[i] = 1;
+                gaa_arg_used[l] = 1;
                 break;
             case GAA_MULTIPLE_OPTION:
-                for(j = 1; j < strlen(argv[i]); j++)
+                for(j = 1; j < strlen(argv[l]); j++)
                 {
-                    tmp2 = gaa_get_option_num(argv[i]+j, tmp1);
+                    tmp2 = gaa_get_option_num(argv[l]+j, tmp1);
                     if(tmp2 == GAA_ERROR_NOMATCH)
                     {
-                        printf("Invalid option '%c'\n", *(argv[i]+j));
+                        printf("Invalid option '%c'\n", *(argv[l]+j));
                         return 0;
                     }
-                    switch(gaa_try(tmp2, i+1, gaaval, opt_list))
+                    switch(gaa_try(tmp2, l+1, gaaval, opt_list))
                     {
                     case GAA_ERROR_NOTENOUGH_ARGS:
                         printf("'%s': not enough arguments\n",gaa_current_option);
@@ -640,7 +643,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
                         printf("Unknown error\n");
                     }
                 }
-                gaa_arg_used[i] = 1;
+                gaa_arg_used[l] = 1;
                 break;
             default: break;
             }
@@ -666,9 +669,9 @@ if(gaa_processing_file == 0)
     }
 #endif
 }
-    for(i = 1; i < argc; i++)
+    for(l = 1; l < argc; l++)
     {
-        if(gaa_arg_used[i] == 0)
+        if(gaa_arg_used[l] == 0)
         {
             printf("Too many arguments\n");
             return 0;

diff --git a/src/serv-gaa.c b/src/serv-gaa.c
index a48a7809133aefaa21421d4409cf9b3afcb583fc..07043182ee697366e27b66930a43489eb0ccfee5 100644 (file)
--- a/src/serv-gaa.c
+++ b/src/serv-gaa.c
@@ -1147,16 +1147,19 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 int gaa(int argc, char **argv, gaainfo *gaaval)
 {
     int tmp1, tmp2;
-    int i, j, k;
+    int l;
+    size_t i, j, k;
     char *opt_list;
 
+    i = 0;
+
     GAAargv = argv;
     GAAargc = argc;
 
     opt_list = (char*) gaa_malloc(GAA_NB_OPTION + 1);
 
-    for(i = 0; i < GAA_NB_OPTION + 1; i++)
-        opt_list[i] = 0;
+    for(l = 0; l < GAA_NB_OPTION + 1; l++)
+        opt_list[l] = 0;
     /* initialization */
     if(inited == 0)
     {
@@ -1183,27 +1186,27 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
       gaa_arg_used = gaa_malloc(argc * sizeof(char));
     }
 
-    for(i = 1; i < argc; i++)
-        gaa_arg_used[i] = 0;
-    for(i = 1; i < argc; i++)
+    for(l = 1; l < argc; l++)
+        gaa_arg_used[l] = 0;
+    for(l = 1; l < argc; l++)
     {
-        if(gaa_arg_used[i] == 0)
+        if(gaa_arg_used[l] == 0)
         {
             j = 0;
-            tmp1 = gaa_is_an_argument(GAAargv[i]);
+            tmp1 = gaa_is_an_argument(GAAargv[l]);
             switch(tmp1)
             {
             case GAA_WORD_OPTION:
                 j++;
             case GAA_LETTER_OPTION:
                 j++;
-                tmp2 = gaa_get_option_num(argv[i]+j, tmp1);
+                tmp2 = gaa_get_option_num(argv[l]+j, tmp1);
                 if(tmp2 == GAA_ERROR_NOMATCH)
                 {
-                    printf("Invalid option '%s'\n", argv[i]+j);
+                    printf("Invalid option '%s'\n", argv[l]+j);
                     return 0;
                 }
-                switch(gaa_try(tmp2, i+1, gaaval, opt_list))
+                switch(gaa_try(tmp2, l+1, gaaval, opt_list))
                 {
                 case GAA_ERROR_NOTENOUGH_ARGS:
                     printf("'%s': not enough arguments\n",gaa_current_option);
@@ -1216,18 +1219,18 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
                 default:
                     printf("Unknown error\n");
                 }
-                gaa_arg_used[i] = 1;
+                gaa_arg_used[l] = 1;
                 break;
             case GAA_MULTIPLE_OPTION:
-                for(j = 1; j < strlen(argv[i]); j++)
+                for(j = 1; j < strlen(argv[l]); j++)
                 {
-                    tmp2 = gaa_get_option_num(argv[i]+j, tmp1);
+                    tmp2 = gaa_get_option_num(argv[l]+j, tmp1);
                     if(tmp2 == GAA_ERROR_NOMATCH)
                     {
-                        printf("Invalid option '%c'\n", *(argv[i]+j));
+                        printf("Invalid option '%c'\n", *(argv[l]+j));
                         return 0;
                     }
-                    switch(gaa_try(tmp2, i+1, gaaval, opt_list))
+                    switch(gaa_try(tmp2, l+1, gaaval, opt_list))
                     {
                     case GAA_ERROR_NOTENOUGH_ARGS:
                         printf("'%s': not enough arguments\n",gaa_current_option);
@@ -1241,7 +1244,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
                         printf("Unknown error\n");
                     }
                 }
-                gaa_arg_used[i] = 1;
+                gaa_arg_used[l] = 1;
                 break;
             default: break;
             }
@@ -1268,9 +1271,9 @@ if(gaa_processing_file == 0)
     }
 #endif
 }
-    for(i = 1; i < argc; i++)
+    for(l = 1; l < argc; l++)
     {
-        if(gaa_arg_used[i] == 0)
+        if(gaa_arg_used[l] == 0)
         {
             printf("Too many arguments\n");
             return 0;

diff --git a/src/tests.c b/src/tests.c
index bec67ecc04de5d3fdf932f2787156628023469db..498b6bd4becfe7c512f85ad20bcfa4b654312664 100644 (file)
--- a/src/tests.c
+++ b/src/tests.c
@@ -1022,7 +1022,7 @@ test_session_resume2 (gnutls_session_t session)
 {
   int ret;
   char tmp_session_id[32];
-  int tmp_session_id_size;
+  size_t tmp_session_id_size;
 
   if (session == NULL)
     return TEST_IGNORE;

diff --git a/src/tls_test-gaa.c b/src/tls_test-gaa.c
index edacec254752ab3077cb86313131886ddbfe36d9..c4f396de8edc6075c3eb6a257a1cd34b3d43888a 100644 (file)
--- a/src/tls_test-gaa.c
+++ b/src/tls_test-gaa.c
@@ -541,16 +541,19 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 int gaa(int argc, char **argv, gaainfo *gaaval)
 {
     int tmp1, tmp2;
-    int i, j;
+    int l;
+    size_t i, j;
     char *opt_list;
 
+    i = 0;
+
     GAAargv = argv;
     GAAargc = argc;
 
     opt_list = (char*) gaa_malloc(GAA_NB_OPTION + 1);
 
-    for(i = 0; i < GAA_NB_OPTION + 1; i++)
-        opt_list[i] = 0;
+    for(l = 0; l < GAA_NB_OPTION + 1; l++)
+        opt_list[l] = 0;
     /* initialization */
     if(inited == 0)
     {
@@ -567,27 +570,27 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
       gaa_arg_used = gaa_malloc(argc * sizeof(char));
     }
 
-    for(i = 1; i < argc; i++)
-        gaa_arg_used[i] = 0;
-    for(i = 1; i < argc; i++)
+    for(l = 1; l < argc; l++)
+        gaa_arg_used[l] = 0;
+    for(l = 1; l < argc; l++)
     {
-        if(gaa_arg_used[i] == 0)
+        if(gaa_arg_used[l] == 0)
         {
             j = 0;
-            tmp1 = gaa_is_an_argument(GAAargv[i]);
+            tmp1 = gaa_is_an_argument(GAAargv[l]);
             switch(tmp1)
             {
             case GAA_WORD_OPTION:
                 j++;
             case GAA_LETTER_OPTION:
                 j++;
-                tmp2 = gaa_get_option_num(argv[i]+j, tmp1);
+                tmp2 = gaa_get_option_num(argv[l]+j, tmp1);
                 if(tmp2 == GAA_ERROR_NOMATCH)
                 {
-                    printf("Invalid option '%s'\n", argv[i]+j);
+                    printf("Invalid option '%s'\n", argv[l]+j);
                     return 0;
                 }
-                switch(gaa_try(tmp2, i+1, gaaval, opt_list))
+                switch(gaa_try(tmp2, l+1, gaaval, opt_list))
                 {
                 case GAA_ERROR_NOTENOUGH_ARGS:
                     printf("'%s': not enough arguments\n",gaa_current_option);
@@ -600,18 +603,18 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
                 default:
                     printf("Unknown error\n");
                 }
-                gaa_arg_used[i] = 1;
+                gaa_arg_used[l] = 1;
                 break;
             case GAA_MULTIPLE_OPTION:
-                for(j = 1; j < strlen(argv[i]); j++)
+                for(j = 1; j < strlen(argv[l]); j++)
                 {
-                    tmp2 = gaa_get_option_num(argv[i]+j, tmp1);
+                    tmp2 = gaa_get_option_num(argv[l]+j, tmp1);
                     if(tmp2 == GAA_ERROR_NOMATCH)
                     {
-                        printf("Invalid option '%c'\n", *(argv[i]+j));
+                        printf("Invalid option '%c'\n", *(argv[l]+j));
                         return 0;
                     }
-                    switch(gaa_try(tmp2, i+1, gaaval, opt_list))
+                    switch(gaa_try(tmp2, l+1, gaaval, opt_list))
                     {
                     case GAA_ERROR_NOTENOUGH_ARGS:
                         printf("'%s': not enough arguments\n",gaa_current_option);
@@ -625,7 +628,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
                         printf("Unknown error\n");
                     }
                 }
-                gaa_arg_used[i] = 1;
+                gaa_arg_used[l] = 1;
                 break;
             default: break;
             }
@@ -651,9 +654,9 @@ if(gaa_processing_file == 0)
     }
 #endif
 }
-    for(i = 1; i < argc; i++)
+    for(l = 1; l < argc; l++)
     {
-        if(gaa_arg_used[i] == 0)
+        if(gaa_arg_used[l] == 0)
         {
             printf("Too many arguments\n");
             return 0;