X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_gfx.c;h=a71d43a01de5bfe95212b4c435a1383f8ca5f631;hb=fab61bd82687270a48fdb3b6a8189d018e007625;hp=c56211dae3c2f3e6eccccff36858d3f3db3963bb;hpb=db0f95ebbf69868993aa6ec59eb45e13aabbef06;p=rrdtool.git

diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c
index c56211d..a71d43a 100644
--- a/src/rrd_gfx.c
+++ b/src/rrd_gfx.c
@@ -1062,7 +1062,9 @@ static void svg_write_text(FILE *fp, const char *text)
 	text_count = mbstowcs(cstr, "Enc-Err", 6);
     p = cstr;
 #else
-    const unsigned char *p = text, ch;
+    unsigned char *p = text;
+    unsigned char *cstr;
+    char ch;
     if (!p)
 	return;
 #endif
@@ -1071,7 +1073,7 @@ static void svg_write_text(FILE *fp, const char *text)
     ch = afm_fix_osx_charset(ch); /* unsafe macro */
     switch (ch) {
     case 0:
-#ifdef HAVE_MBSTOWCS     
+#ifdef HAVE_MBSTOWCS
     free(cstr);
 #endif
     return;
@@ -1081,7 +1083,7 @@ static void svg_write_text(FILE *fp, const char *text)
     case '"': fputs(""", fp); break;
     default:
         if (ch == 32) {
-#ifdef HAVE_MBSTOWCS     
+#ifdef HAVE_MBSTOWCS
             if (p <= cstr + 1 || !*p || *p == 32)
                 fputs("&#160;", fp); /* non-breaking space in unicode */
             else
@@ -1747,7 +1749,8 @@ static void eps_write_text(eps_state *state, gfx_node_t *node)
 	text_count = mbstowcs(cstr, "Enc-Err", 6);
     p = cstr;
 #else
-    const unsigned char *p = node->text, ch;
+    const unsigned char *p = node->text;
+    unsigned char ch;
     if (!p)
 	return;
 #endif
@@ -2034,9 +2037,9 @@ static void pdf_put_string_contents_wide(pdf_buffer *buf, const afm_char *text)
 	    default:
 		if (ch > 255) {
 		    pdf_put_char(buf, '?');
-		} else if (ch >= 126 || ch < 32) {
+		} else if (ch > 125 || ch < 32) {
 		    pdf_put_char(buf, ch);
-		} else if (ch >= 0 && ch <= 255) {
+		} else {
 		    char tmp[10];
 		    snprintf(tmp, sizeof(tmp), "\\%03o", (int)ch);
 		    pdf_puts(buf, tmp);