[rpstir-devel] [PATCH v2 12/15] fix scrub_for_print()'s for loop condition

[Richard Hansen]

---
 lib/util/stringutils.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/util/stringutils.c b/lib/util/stringutils.c
index d686b56..f9b29f1 100644
--- a/lib/util/stringutils.c
+++ b/lib/util/stringutils.c
@@ -304,20 +304,16 @@ char *scrub_for_print(
     char const *other_chars_to_escape)
 {
     size_t i;
-    size_t used;
+    size_t used = 0;
 
     dst[0] = '\0';
 
-    for (i = 0, used = 0; i < dst_sz - 1; i++)
+    for (i = 0; src[i]; i++)
     {
         char const *fmt = "%c";
 
-        if ('\0' == src[i])
-        {
-            break;
-        }
-        else if (!isprint((int)(unsigned char)src[i])
-                 || (isspace((int)(unsigned char)src[i]) && ' ' != src[i]))
+        if (!isprint((int)(unsigned char)src[i])
+            || (isspace((int)(unsigned char)src[i]) && ' ' != src[i]))
         {
             fmt = "\\x%02" PRIx8;
         }
-- 
2.4.3


------------------------------------------------------------------------------
_______________________________________________
rpstir-devel mailing list
rpstir-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpstir-devel