From b5d113bb070a039ac2ea0af5d2960d4871b98e3e Mon Sep 17 00:00:00 2001
From: pancake <pancake@nowsecure.com>
Date: Fri, 2 Aug 2024 00:10:45 +0200
Subject: [PATCH] Apply suggestions from code review

---
 libr/arch/p/pyc/pyc_dis.c | 2 +-
 libr/bin/p/bin_lua.c      | 2 +-
 libr/core/cmd_anal.inc.c  | 2 +-
 libr/core/cmd_help.inc.c  | 6 +++---
 libr/core/panels.c        | 4 ++--
 libr/main/rax2.c          | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libr/arch/p/pyc/pyc_dis.c b/libr/arch/p/pyc/pyc_dis.c
index 6e20259e0e8c37..0ab97c5acc7bc1 100644
--- a/libr/arch/p/pyc/pyc_dis.c
+++ b/libr/arch/p/pyc/pyc_dis.c
@@ -167,7 +167,7 @@ static char *parse_arg(pyc_opcode_object *op, ut32 oparg, pyc_code_object *cobj,
 		if (oparg < 0 || oparg >= CMP_OP_SIZE) {
 			return NULL;
 		}
-		arg = R_STR_DUP (cmp_op[oparg]);
+		arg = strdup (cmp_op[oparg]);
 	}
 	if (op->type & HASFREE) {
 		if (!cellvars || !freevars) {
diff --git a/libr/bin/p/bin_lua.c b/libr/bin/p/bin_lua.c
index d2b0d21c86c633..c1660878a36d88 100644
--- a/libr/bin/p/bin_lua.c
+++ b/libr/bin/p/bin_lua.c
@@ -145,7 +145,7 @@ static void addString(const ut8 *buf, ut64 offset, ut64 length, ParseStruct *par
 	}
 
 	binstring->string = NULL;
-	if (length) {
+	if (length > 0) {
 		binstring->string = r_str_ndup ((char *) buf + offset, length);
 	}
 	binstring->vaddr = binstring->paddr = offset;
diff --git a/libr/core/cmd_anal.inc.c b/libr/core/cmd_anal.inc.c
index d2130bd0947683..5d51712d152383 100644
--- a/libr/core/cmd_anal.inc.c
+++ b/libr/core/cmd_anal.inc.c
@@ -10183,7 +10183,7 @@ static char *get_buf_asm(RCore *core, ut64 from, ut64 addr, RAnalFunction *fcn,
 		buf_asm = r_print_colorize_opcode (core->print, str,
 				core->cons->context->pal.reg, core->cons->context->pal.num, false, fcn ? fcn->addr : 0);
 	} else {
-		buf_asm = R_STR_DUP (str);
+		buf_asm = strdup (str);
 	}
 	return buf_asm;
 }
diff --git a/libr/core/cmd_help.inc.c b/libr/core/cmd_help.inc.c
index e99b2e929c4585..6976009893d1cc 100644
--- a/libr/core/cmd_help.inc.c
+++ b/libr/core/cmd_help.inc.c
@@ -456,8 +456,8 @@ static char *filterFlags(RCore *core, const char *msg) {
 			end = strchr (dollar + 2, '}');
 			if (end) {
 				word = NULL;
-				if (end-dollar-2) {
-					word = r_str_ndup (dollar+2, end-dollar-2);
+				if (end - dollar - 2 > 0) {
+					word = r_str_ndup (dollar + 2, end - dollar - 2);
 				}
 				end++;
 			} else {
@@ -475,7 +475,7 @@ static char *filterFlags(RCore *core, const char *msg) {
 				end = dollar + strlen (dollar);
 			}
 			word = NULL;
-			if (end-dollar-1) {
+			if (end - dollar - 1 > 0) {
 				word = r_str_ndup (dollar+1, end-dollar-1);
 			}
 		}
diff --git a/libr/core/panels.c b/libr/core/panels.c
index f11c2ef247d926..6cdfb9598ca10e 100644
--- a/libr/core/panels.c
+++ b/libr/core/panels.c
@@ -627,7 +627,7 @@ static void __set_decompiler_cache(RCore *core, char *s) {
 		} else {
 			Sdb *sdb = sdb_new0 ();
 			const char *pdc_now = r_config_get (core->config, "cmd.pdc");
-			sdb_ptr_set (sdb, r_num_as_string (NULL, func->addr, false), R_STR_DUP (s), 0);
+			sdb_ptr_set (sdb, r_num_as_string (NULL, func->addr, false), strdup (s), 0);
 			core->panels_root->cur_pdc_cache = sdb;
 			if (!sdb_exists (core->panels_root->pdc_caches, pdc_now)) {
 				sdb_ptr_set (core->panels_root->pdc_caches, strdup (pdc_now), sdb, 0);
@@ -5236,7 +5236,7 @@ static void __add_menu(RCore *core, const char *parent, const char *name, RPanel
 	}
 	item->n_sub = 0;
 	item->selectedIndex = 0;
-	item->name = name ? R_STR_DUP (name) : NULL;
+	item->name = R_STR_DUP (name);
 	item->sub = NULL;
 	item->cb = cb;
 	item->p = R_NEW0 (RPanel);
diff --git a/libr/main/rax2.c b/libr/main/rax2.c
index af581850168048..e07aab28bb2251 100644
--- a/libr/main/rax2.c
+++ b/libr/main/rax2.c
@@ -688,7 +688,7 @@ static bool rax(RNum *num, char *str, int len, int last, RaxActions *flags, RaxM
 	}
 	if (flags->octal2raw) { // -o
 		char *modified_str = (*str == '0')
-			? R_STR_DUP (str)
+			? strdup (str)
 			: r_str_newf ("0%s", str);
 		const char *errstr = NULL;
 		ut64 n = r_num_calc (num, modified_str, &errstr);