lib/netdev-dpdk: make device name parsing more robust

[cascardo/ovs.git] / lib / dynamic-string.c

diff --git a/lib/dynamic-string.c b/lib/dynamic-string.c
index 914af64..a5a3460 100644 (file)
--- a/lib/dynamic-string.c
+++ b/lib/dynamic-string.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2016 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -361,6 +361,29 @@ ds_swap(struct ds *a, struct ds *b)
     *b = temp;
 }
 
+void
+ds_put_hex(struct ds *ds, const void *buf_, size_t size)
+{
+    const uint8_t *buf = buf_;
+    bool printed = false;
+    int i;
+
+    for (i = 0; i < size; i++) {
+        uint8_t val = buf[i];
+        if (val || printed) {
+            if (!printed) {
+                ds_put_format(ds, "0x%"PRIx8, val);
+            } else {
+                ds_put_format(ds, "%02"PRIx8, val);
+            }
+            printed = true;
+        }
+    }
+    if (!printed) {
+        ds_put_char(ds, '0');
+    }
+}
+
 /* Writes the 'size' bytes in 'buf' to 'string' as hex bytes arranged 16 per
  * line.  Numeric offsets are also included, starting at 'ofs' for the first
  * byte in 'buf'.  If 'ascii' is true then the corresponding ASCII characters
@@ -423,10 +446,13 @@ ds_last(const struct ds *ds)
     return ds->length > 0 ? (unsigned char) ds->string[ds->length - 1] : EOF;
 }
 
-void
+bool
 ds_chomp(struct ds *ds, int c)
 {
     if (ds->length > 0 && ds->string[ds->length - 1] == (char) c) {
         ds->string[--ds->length] = '\0';
+        return true;
+    } else {
+        return false;
     }
 }