From a3f7928084f291e23b7dea7b4ebd874d18b0c266 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 30 Apr 2009 06:00:13 +0000 Subject: [PATCH] Oops, revert - need u_char. --- util.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/util.c b/util.c index f5658668..2478f912 100644 --- a/util.c +++ b/util.c @@ -1,4 +1,4 @@ -/* $Id: util.c,v 1.3 2009-04-30 05:42:46 nicm Exp $ */ +/* $Id: util.c,v 1.4 2009-04-30 06:00:13 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -53,18 +53,19 @@ section_string(char *buf, size_t len, size_t sectoff, size_t sectlen) /* Clean string of invisible characters. */ void -clean_string(const char *in, char *buf, size_t len) +clean_string(const u_char *in, char *buf, size_t len) { - size_t off; + const u_char *cp; + size_t off; off = 0; - for (; *in != '\0'; in++) { + for (cp = in; *cp != '\0'; cp++) { if (off >= len) break; - if (*in >= 0x20 && *in <= 0x7f) - buf[off++] = *in; + if (*cp >= 0x20 && *cp <= 0x7f) + buf[off++] = *cp; else - off += xsnprintf(buf + off, len - off, "\\%03hho", *in); + off += xsnprintf(buf + off, len - off, "\\%03hho", *cp); } if (off < len) buf[off] = '\0';