From: Simon Josefsson <simon@josefsson.org>
Date: Tue, 13 Apr 2010 18:42:03 +0000 (+0200)
Subject: Generated.
X-Git-Tag: gnutls_2_9_10~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a86891a2ccfebbcc6deb87ba71639de8b976800b;p=thirdparty%2Fgnutls.git

Generated.
---

diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 2efb961528..79eb4768ad 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -57,6 +57,7 @@ APIMANS += gnutls_oprfi_enable_client.3
 APIMANS += gnutls_oprfi_enable_server.3
 APIMANS += gnutls_safe_negotiation_set_initial.3
 APIMANS += gnutls_safe_renegotiation_set.3
+APIMANS += gnutls_safe_renegotiation_status.3
 APIMANS += gnutls_server_name_get.3
 APIMANS += gnutls_server_name_set.3
 APIMANS += gnutls_session_ticket_key_generate.3
@@ -120,6 +121,7 @@ APIMANS += gnutls_certificate_allocate_credentials.3
 APIMANS += gnutls_certificate_server_set_request.3
 APIMANS += gnutls_certificate_client_set_retrieve_function.3
 APIMANS += gnutls_certificate_server_set_retrieve_function.3
+APIMANS += gnutls_certificate_set_verify_function.3
 APIMANS += gnutls_certificate_verify_peers2.3
 APIMANS += gnutls_certificate_verify_peers.3
 APIMANS += gnutls_certificate_expiration_time_peers.3
diff --git a/src/certtool-gaa.c b/src/certtool-gaa.c
index 9f9c5243f5..8ff1d81fcd 100644
--- a/src/certtool-gaa.c
+++ b/src/certtool-gaa.c
@@ -503,31 +503,12 @@ static int gaa_getint(char *arg)
     return tmp;
 }
 
-static char gaa_getchar(char *arg)
-{
-    if(strlen(arg) != 1)
-    {
-        printf("Option %s: '%s' isn't an character\n", gaa_current_option, arg);
-        GAAERROR(-1);
-    }
-    return arg[0];
-}
 
 static char* gaa_getstr(char *arg)
 {
     return arg;
 }
-static float gaa_getfloat(char *arg)
-{
-    float tmp;
-    char a;
-    if(sscanf(arg, "%f%c", &tmp, &a) < 1)
-    {
-        printf("Option %s: '%s' isn't a float number\n", gaa_current_option, arg);
-        GAAERROR(-1);
-    }
-    return tmp;
-}
+
 /* option structures */
 
 struct GAAOPTION_debug 
@@ -1178,16 +1159,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)
     {
@@ -1208,27 +1192,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);
@@ -1241,18 +1225,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);
@@ -1266,7 +1250,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;
             }
@@ -1292,9 +1276,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;
@@ -1345,7 +1329,7 @@ static int gaa_internal_get_next_str(FILE *file, gaa_str_node *tmp_str, int argc
 
         len++;
         a = fgetc( file);
-        if(a==EOF) return 0; //a = ' ';
+        if(a==EOF) return 0; /* a = ' '; */
     }
 
     len += 1;