From: Ben Pfaff <blp@nicira.com>
Date: Thu, 16 May 2013 05:36:04 +0000 (-0700)
Subject: Do not include trailing whitespace in hexdump.
X-Git-Tag: sliver-openvswitch-1.10.90-3~6^2~249
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=aaa4b65b23707ca772c3d571353a65bf3838df9a;p=sliver-openvswitch.git

Do not include trailing whitespace in hexdump.

Reported-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Tested-by: Simon Horman <horms@verge.net.au>
---

diff --git a/lib/dynamic-string.c b/lib/dynamic-string.c
index b35fd0b67..3cccb5c7f 100644
--- a/lib/dynamic-string.c
+++ b/lib/dynamic-string.c
@@ -394,6 +394,8 @@ ds_put_hex_dump(struct ds *ds, const void *buf_, size_t size,
             for (; i < per_line; i++)
                 ds_put_format(ds, " ");
             ds_put_format(ds, "|");
+        } else {
+            ds_chomp(ds, ' ');
         }
         ds_put_format(ds, "\n");