From 0a78f12401d61199a879838831f0ee3641ea6dda Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Tue, 30 Sep 2014 07:54:38 +0000 Subject: [PATCH] Clean up some compiler warnings. --- src/libdhcpcd/unvis.c | 6 +++--- src/libdhcpcd/vis.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libdhcpcd/unvis.c b/src/libdhcpcd/unvis.c index 4849b9d..407c524 100644 --- a/src/libdhcpcd/unvis.c +++ b/src/libdhcpcd/unvis.c @@ -95,7 +95,7 @@ unvis(char *cp, int c, int *astate, int flag) #define SS(a, b) (((uint32_t)(a) << 24) | (b)) #define GI(a) ((uint32_t)(a) >> 24) - st = GS(*astate); + st = (unsigned char)GS(*astate); if (flag & UNVIS_END) { switch (st) { @@ -211,14 +211,14 @@ unvis(char *cp, int c, int *astate, int flag) case S_META1: *astate = SS(0, S_GROUND); - *cp |= c; + *cp |= (char)c; return UNVIS_VALID; case S_CTRL: if (c == '?') *cp |= 0177; else - *cp |= c & 037; + *cp |= (char)(c & 037); *astate = SS(0, S_GROUND); return UNVIS_VALID; diff --git a/src/libdhcpcd/vis.c b/src/libdhcpcd/vis.c index 01206a2..8280c0d 100644 --- a/src/libdhcpcd/vis.c +++ b/src/libdhcpcd/vis.c @@ -139,9 +139,9 @@ dhcpcd_svis(char *dst, int c, int flag, int nextc, const char *extra) *dst++ = '\\'; if (isextra || ((c & 0177) == ' ') || (flag & VIS_OCTAL)) { - *dst++ = (((unsigned char)c >> 6) & 03) + '0'; - *dst++ = (((unsigned char)c >> 3) & 07) + '0'; - *dst++ = ( (unsigned char)c & 07) + '0'; + *dst++ = (char)((((unsigned char)c >> 6) & 03) + '0'); + *dst++ = (char)((((unsigned char)c >> 3) & 07) + '0'); + *dst++ = (char)(( (unsigned char)c & 07) + '0'); } else { if (c & 0200) { c &= 0177; *dst++ = 'M'; -- 1.7.1