X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ucw%2Fstr-esc.c;h=248b7aba06c6e9d267b18f4f3c9fc0df4c29d64c;hb=564be9c0adf9f5796b60f2727cecc9c7274f86ff;hp=97bbe387e79a95c3c4b14ad6f07330368b7064c1;hpb=a4fe009d3366b0a3e119713b0ecc7fc0070efdfa;p=libucw.git

diff --git a/ucw/str-esc.c b/ucw/str-esc.c
index 97bbe387..248b7aba 100644
--- a/ucw/str-esc.c
+++ b/ucw/str-esc.c
@@ -10,13 +10,11 @@
 
 #undef LOCAL_DEBUG
 
-#include "ucw/lib.h"
-#include "ucw/string.h"
-#include "ucw/chartype.h"
+#include <ucw/lib.h>
+#include <ucw/string.h>
+#include <ucw/chartype.h>
 #include <stdlib.h>
 
-/* Expands C99-like escape sequences.
- * It is safe to use the same buffer for both input and output. */
 char *
 str_unesc(char *d, const char *s)
 {
@@ -45,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
@@ -56,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;