Simplify the JSON handling in the 'i' subcommands ##bin

Author: radare

libr/bin/format/pdb/pdb_downloader.c

@@ -1,7 +1,5 @@
-/* radare - LGPL - Copyright 2014-2022 - inisider */
+/* radare - LGPL - Copyright 2014-2025 - inisider */
 
-#include <string.h>
-#include <r_util.h>
 #include <r_core.h>
 #include "pdb_downloader.h"
 
@@ -170,8 +168,7 @@ static bool is_valid_guid(const char *guid) {
 	return i >= 33; // len of GUID and age
 }
 
-int r_bin_pdb_download(RCore *core, PJ *pj, int isradjson, SPDBOptions *options) {
-	int ret;
+int r_bin_pdb_download(RCore *core, PJ *pj, SPDBOptions *options) {
 	SPDBDownloaderOpt opt;
 	SPDBDownloader pdb_downloader;
 	RBinInfo *info = r_bin_get_info (core->bin);
@@ -199,9 +196,10 @@ int r_bin_pdb_download(RCore *core, PJ *pj, int isradjson, SPDBOptions *options)
 	opt.extract = options->extract;
 
 	init_pdb_downloader (&opt, &pdb_downloader);
-	ret = pdb_downloader.download? pdb_downloader.download (&pdb_downloader): 0;
-	if (isradjson) {
-		pj_ko (pj, "pdb");
+	int ret = pdb_downloader.download? pdb_downloader.download (&pdb_downloader): 0;
+	if (pj) {
+		// pj_ko (pj, "pdb");
+		pj_o (pj);
 		pj_ks (pj, "file", opt.dbg_file);
 		pj_kb (pj, "download", (bool) ret);
 		pj_end (pj);

libr/bin/format/pdb/pdb_downloader.h

@@ -45,7 +45,7 @@ void deinit_pdb_downloader(SPDBDownloader *pdb_downloader);
 
 ///
 /// \brief download PDB file
-R_API int r_bin_pdb_download(RCore *core, PJ *pj, int isradjson, SPDBOptions *options);
+R_API int r_bin_pdb_download(RCore *core, PJ *pj, SPDBOptions *options);
 
 #ifdef __cplusplus
 }

libr/core/cbin.c

@@ -1329,19 +1329,19 @@ R_API bool r_core_pdb_info(RCore *core, const char *file, PJ *pj, int mode) {
 		mode = 'd'; // default
 		break;
 	}
-	if (pj || mode == 'j') {
+
+	if (mode == 'j') {
 		pj_o (pj);
 	}
-
 	pdb.print_types (&pdb, pj, mode);
 	pdb.print_gvars (&pdb, baddr, pj, mode);
 	// Save compound types into SDB
 	r_parse_pdb_types (core->anal, &pdb);
 	pdb.finish_pdb_parse (&pdb);
-
-	if (pj || mode == 'j') {
+	if (mode == 'j') {
 		pj_end (pj);
 	}
+
 	return true;
 }
 
@@ -4824,7 +4824,7 @@ R_API bool r_core_bin_info(RCore *core, int action, PJ *pj, int mode, int va, RC
 	if ((action & R_CORE_BIN_ACC_MAIN)) {
 		ret &= bin_main (core, pj, mode, va);
 	}
-	if ((action & R_CORE_BIN_ACC_DWARF)) { // R2_600 : Rename R_CORE_BIN_ACC_DWARF to _ADDRLINE
+	if ((action & R_CORE_BIN_ACC_ADDRLINE)) {
 		ret &= bin_addrline (core, pj, mode);
 	}
 	if ((action & R_CORE_BIN_ACC_PDB)) {