Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-27 08:12:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix ?* and other uninitialized warnings

Browse Source
This commit is contained in:
pancake 2017-08-22 11:12:06 +02:00
parent c99bae1b6c
commit 4fb761e4c8
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libr/core/cmd.c
View File

@ -375,9 +375,8 @@ static int cmd_alias(void *data, const char *input) {
}
/* Show command for alias */
} else if (desc && !q) {
char *v;
*desc = 0;
v = r_cmd_alias_get (core->rcmd, buf, 0);
char *v = r_cmd_alias_get (core->rcmd, buf, 0);
if (v) {
r_cons_println (v);
free (buf);
@ -385,9 +384,8 @@ static int cmd_alias(void *data, const char *input) {
} else {
eprintf ("unknown key '%s'\n", buf);
}
/* Show aliases */
} else if (buf[1] == '*') {
/* Show aliases */
int i, count = 0;
char **keys = r_cmd_alias_keys (core->rcmd, &count);
for (i = 0; i < count; i++) {
@ -400,11 +398,12 @@ static int cmd_alias(void *data, const char *input) {
for (i = 0; i < count; i++) {
r_cons_println (keys[i]);
}
/* Execute alias */
} else {
char *v;
if (q) *q = 0;
v = r_cmd_alias_get (core->rcmd, buf, 0);
/* Execute alias */
if (q) {
*q = 0;
}
char *v = r_cmd_alias_get (core->rcmd, buf, 0);
if (v) {
if (q) {
char *out, *args = q + 1;
@ -415,7 +414,9 @@ static int cmd_alias(void *data, const char *input) {
strcat (out, args);
r_core_cmd0 (core, out);
free (out);
} else eprintf ("cannot malloc\n");
} else {
eprintf ("cannot malloc\n");
}
} else {
r_core_cmd0 (core, v);
}
@ -1657,8 +1658,7 @@ static int r_core_cmd_subst_i(RCore *core, char *cmd, char *colon) {
}
haveQuote = q != NULL;
oseek = core->offset;
r_core_seek (core,
r_num_math (core->num, p + 2), 1);
r_core_seek (core, r_num_math (core->num, p + 2), 1);
if (q) {
*p = '"';
p = q;
@ -1824,7 +1824,7 @@ static int r_core_cmd_subst_i(RCore *core, char *cmd, char *colon) {
core->oobi = NULL;
ptr = strstr (cmd, "?*");
if (ptr && ptr != cmd) {
if (ptr) {
char *prech = ptr - 1;
if (*prech != '~') {
ptr[1] = 0;
@ -2223,7 +2223,7 @@ ignore:
offstr = r_str_trim_head (ptr + 1);
addr = r_num_math (core->num, offstr);
if (isalpha ((unsigned char)ptr[1]) && !addr) {
if (isalpha ((ut8)ptr[1]) && !addr) {
if (!r_flag_get (core->flags, ptr + 1)) {
eprintf ("Invalid address (%s)\n", ptr + 1);
goto fail;

11
libr/core/cmd_help.c
View File

@ -1,4 +1,4 @@
/* radare - LGPL - Copyright 2009-2016 - pancake */
/* radare - LGPL - Copyright 2009-2017 - pancake */
#include <stddef.h>
#include "r_cons.h"
@ -36,7 +36,7 @@ static const char *help_msg_root[] = {
"t","[?]", "Types, noreturn, signatures, C parser and more",
"T","[?] [-] [num|msg]", "Text log utility",
"u","[?]", "uname/undo seek/write",
"V","", "Enter visual mode (V! = panels, VV = fcngraph, VVV = callgraph)",
"V","", "Visual mode (V! = panels, VV = fcngraph, VVV = callgraph)",
"w","[?] [str]", "Multiple write operations",
"x","[?] [len]", "Alias for 'px' (print hexadecimal)",
"y","[?] [len] [[[@]addr", "Yank/paste bytes from/to memory",
@ -845,12 +845,13 @@ static int cmd_help(void *data, const char *input) {
r_cons_printf ("%"PFMT64d"\n", core->num->value);
}
break;
case '\0':
default:
// TODO #7967 help refactor
r_cons_printf("Usage: [.][times][cmd][~grep][@[@iter]addr!size][|>pipe] ; ...\n"
"Append '?' to any char command to get detailed help\n"
"Prefix with number to repeat command N times (f.ex: 3x)\n");
r_cons_printf ("Usage: [.][times][cmd][~grep][@[@iter]addr!size][|>pipe] ; ...\n"
"Append '?' to any char command to get detailed help\n"
"Prefix with number to repeat command N times (f.ex: 3x)\n");
r_core_cmd_help (core, help_msg_root);
break;
}

4
libr/core/cmd_print.c
View File

@ -4260,8 +4260,8 @@ static int cmd_print(void *data, const char *input) {
case 'j': // "psj"
if (l > 0) {
char *str, *type;
ut64 vaddr;
RIOSection *section;
ut64 vaddr = UT64_MAX;
RIOSection *section = NULL;
if (input[2] == ' ' && input[3]) {
len = r_num_math (core->num, input + 3);