Fix another tcc regresson on windows

radareorg · Feb 13, 2024 · 7552613 · 7552613
1 parent 6c6af6d
commit 7552613
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/libr/anal/c/libtcc.c b/libr/anal/c/libtcc.c
@@ -653,8 +653,6 @@ typedef struct FlagDef {
 	const char *name;
 } FlagDef;
 
-typedef void (*TccCallback)(const char *, char **);
-
 R_API void tcc_set_callback(TCCState *s, TccCallback cb, char **p) {
 	if (cb) {
 		s->cb = cb;

diff --git a/libr/anal/c/libtcc.h b/libr/anal/c/libtcc.h
@@ -89,8 +89,9 @@ R_API int tcc_relocate(TCCState *s1, void *ptr);
 /* return symbol value or NULL if not found */
 R_API void *tcc_get_symbol(TCCState *s, const char *name);
 
+typedef void (*TccCallback)(const char *, char **);
 
-R_API void tcc_set_callback(TCCState *s, void (*cb)(const char *,char**), char **p);
+R_API void tcc_set_callback(TCCState *s, TccCallback cb, char **p);
 
 #ifdef __cplusplus
 }

diff --git a/libr/cons/cpipe.c b/libr/cons/cpipe.c
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2022 - pancake */
+/* radare - LGPL - Copyright 2009-2024 - pancake */
 
 #include <r_cons.h>
 #include <r_th.h>

diff --git a/libr/core/cmd.c b/libr/core/cmd.c
@@ -3927,15 +3927,14 @@ static char *find_eoq(char *p) {
 
 static char* findSeparator(char *p) {
 	char *q = strchr (p, '+');
-	if (q) {
-		return q;
-	}
-	return strchr (p, '-');
+	return q? q: strchr (p, '-');
 }
 
 static void tmpenvs_free(void *item) {
-	r_sys_setenv (item, NULL);
-	free (item);
+	if (item) {
+		r_sys_setenv (item, NULL);
+		free (item);
+	}
 }
 
 static bool set_tmp_arch(RCore *core, char *arch, char **tmparch) {
@@ -3947,7 +3946,7 @@ static bool set_tmp_arch(RCore *core, char *arch, char **tmparch) {
 }
 
 static bool set_tmp_bits(RCore *core, int bits, char **tmpbits, int *cmd_ignbithints) {
-	r_return_val_if_fail (tmpbits, false);
+	R_RETURN_VAL_IF_FAIL (tmpbits, false);
 	*tmpbits = strdup (r_config_get (core->config, "asm.bits"));
 	r_config_set_i (core->config, "asm.bits", bits);
 	core->fixedbits = true;
@@ -3958,6 +3957,7 @@ static bool set_tmp_bits(RCore *core, int bits, char **tmpbits, int *cmd_ignbith
 }
 
 static char *r_core_cmd_find_subcmd_begin(char *cmd) {
+	R_RETURN_VAL_IF_FAIL (cmd, NULL);
 	int quote = 0;
 	char *p;
 	for (p = cmd; *p; p++) {