Make it easier to bootstrap the PKI for SSL connections in OpenFlow.

[openvswitch] / lib / util.c

diff --git a/lib/util.c b/lib/util.c
index 846ac880f2a3bc9ccd93a4e28f9e184602a1f48f..0c70710dde0c28a9b1779862dd7c5a485ce1d0ac 100644 (file)
--- a/lib/util.c
+++ b/lib/util.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "util.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -39,10 +40,10 @@
 
 const char *program_name;
 
-static void
+void
 out_of_memory(void) 
 {
-    fatal(0, "virtual memory exhausted");
+    ofp_fatal(0, "virtual memory exhausted");
 }
 
 void *
@@ -75,13 +76,27 @@ xrealloc(void *p, size_t size)
     return p;
 }
 
+void *
+xmemdup(const void *p_, size_t size)
+{
+    void *p = xmalloc(size);
+    memcpy(p, p_, size);
+    return p;
+}
+
 char *
-xstrdup(const char *s_) 
+xmemdup0(const char *p_, size_t length)
 {
-    size_t size = strlen(s_) + 1;
-    char *s = xmalloc(size);
-    memcpy(s, s_, size);
-    return s;
+    char *p = xmalloc(length + 1);
+    memcpy(p, p_, length);
+    p[length] = '\0';
+    return p;
+}
+
+char *
+xstrdup(const char *s) 
+{
+    return xmemdup0(s, strlen(s));
 }
 
 char *
@@ -104,7 +119,8 @@ xasprintf(const char *format, ...)
     return s;
 }
 
-void fatal(int err_no, const char *format, ...)
+void
+ofp_fatal(int err_no, const char *format, ...)
 {
     va_list args;
 
@@ -119,20 +135,8 @@ void fatal(int err_no, const char *format, ...)
     exit(EXIT_FAILURE);
 }
 
-void error(int err_no, const char *format, ...)
-{
-    va_list args;
-
-    fprintf(stderr, "%s: ", program_name);
-    va_start(args, format);
-    vfprintf(stderr, format, args);
-    va_end(args);
-    if (err_no != 0)
-        fprintf(stderr, " (%s)", strerror(err_no));
-    putc('\n', stderr);
-}
-
-void debug(int err_no, const char *format, ...)
+void
+ofp_error(int err_no, const char *format, ...)
 {
     va_list args;
 
@@ -158,8 +162,8 @@ void set_program_name(const char *argv0)
  * byte in 'buf'.  If 'ascii' is true then the corresponding ASCII characters
  * are also rendered alongside. */
 void
-hex_dump(FILE *stream, const void *buf_, size_t size,
-         uintptr_t ofs, bool ascii)
+ofp_hex_dump(FILE *stream, const void *buf_, size_t size,
+             uintptr_t ofs, bool ascii)
 {
   const uint8_t *buf = buf_;
   const size_t per_line = 16; /* Maximum bytes per line. */