<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22962">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Drop use of log_set_print_filename() API inside libosmocore<br><br>Let's use log_set_print_filename2() API instead, which has less ackward<br>behavior implications like changing the print status of category-hex.<br><br>Related: OS#5034<br>Change-Id: Ifc78e1dcba5baf0b41f6ccbbbd1e3f06552d73da<br>---<br>M tests/fsm/fsm_dealloc_test.c<br>M tests/fsm/fsm_test.c<br>M tests/gb/bssgp_fc_test.c<br>M tests/gb/gprs_bssgp_test.c<br>M tests/gb/gprs_ns2_test.c<br>M tests/gb/gprs_ns_test.c<br>M tests/gsup/gsup_test.c<br>M tests/logging/logging_test.c<br>M tests/loggingrb/loggingrb_test.c<br>M tests/oap/oap_client_test.c<br>M tests/socket/socket_sctp_test.c<br>M tests/socket/socket_test.c<br>M tests/tdef/tdef_test.c<br>M tests/write_queue/wqueue_test.c<br>M utils/osmo-ns-dummy.c<br>15 files changed, 16 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/fsm/fsm_dealloc_test.c b/tests/fsm/fsm_dealloc_test.c</span><br><span>index 48f80e5..f4be93d 100644</span><br><span>--- a/tests/fsm/fsm_dealloc_test.c</span><br><span>+++ b/tests/fsm/fsm_dealloc_test.c</span><br><span>@@ -443,7 +443,7 @@</span><br><span> ctx = talloc_named_const(NULL, 0, "main");</span><br><span> osmo_init_logging2(ctx, NULL);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);</span><br><span> log_set_print_level(osmo_stderr_target, 1);</span><br><span> log_set_print_category(osmo_stderr_target, 1);</span><br><span> log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span>diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c</span><br><span>index 23e24cf..2cfdacd 100644</span><br><span>--- a/tests/fsm/fsm_test.c</span><br><span>+++ b/tests/fsm/fsm_test.c</span><br><span>@@ -412,7 +412,7 @@</span><br><span> log_init(&log_info, NULL);</span><br><span> stderr_target = log_target_create_stderr();</span><br><span> log_add_target(stderr_target);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_filename2(stderr_target, LOG_FILENAME_NONE);</span><br><span> log_set_use_color(stderr_target, 0);</span><br><span> log_set_print_category(stderr_target, 0);</span><br><span> log_set_print_category_hex(stderr_target, 0);</span><br><span>diff --git a/tests/gb/bssgp_fc_test.c b/tests/gb/bssgp_fc_test.c</span><br><span>index 23bcd57..63e8308 100644</span><br><span>--- a/tests/gb/bssgp_fc_test.c</span><br><span>+++ b/tests/gb/bssgp_fc_test.c</span><br><span>@@ -148,7 +148,7 @@</span><br><span> </span><br><span> osmo_init_logging2(ctx, &info);</span><br><span> log_set_use_color(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);</span><br><span> log_set_print_category(osmo_stderr_target, 0);</span><br><span> log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span> </span><br><span>diff --git a/tests/gb/gprs_bssgp_test.c b/tests/gb/gprs_bssgp_test.c</span><br><span>index 52e986e..43fc056 100644</span><br><span>--- a/tests/gb/gprs_bssgp_test.c</span><br><span>+++ b/tests/gb/gprs_bssgp_test.c</span><br><span>@@ -298,7 +298,7 @@</span><br><span> </span><br><span> osmo_init_logging2(ctx, &info);</span><br><span> log_set_use_color(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);</span><br><span> </span><br><span> msgb_talloc_ctx_init(ctx, 0);</span><br><span> </span><br><span>diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c</span><br><span>index 37719a9..cc1b2f1 100644</span><br><span>--- a/tests/gb/gprs_ns2_test.c</span><br><span>+++ b/tests/gb/gprs_ns2_test.c</span><br><span>@@ -522,8 +522,7 @@</span><br><span> void *ctx = talloc_named_const(NULL, 0, "gprs_ns2_test");</span><br><span> osmo_init_logging2(ctx, &info);</span><br><span> log_set_use_color(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);</span><br><span> log_set_print_category(osmo_stderr_target, 0);</span><br><span> log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span> log_set_log_level(osmo_stderr_target, LOGL_INFO);</span><br><span>diff --git a/tests/gb/gprs_ns_test.c b/tests/gb/gprs_ns_test.c</span><br><span>index e8e8b80..454a29e 100644</span><br><span>--- a/tests/gb/gprs_ns_test.c</span><br><span>+++ b/tests/gb/gprs_ns_test.c</span><br><span>@@ -906,11 +906,9 @@</span><br><span> log_set_use_color(osmo_stderr_target, 0);</span><br><span> log_set_print_category(osmo_stderr_target, 0);</span><br><span> log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_signal_register_handler(SS_L_NS, &test_signal, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);</span><br><span> log_set_log_level(osmo_stderr_target, LOGL_INFO);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_signal_register_handler(SS_L_NS, &test_signal, NULL);</span><br><span> </span><br><span> setlinebuf(stdout);</span><br><span> </span><br><span>diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c</span><br><span>index f84072c..3d7ea40 100644</span><br><span>--- a/tests/gsup/gsup_test.c</span><br><span>+++ b/tests/gsup/gsup_test.c</span><br><span>@@ -749,7 +749,7 @@</span><br><span> {</span><br><span> void *ctx = talloc_named_const(NULL, 0, "gsup_test");</span><br><span> osmo_init_logging2(ctx, &info);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);</span><br><span> log_set_print_timestamp(osmo_stderr_target, 0);</span><br><span> log_set_use_color(osmo_stderr_target, 0);</span><br><span> log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span>diff --git a/tests/logging/logging_test.c b/tests/logging/logging_test.c</span><br><span>index d036dc5..f873958 100644</span><br><span>--- a/tests/logging/logging_test.c</span><br><span>+++ b/tests/logging/logging_test.c</span><br><span>@@ -77,7 +77,7 @@</span><br><span> stderr_target = log_target_create_stderr();</span><br><span> log_add_target(stderr_target);</span><br><span> log_set_all_filter(stderr_target, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_filename2(stderr_target, LOG_FILENAME_NONE);</span><br><span> log_set_print_category_hex(stderr_target, 0);</span><br><span> log_set_print_category(stderr_target, 1);</span><br><span> log_set_use_color(stderr_target, 0);</span><br><span>diff --git a/tests/loggingrb/loggingrb_test.c b/tests/loggingrb/loggingrb_test.c</span><br><span>index 4a4d1f9..19378c3 100644</span><br><span>--- a/tests/loggingrb/loggingrb_test.c</span><br><span>+++ b/tests/loggingrb/loggingrb_test.c</span><br><span>@@ -64,7 +64,7 @@</span><br><span> ringbuf_target = log_target_create_rb(0x1000);</span><br><span> log_add_target(ringbuf_target);</span><br><span> log_set_all_filter(ringbuf_target, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(ringbuf_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_filename2(ringbuf_target, LOG_FILENAME_NONE);</span><br><span> log_set_print_category(ringbuf_target, 0);</span><br><span> log_set_print_category_hex(ringbuf_target, 0);</span><br><span> </span><br><span>diff --git a/tests/oap/oap_client_test.c b/tests/oap/oap_client_test.c</span><br><span>index 0ac32ea..622912f 100644</span><br><span>--- a/tests/oap/oap_client_test.c</span><br><span>+++ b/tests/oap/oap_client_test.c</span><br><span>@@ -260,7 +260,7 @@</span><br><span> OSMO_ASSERT(osmo_stderr_target);</span><br><span> log_set_use_color(osmo_stderr_target, 0);</span><br><span> log_set_print_timestamp(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);</span><br><span> log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span> log_set_print_category(osmo_stderr_target, 1);</span><br><span> log_parse_category_mask(osmo_stderr_target, "DLOAP,1");</span><br><span>diff --git a/tests/socket/socket_sctp_test.c b/tests/socket/socket_sctp_test.c</span><br><span>index 9705038..4ca52a3 100644</span><br><span>--- a/tests/socket/socket_sctp_test.c</span><br><span>+++ b/tests/socket/socket_sctp_test.c</span><br><span>@@ -222,7 +222,7 @@</span><br><span> ctx = talloc_named_const(NULL, 0, "socket_test_sctp");</span><br><span> osmo_init_logging2(ctx, &info);</span><br><span> log_set_use_color(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);</span><br><span> log_set_print_category(osmo_stderr_target, 0);</span><br><span> log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span> #ifdef HAVE_LIBSCTP</span><br><span>diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c</span><br><span>index 9619553..614db55 100644</span><br><span>--- a/tests/socket/socket_test.c</span><br><span>+++ b/tests/socket/socket_test.c</span><br><span>@@ -400,7 +400,7 @@</span><br><span> ctx = talloc_named_const(NULL, 0, "socket_test");</span><br><span> osmo_init_logging2(ctx, &info);</span><br><span> log_set_use_color(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);</span><br><span> log_set_print_category(osmo_stderr_target, 0);</span><br><span> log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span> </span><br><span>diff --git a/tests/tdef/tdef_test.c b/tests/tdef/tdef_test.c</span><br><span>index ede3082..d188eed 100644</span><br><span>--- a/tests/tdef/tdef_test.c</span><br><span>+++ b/tests/tdef/tdef_test.c</span><br><span>@@ -477,7 +477,7 @@</span><br><span> ctx = talloc_named_const(NULL, 0, "tdef_test.c");</span><br><span> osmo_init_logging2(ctx, NULL);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);</span><br><span> log_set_print_category(osmo_stderr_target, 1);</span><br><span> log_set_use_color(osmo_stderr_target, 0);</span><br><span> </span><br><span>diff --git a/tests/write_queue/wqueue_test.c b/tests/write_queue/wqueue_test.c</span><br><span>index 9c7a36e..3823ef5 100644</span><br><span>--- a/tests/write_queue/wqueue_test.c</span><br><span>+++ b/tests/write_queue/wqueue_test.c</span><br><span>@@ -72,7 +72,7 @@</span><br><span> log_init(&log_info, NULL);</span><br><span> stderr_target = log_target_create_stderr();</span><br><span> log_add_target(stderr_target);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_filename2(stderr_target, LOG_FILENAME_NONE);</span><br><span> log_set_print_category_hex(stderr_target, 0);</span><br><span> log_set_print_category(stderr_target, 0);</span><br><span> </span><br><span>diff --git a/utils/osmo-ns-dummy.c b/utils/osmo-ns-dummy.c</span><br><span>index ee7f591..0af1a89 100644</span><br><span>--- a/utils/osmo-ns-dummy.c</span><br><span>+++ b/utils/osmo-ns-dummy.c</span><br><span>@@ -227,8 +227,7 @@</span><br><span> </span><br><span> osmo_init_logging2(ctx, &log_info);</span><br><span> log_set_use_color(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);</span><br><span> log_set_log_level(osmo_stderr_target, LOGL_INFO);</span><br><span> msgb_talloc_ctx_init(ctx, 0);</span><br><span> osmo_stats_init(ctx);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22962">change 22962</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/libosmocore/+/22962"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ifc78e1dcba5baf0b41f6ccbbbd1e3f06552d73da </div>
<div style="display:none"> Gerrit-Change-Number: 22962 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </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-CC: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>