<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/26475">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">logging: Replace remaining fprintf() calls with libosmocore logging<br><br>Change-Id: I2a772b3180131923d4e2ee7311670b938cb50fe0<br>---<br>M src/bankd/bankd_pcsc.c<br>M src/bankd/driver_core.c<br>M src/bankd/driver_pcsc.c<br>M src/client/remsim_client.c<br>M src/client/remsim_client_main.c<br>M src/client/user_simtrace2.c<br>M src/rspro_util.c<br>7 files changed, 25 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bankd/bankd_pcsc.c b/src/bankd/bankd_pcsc.c</span><br><span>index 91eeadd..8202504 100644</span><br><span>--- a/src/bankd/bankd_pcsc.c</span><br><span>+++ b/src/bankd/bankd_pcsc.c</span><br><span>@@ -102,14 +102,16 @@</span><br><span> regex_t compiled_name;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("PC/SC slot name: %u/%u -> regex '%s'\n", sn->slot.bank_id, sn->slot.slot_nr, sn->name_regex);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_INFO, "PC/SC slot name: %u/%u -> regex '%s'\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ sn->slot.bank_id, sn->slot.slot_nr, sn->name_regex);</span><br><span> </span><br><span> memset(&compiled_name, 0, sizeof(compiled_name));</span><br><span> </span><br><span> rc = regcomp(&compiled_name, sn->name_regex, REG_EXTENDED);</span><br><span> if (rc != 0) {</span><br><span> char *errmsg = get_regerror(sn, rc, &compiled_name);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Error compiling regex '%s': %s - Ignoring\n", sn->name_regex, errmsg);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "Error compiling regex '%s': %s - Ignoring\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ sn->name_regex, errmsg);</span><br><span> talloc_free(errmsg);</span><br><span> talloc_free(sn);</span><br><span> } else {</span><br><span>@@ -141,7 +143,8 @@</span><br><span> </span><br><span> while ((bytes_read = fread(buf, 1, sizeof(buf), fp)) > 0) {</span><br><span> if (csv_parse(&p, buf, bytes_read, cb1, cb2, &ps) != bytes_read) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Error parsing CSV: %s\n", csv_strerror(csv_error(&p)));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_FATAL, "Error parsing bankd PC/SC CSV: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ csv_strerror(csv_error(&p)));</span><br><span> fclose(fp);</span><br><span> return -1;</span><br><span> }</span><br><span>diff --git a/src/bankd/driver_core.c b/src/bankd/driver_core.c</span><br><span>index dbdf23f..57ae3cd 100644</span><br><span>--- a/src/bankd/driver_core.c</span><br><span>+++ b/src/bankd/driver_core.c</span><br><span>@@ -28,6 +28,7 @@</span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> </span><br><span> #include "internal.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "debug.h"</span><br><span> </span><br><span> static LLIST_HEAD(g_card_reader_drivers);</span><br><span> static LLIST_HEAD(g_card_readers);</span><br><span>@@ -46,7 +47,7 @@</span><br><span> </span><br><span> llist_add(&cr->list, &g_card_readers);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("allocated reader '%s'\n", cr->name);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_INFO, "allocated reader '%s'\n", cr->name);</span><br><span> </span><br><span> return cr;</span><br><span> }</span><br><span>@@ -78,7 +79,7 @@</span><br><span> struct card_reader_driver *drv;</span><br><span> </span><br><span> llist_for_each_entry(drv, &g_card_reader_drivers, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("probing driver '%s' for drivers\n", drv->name);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_INFO, "probing driver '%s' for drivers\n", drv->name);</span><br><span> drv->ops->probe(ctx);</span><br><span> }</span><br><span> }</span><br><span>diff --git a/src/bankd/driver_pcsc.c b/src/bankd/driver_pcsc.c</span><br><span>index 03a7f32..4279c2f 100644</span><br><span>--- a/src/bankd/driver_pcsc.c</span><br><span>+++ b/src/bankd/driver_pcsc.c</span><br><span>@@ -36,13 +36,14 @@</span><br><span> #include <winscard.h></span><br><span> </span><br><span> #include "internal.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "debug.h"</span><br><span> </span><br><span> #define PCSC_ERROR(rv, text) \</span><br><span> if (rv != SCARD_S_SUCCESS) { \</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, text ": %s (0x%lX)\n", pcsc_stringify_error(rv), rv); \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, text ": %s (0x%lX)\n", pcsc_stringify_error(rv), rv); \</span><br><span> goto end; \</span><br><span> } else { \</span><br><span style="color: hsl(0, 100%, 40%);">- printf(text ": OK\n\n"); \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_DEBUG, ": OK\n\n"); \</span><br><span> }</span><br><span> </span><br><span> static void pcsc_readers_probe(void *ctx)</span><br><span>@@ -73,7 +74,7 @@</span><br><span> num_readers++;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("num_readers=%d\n", num_readers);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_DEBUG, "num_readers=%d\n", num_readers);</span><br><span> </span><br><span> end:</span><br><span> if (mszReaders)</span><br><span>diff --git a/src/client/remsim_client.c b/src/client/remsim_client.c</span><br><span>index 182894f..388aa26 100644</span><br><span>--- a/src/client/remsim_client.c</span><br><span>+++ b/src/client/remsim_client.c</span><br><span>@@ -140,7 +140,7 @@</span><br><span> </span><br><span> bc->main_fi = main_fsm_alloc(bc, bc);</span><br><span> if (!bc->main_fi) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Unable to create main client FSM: %s\n", strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_FATAL, "Unable to create main client FSM: %s\n", strerror(errno));</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span>@@ -158,7 +158,7 @@</span><br><span> </span><br><span> rc = server_conn_fsm_alloc(bc, srvc);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Unable to create Server conn FSM: %s\n", strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_FATAL, "Unable to create Server conn FSM: %s\n", strerror(errno));</span><br><span> exit(1);</span><br><span> }</span><br><span> osmo_fsm_inst_change_parent(srvc->fi, bc->main_fi, MF_E_SRVC_LOST);</span><br><span>@@ -171,7 +171,7 @@</span><br><span> memcpy(&bankdc->own_comp_id, &srvc->own_comp_id, sizeof(bankdc->own_comp_id));</span><br><span> rc = server_conn_fsm_alloc(bc, bankdc);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Unable to connect bankd conn FSM: %s\n", strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_FATAL, "Unable to connect bankd conn FSM: %s\n", strerror(errno));</span><br><span> exit(1);</span><br><span> }</span><br><span> osmo_fsm_inst_update_id(bankdc->fi, "bankd");</span><br><span>diff --git a/src/client/remsim_client_main.c b/src/client/remsim_client_main.c</span><br><span>index f064960..47ec8ac 100644</span><br><span>--- a/src/client/remsim_client_main.c</span><br><span>+++ b/src/client/remsim_client_main.c</span><br><span>@@ -188,7 +188,7 @@</span><br><span> </span><br><span> /* Silently (and portably) reap children. */</span><br><span> if (avoid_zombies() < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Unable to silently reap children: %s\n", strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_FATAL, "Unable to silently reap children: %s\n", strerror(errno));</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/client/user_simtrace2.c b/src/client/user_simtrace2.c</span><br><span>index 8d8a6c9..100d55b 100644</span><br><span>--- a/src/client/user_simtrace2.c</span><br><span>+++ b/src/client/user_simtrace2.c</span><br><span>@@ -404,7 +404,7 @@</span><br><span> </span><br><span> rc = osmo_libusb_init(NULL);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "libusb initialization failed\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "libusb initialization failed\n");</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span>@@ -427,7 +427,7 @@</span><br><span> transp->usb_async = true;</span><br><span> transp->usb_devh = osmo_libusb_open_claim_interface(NULL, NULL, ifm);</span><br><span> if (!transp->usb_devh) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "can't open USB device\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "can't open USB device\n");</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>@@ -437,14 +437,14 @@</span><br><span> </span><br><span> rc = libusb_claim_interface(transp->usb_devh, cfg->usb.if_num);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "can't claim interface %d; rc=%d\n", cfg->usb.if_num, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "can't claim interface %d; rc=%d\n", cfg->usb.if_num, rc);</span><br><span> goto close_exit;</span><br><span> }</span><br><span> </span><br><span> rc = osmo_libusb_get_ep_addrs(transp->usb_devh, cfg->usb.if_num, &transp->usb_ep.out,</span><br><span> &transp->usb_ep.in, &transp->usb_ep.irq_in);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "can't obtain EP addrs; rc=%d\n", rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "can't obtain EP addrs; rc=%d\n", rc);</span><br><span> goto close_exit;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/rspro_util.c b/src/rspro_util.c</span><br><span>index ab748f6..a7476dc 100644</span><br><span>--- a/src/rspro_util.c</span><br><span>+++ b/src/rspro_util.c</span><br><span>@@ -33,6 +33,7 @@</span><br><span> #include <osmocom/rspro/RsproPDU.h></span><br><span> </span><br><span> #include "rspro_util.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "debug.h"</span><br><span> </span><br><span> #define ASN_ALLOC_COPY(out, in) \</span><br><span> do { \</span><br><span>@@ -69,7 +70,7 @@</span><br><span> msg->l2h = msg->data;</span><br><span> rval = der_encode_to_buffer(&asn_DEF_RsproPDU, pdu, msgb_data(msg), msgb_tailroom(msg));</span><br><span> if (rval.encoded < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Failed to encode %s\n", rval.failed_type->name);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRSPRO, LOGL_ERROR, "Failed to encode %s\n", rval.failed_type->name);</span><br><span> msgb_free(msg);</span><br><span> return NULL;</span><br><span> }</span><br><span>@@ -86,10 +87,10 @@</span><br><span> RsproPDU_t *pdu = NULL;</span><br><span> asn_dec_rval_t rval;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- //printf("decoding %s\n", msgb_hexdump(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRSPRO, LOGL_DEBUG, "decoding %s\n", msgb_hexdump(msg));</span><br><span> rval = ber_decode(NULL, &asn_DEF_RsproPDU, (void **) &pdu, msgb_l2(msg), msgb_l2len(msg));</span><br><span> if (rval.code != RC_OK) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Failed to decode: %d. Consumed %zu of %u bytes\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRSPRO, LOGL_ERROR, "Failed to decode: %d. Consumed %zu of %u bytes\n",</span><br><span> rval.code, rval.consumed, msgb_length(msg));</span><br><span> return NULL;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/26475">change 26475</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-remsim/+/26475"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2a772b3180131923d4e2ee7311670b938cb50fe0 </div>
<div style="display:none"> Gerrit-Change-Number: 26475 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>