Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-03-03 03:35:37 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Improve enum and bitfield names in pf

Browse Source 
Remove the use of null char for non printable chars
English fix
This commit is contained in:
Skia 2014-10-26 16:31:00 +01:00 committed by pancake
parent d54abd6739
commit 231064047c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libr/util/p_format.c
View File

@ -99,13 +99,13 @@ static void r_print_format_byte(const RPrint* p, int endian, int mustset,
p->printf ("%d", buf[i]);
else
p->printf ("%d ; 0x%02x ; '%c'", buf[i], buf[i],
IS_PRINTABLE (buf[i])?buf[i]:0);
IS_PRINTABLE (buf[i])?buf[i]:'.');
else {
if (json)
p->printf ("[ %d", buf[i]);
else
p->printf ("[ %d ; 0x%02x ; '%c'", buf[i], buf[i],
IS_PRINTABLE (buf[i])?buf[i]:0);
IS_PRINTABLE (buf[i])?buf[i]:'.');
size--;
i++;
while (size--) {
@ -113,7 +113,7 @@ static void r_print_format_byte(const RPrint* p, int endian, int mustset,
p->printf (", %d", buf[i]);
else
p->printf (", %d ; 0x%02x ; '%c'", buf[i], buf[i],
IS_PRINTABLE (buf[i])?buf[i]:0);
IS_PRINTABLE (buf[i])?buf[i]:'.');
i++;
}
p->printf (" ]");
@ -133,13 +133,13 @@ static void r_print_format_char(const RPrint* p, int endian, int mustset,
p->printf ("\"%c\"", buf[i]);
else
p->printf (" %d ; '%c'", buf[i], buf[i], buf[i],
IS_PRINTABLE (buf[i])?buf[i]:0);
IS_PRINTABLE (buf[i])?buf[i]:'.');
else {
if (json)
p->printf ("[ \"%c\"", buf[i]);
else
p->printf ("[ %d ; '%c'", buf[i], buf[i], buf[i],
IS_PRINTABLE (buf[i])?buf[i]:0);
IS_PRINTABLE (buf[i])?buf[i]:'.');
size--;
i++;
while (size--) {
@ -147,7 +147,7 @@ static void r_print_format_char(const RPrint* p, int endian, int mustset,
p->printf (", \"%c\"", buf[i]);
else
p->printf (", %d ; '%c'", buf[i], buf[i], buf[i],
IS_PRINTABLE (buf[i])?buf[i]:0);
IS_PRINTABLE (buf[i])?buf[i]:'.');
i++;
}
p->printf (" ]");
@ -651,12 +651,12 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
if (oldprintf)
p->printf = oldprintf;
if (idx<nargs && tmp != 'e' && isptr == 0) {
const char *name = r_str_word_get0 (args, idx);
if (ISSTRUCT) {
char *name = r_str_word_get0 (args, idx);
if (ISSTRUCT || tmp=='E' || tmp=='B') {
if (*name == '(') {
name = strchr (name, ')')+1;
} else {
eprintf ("Struct name missing (%s)\n", name);
eprintf ("Missing name (%s)\n", name);
goto beach;
}
}