X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fstr-esc.c;h=248b7aba06c6e9d267b18f4f3c9fc0df4c29d64c;hb=564be9c0adf9f5796b60f2727cecc9c7274f86ff;hp=1796a7041a3c38e21a8c6f8df50edd584bc09955;hpb=ba1c173f544383aa6553a75dee6e6858d8f243a4;p=libucw.git diff --git a/ucw/str-esc.c b/ucw/str-esc.c index 1796a704..248b7aba 100644 --- a/ucw/str-esc.c +++ b/ucw/str-esc.c @@ -10,9 +10,9 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/string.h" -#include "ucw/chartype.h" +#include +#include +#include #include char * @@ -43,7 +43,7 @@ str_unesc(char *d, const char *s) else { char *p; - uns v = strtoul(s + 2, &p, 16); + uint v = strtoul(s + 2, &p, 16); if (v <= 255) *d++ = v; else @@ -54,9 +54,9 @@ str_unesc(char *d, const char *s) default: if (s[1] >= '0' && s[1] <= '7') { - uns v = s[1] - '0'; + uint v = s[1] - '0'; s += 2; - for (uns i = 0; i < 2 && *s >= '0' && *s <= '7'; s++, i++) + for (uint i = 0; i < 2 && *s >= '0' && *s <= '7'; s++, i++) v = (v << 3) + *s - '0'; if (v <= 255) *d++ = v;