kernel
/
dtc
mirror of https://git.kernel.org/pub/scm/utils/dtc/dtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dtc: Cleanup \nnn and \xNN string escape handling 

Several small cleanups to the handling of octal and hex string
escapes:
	- Use strncmp() instead dof what were essentially open-coded
          versions of the same, with short fixed lengths.
	- The call path to get_oct_char() means an empty escape is not
          possible.  So replace the error message in this case with an
          assert.
	- Use die() instead of a non-fatal error message if
          get_hex_char() is given an empty escape.  Change error
          message to close match gcc's in the same circumstance.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
main
David Gibson 2008-03-17 17:03:47 +11:00 committed by Jon Loeliger
parent 3bdd393965
commit 2192d46dfd
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
data.c
View File

@ -75,16 +75,11 @@ static char get_oct_char(const char *s, int *i)
long val;

x[3] = '\0';
x[0] = s[(*i)];
if (x[0]) {
x[1] = s[(*i)+1];
if (x[1])
x[2] = s[(*i)+2];
}
strncpy(x, s + *i, 3);

val = strtol(x, &endx, 8);
if ((endx - x) == 0)
fprintf(stderr, "Empty \\nnn escape\n");

assert(endx > x);

(*i) += endx - x;
return val;
@ -97,13 +92,11 @@ static char get_hex_char(const char *s, int *i)
long val;

x[2] = '\0';
x[0] = s[(*i)];
if (x[0])
x[1] = s[(*i)+1];
strncpy(x, s + *i, 2);

val = strtol(x, &endx, 16);
if ((endx - x) == 0)
fprintf(stderr, "Empty \\x escape\n");
if (!(endx > x))
die("\\x used with no following hex digits\n");

(*i) += endx - x;
return val;