[SCM] GNU gnutls branch, master, updated. gnutls_3_0_11-50-g48627d0

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=48627d00df2c8e14f904912fba038074834e88b6

The branch, master has been updated
       via  48627d00df2c8e14f904912fba038074834e88b6 (commit)
       via  8ecdd7f6304c89e4fc7d984d4d7c98d61790e120 (commit)
       via  fcb7734c8e2d390f13a8896cf5e8838ca6694d54 (commit)
      from  3128d990f2cf142e70b97095564ee9e43f2239ff (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 48627d00df2c8e14f904912fba038074834e88b6
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jan 14 13:16:08 2012 +0100

    no longer use texi2html. makeinfo --html has decent output.

commit 8ecdd7f6304c89e4fc7d984d4d7c98d61790e120
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jan 14 13:15:54 2012 +0100

    print numeric error codes everywhere.

commit fcb7734c8e2d390f13a8896cf5e8838ca6694d54
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jan 14 13:03:10 2012 +0100

    SECURE256 -> SECURE192

-----------------------------------------------------------------------

Summary of changes:
 cfg.mk                |    1 -
 doc/cha-programs.texi |    4 ++--
 doc/errcodes.c        |   43 +++++++++++++++++++++++++++++--------------
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index ee607dd..fd3a1e6 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -124,7 +124,6 @@ web:
        echo generating documentation for $(PACKAGE)
        cd doc && $(SHELL) ../build-aux/gendocs.sh \
                --html "--css-include=texinfo.css" \
-               --texi2html \
                -o ../$(htmldir)/manual/ $(PACKAGE) "$(PACKAGE_NAME)"
        cd doc && cp *.png ../$(htmldir)/manual/html_node/
        #cd doc/doxygen && doxygen && cd ../.. && cp -v doc/doxygen/html/* 
$(htmldir)/devel/doxygen/ && cd doc/doxygen/latex && make refman.pdf && cd 
../../../ && cp doc/doxygen/latex/refman.pdf 
$(htmldir)/devel/doxygen/$(PACKAGE).pdf
diff --git a/doc/cha-programs.texi b/doc/cha-programs.texi
index fdfad66..23888e0 100644
--- a/doc/cha-programs.texi
+++ b/doc/cha-programs.texi
@@ -105,8 +105,8 @@ the handshake.
 @cindex Priority strings
 
 @example
-$ ./gnutls-cli --priority SECURE256 -l
-Cipher suites for SECURE256
+$ ./gnutls-cli --priority SECURE192 -l
+Cipher suites for SECURE192
 TLS_ECDHE_ECDSA_AES_256_CBC_SHA384                     0xc0, 0x24      TLS1.2
 TLS_ECDHE_ECDSA_AES_256_GCM_SHA384                     0xc0, 0x2e      TLS1.2
 TLS_ECDHE_RSA_AES_256_GCM_SHA384                       0xc0, 0x30      TLS1.2
diff --git a/doc/errcodes.c b/doc/errcodes.c
index 2d423ed..db0b5fc 100644
--- a/doc/errcodes.c
+++ b/doc/errcodes.c
@@ -76,14 +76,37 @@ main (int argc, char *argv[])
   return 0;
 }
 
+static char* escape_texi_string( const char* str, char* buffer, int 
buffer_size)
+{
+int i = 0, j = 0;
+
+
+while( str[i] != 0 && j <buffer_size - 1) {
+   if (str[i]=='_') {
+      buffer[j++] = '_';
+      buffer[j++] = '@';
+      buffer[j++] = '-';
+   } else {
+      buffer[j++] = str[i];
+   }
+   i++;
+};
+
+buffer[j] = 0;
+
+return buffer;
+
+}
+
 static int main_texinfo (void)
 {
   int i, j;
   const char *desc;
   const char *_name;
+  char buffer[500];
   error_name names_to_sort[MAX_CODES];        /* up to MAX_CODES names  */
 
-  printf ("@table @code\n");
+  printf ("@multitable @columnfractions .15 .40 .37\n");
 
   memset (names_to_sort, 0, sizeof (names_to_sort));
   j = 0;
@@ -93,24 +116,16 @@ static int main_texinfo (void)
       if (_name == NULL)
         continue;
 
+      desc = gnutls_strerror (i);
+
+      printf ("@item %d @tab %s @tab %s\n", i, escape_texi_string(_name, 
buffer,sizeof(buffer)), desc);
+
       strcpy (names_to_sort[j].name, _name);
       names_to_sort[j].error_index = i;
       j++;
     }
 
-  qsort (names_to_sort, j, sizeof (error_name), compar);
-
-  for (i = 0; i < j; i++)
-    {
-      _name = names_to_sort[i].name;
-      desc = gnutls_strerror (names_to_sort[i].error_index);
-      if (desc == NULL || _name == NULL)
-        continue;
-
-      printf ("@item %s:\n%s\n\n", _name, desc);
-    }
-
-  printf ("@end table\n");
+  printf ("@end multitable\n");
 
   return 0;
 }


hooks/post-receive
-- 
GNU gnutls