From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 10 Nov 2011 11:30:10 +0000 (+0100)
Subject: Make asciiprint a globally available function.
X-Git-Tag: gnutls_3_0_8~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7beb6da7f22390d36bf72a012ee7ff4bdcc647be;p=thirdparty%2Fgnutls.git

Make asciiprint a globally available function.
---

diff --git a/lib/gnutls_str.c b/lib/gnutls_str.c
index 9e8ed610d1..c668b08fe4 100644
--- a/lib/gnutls_str.c
+++ b/lib/gnutls_str.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2002, 2004, 2005, 2007, 2008, 2009, 2010 Free Software
- * Foundation, Inc.
+ * Copyright (C) 2002-2011 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -731,7 +730,9 @@ _gnutls_buffer_pop_data_prefix (gnutls_buffer_st * buf, void *data,
   return 0;
 }
 
-void _gnutls_buffer_hexprint (gnutls_buffer_st * str, const char *data, size_t len)
+void
+_gnutls_buffer_hexprint (gnutls_buffer_st * str,
+			 const char *data, size_t len)
 {
   size_t j;
 
@@ -746,7 +747,7 @@ void _gnutls_buffer_hexprint (gnutls_buffer_st * str, const char *data, size_t l
 
 void
 _gnutls_buffer_hexdump (gnutls_buffer_st * str, const char *data, size_t len,
-         const char *spc)
+			const char *spc)
 {
   size_t j;
 
@@ -768,3 +769,16 @@ _gnutls_buffer_hexdump (gnutls_buffer_st * str, const char *data, size_t len,
   if ((j % 16) != 0)
     _gnutls_buffer_append_str (str, "\n");
 }
+
+void
+_gnutls_buffer_asciiprint (gnutls_buffer_st * str,
+			   const char *data, size_t len)
+{
+  size_t j;
+
+  for (j = 0; j < len; j++)
+    if (c_isprint (data[j]))
+      _gnutls_buffer_append_printf (str, "%c", (unsigned char) data[j]);
+    else
+      _gnutls_buffer_append_printf (str, ".");
+}
diff --git a/lib/gnutls_str.h b/lib/gnutls_str.h
index 3d1de007ff..770a7b730a 100644
--- a/lib/gnutls_str.h
+++ b/lib/gnutls_str.h
@@ -92,9 +92,12 @@ int _gnutls_buffer_append_printf (gnutls_buffer_st * dest, const char *fmt,
                                   ...)
   __attribute__ ((format (printf, 2, 3)));
 
-void _gnutls_buffer_hexprint (gnutls_buffer_st * str, const char *data, size_t len);
-void _gnutls_buffer_hexdump (gnutls_buffer_st * str, const char *data, size_t len,
-         const char *spc);
+void _gnutls_buffer_hexprint (gnutls_buffer_st * str,
+			      const char *data, size_t len);
+void _gnutls_buffer_hexdump (gnutls_buffer_st * str, const char *data,
+			     size_t len, const char *spc);
+void _gnutls_buffer_asciiprint (gnutls_buffer_st * str,
+				const char *data, size_t len);
 
 char *_gnutls_bin2hex (const void *old, size_t oldlen, char *buffer,
                        size_t buffer_size, const char *separator);
diff --git a/lib/x509/output.c b/lib/x509/output.c
index 0f326a6b8d..b0e8640966 100644
--- a/lib/x509/output.c
+++ b/lib/x509/output.c
@@ -29,7 +29,6 @@
 #include <x509_int.h>
 #include <gnutls_num.h>
 #include <gnutls_errors.h>
-#include <c-ctype.h>
 
 /* I18n of error codes. */
 #include "gettext.h"
@@ -40,18 +39,6 @@
 
 #define ERROR_STR (char*) "(error)"
 
-static void
-asciiprint (gnutls_buffer_st * str, const char *data, size_t len)
-{
-  size_t j;
-
-  for (j = 0; j < len; j++)
-    if (c_isprint (data[j]))
-      addf (str, "%c", (unsigned char) data[j]);
-    else
-      addf (str, ".");
-}
-
 static char *
 ip_to_string (void *_ip, int ip_size, char *string, int string_size)
 {
@@ -123,7 +110,7 @@ print_proxy (gnutls_buffer_st * str, gnutls_x509_crt_t cert)
   if (npolicy)
     {
       adds (str, _("\t\t\tPolicy:\n\t\t\t\tASCII: "));
-      asciiprint (str, policy, npolicy);
+      _gnutls_buffer_asciiprint (str, policy, npolicy);
       adds (str, _("\n\t\t\t\tHexdump: "));
       _gnutls_buffer_hexprint (str, policy, npolicy);
       adds (str, "\n");
@@ -706,7 +693,7 @@ print_altname (gnutls_buffer_st * str, const char *prefix, int altname_type,
                 addf (str, _("%s\t\t\totherName DER: "), prefix);
                 _gnutls_buffer_hexprint (str, buffer, size);
                 addf (str, _("\n%s\t\t\totherName ASCII: "), prefix);
-                asciiprint (str, buffer, size);
+                _gnutls_buffer_asciiprint (str, buffer, size);
                 addf (str, "\n");
               }
             gnutls_free (oid);
@@ -1037,7 +1024,7 @@ print_extensions (gnutls_buffer_st * str, const char *prefix, int type,
             }
 
           addf (str, _("%s\t\t\tASCII: "), prefix);
-          asciiprint (str, buffer, extlen);
+          _gnutls_buffer_asciiprint (str, buffer, extlen);
           addf (str, "\n");
 
           addf (str, _("%s\t\t\tHexdump: "), prefix);
@@ -1824,7 +1811,7 @@ print_crl (gnutls_buffer_st * str, gnutls_x509_crl_t crl, int notsigned)
                 }
 
               adds (str, _("\t\t\tASCII: "));
-              asciiprint (str, buffer, extlen);
+              _gnutls_buffer_asciiprint (str, buffer, extlen);
               adds (str, "\n");
 
               adds (str, _("\t\t\tHexdump: "));
@@ -2194,7 +2181,7 @@ print_crq (gnutls_buffer_st * str, gnutls_x509_crq_t cert)
               }
 
             adds (str, _("\t\t\tASCII: "));
-            asciiprint (str, buffer, extlen);
+            _gnutls_buffer_asciiprint (str, buffer, extlen);
             adds (str, "\n");
 
             adds (str, _("\t\t\tHexdump: "));