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

replace usage of killed r_str_trim

Browse Source
This commit is contained in:
Jeffrey Crowell 2016-06-10 01:12:07 +00:00
parent 50417301a9
commit 3e8a0cc693
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/asm/asm.c
View File

@ -53,7 +53,7 @@ static inline int r_asm_pseudo_org(RAsm *a, char *input) {
static inline int r_asm_pseudo_hex(RAsmOp *op, char *input) { static inline int r_asm_pseudo_hex(RAsmOp *op, char *input) {
int len = r_hex_str2bin (input, op->buf); int len = r_hex_str2bin (input, op->buf);
strncpy (op->buf_hex, r_str_trim (input), R_ASM_BUFSIZE-1); strncpy (op->buf_hex, r_str_trim_head_tail (input), R_ASM_BUFSIZE-1);
return len; return len;
} }

4
libr/debug/esil.c
View File

@ -146,7 +146,7 @@ static int exprmatchreg (RDebug *dbg, const char *regname, const char *expr) {
if (!strcmp (regname, s)) { if (!strcmp (regname, s)) {
ret = 1; ret = 1;
} else { } else {
#define CURVAL 0){}r_str_trim(s);if (!strcmp(regname,s) && regval #define CURVAL 0){}r_str_trim_head_tail (s);if (!strcmp(regname,s) && regval
ut64 regval = r_debug_reg_get_err (dbg, regname, NULL); ut64 regval = r_debug_reg_get_err (dbg, regname, NULL);
if (exprtoken (dbg, s, ">=", &p)) { if (exprtoken (dbg, s, ">=", &p)) {
if (CURVAL >= r_num_math (dbg->num, p)) if (CURVAL >= r_num_math (dbg->num, p))
@ -164,7 +164,7 @@ static int exprmatchreg (RDebug *dbg, const char *regname, const char *expr) {
if (CURVAL > r_num_math (dbg->num, p)) if (CURVAL > r_num_math (dbg->num, p))
ret = 1; ret = 1;
} else if (exprtoken (dbg, s, " ", &p)) { } else if (exprtoken (dbg, s, " ", &p)) {
r_str_trim (s); r_str_trim_head_tail (s);
if (!strcmp (regname, s)) { if (!strcmp (regname, s)) {
ut64 num = r_num_math (dbg->num, p); ut64 num = r_num_math (dbg->num, p);
ret = exprmatch (dbg, num, s); ret = exprmatch (dbg, num, s);