Change in libosmocore[master]: Drop use of log_set_print_filename() API inside libosmocore

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Sat Feb 20 17:14:00 UTC 2021 

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22962 )

Change subject: Drop use of log_set_print_filename() API inside libosmocore
......................................................................

Drop use of log_set_print_filename() API inside libosmocore

Let's use log_set_print_filename2() API instead, which has less ackward
behavior implications like changing the print status of category-hex.

Related: OS#5034
Change-Id: Ifc78e1dcba5baf0b41f6ccbbbd1e3f06552d73da
---
M tests/fsm/fsm_dealloc_test.c
M tests/fsm/fsm_test.c
M tests/gb/bssgp_fc_test.c
M tests/gb/gprs_bssgp_test.c
M tests/gb/gprs_ns2_test.c
M tests/gb/gprs_ns_test.c
M tests/gsup/gsup_test.c
M tests/logging/logging_test.c
M tests/loggingrb/loggingrb_test.c
M tests/oap/oap_client_test.c
M tests/socket/socket_sctp_test.c
M tests/socket/socket_test.c
M tests/tdef/tdef_test.c
M tests/write_queue/wqueue_test.c
M utils/osmo-ns-dummy.c
15 files changed, 16 insertions(+), 20 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/tests/fsm/fsm_dealloc_test.c b/tests/fsm/fsm_dealloc_test.c
index 48f80e5..f4be93d 100644
--- a/tests/fsm/fsm_dealloc_test.c
+++ b/tests/fsm/fsm_dealloc_test.c
@@ -443,7 +443,7 @@
 	ctx = talloc_named_const(NULL, 0, "main");
 	osmo_init_logging2(ctx, NULL);
 
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_print_level(osmo_stderr_target, 1);
 	log_set_print_category(osmo_stderr_target, 1);
 	log_set_print_category_hex(osmo_stderr_target, 0);
diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c
index 23e24cf..2cfdacd 100644
--- a/tests/fsm/fsm_test.c
+++ b/tests/fsm/fsm_test.c
@@ -412,7 +412,7 @@
 	log_init(&log_info, NULL);
 	stderr_target = log_target_create_stderr();
 	log_add_target(stderr_target);
-	log_set_print_filename(stderr_target, 0);
+	log_set_print_filename2(stderr_target, LOG_FILENAME_NONE);
 	log_set_use_color(stderr_target, 0);
 	log_set_print_category(stderr_target, 0);
 	log_set_print_category_hex(stderr_target, 0);
diff --git a/tests/gb/bssgp_fc_test.c b/tests/gb/bssgp_fc_test.c
index 23bcd57..63e8308 100644
--- a/tests/gb/bssgp_fc_test.c
+++ b/tests/gb/bssgp_fc_test.c
@@ -148,7 +148,7 @@
 
 	osmo_init_logging2(ctx, &info);
 	log_set_use_color(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_print_category(osmo_stderr_target, 0);
 	log_set_print_category_hex(osmo_stderr_target, 0);
 
diff --git a/tests/gb/gprs_bssgp_test.c b/tests/gb/gprs_bssgp_test.c
index 52e986e..43fc056 100644
--- a/tests/gb/gprs_bssgp_test.c
+++ b/tests/gb/gprs_bssgp_test.c
@@ -298,7 +298,7 @@
 
 	osmo_init_logging2(ctx, &info);
 	log_set_use_color(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 
 	msgb_talloc_ctx_init(ctx, 0);
 
diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c
index 37719a9..cc1b2f1 100644
--- a/tests/gb/gprs_ns2_test.c
+++ b/tests/gb/gprs_ns2_test.c
@@ -522,8 +522,7 @@
 	void *ctx = talloc_named_const(NULL, 0, "gprs_ns2_test");
 	osmo_init_logging2(ctx, &info);
 	log_set_use_color(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_print_category(osmo_stderr_target, 0);
 	log_set_print_category_hex(osmo_stderr_target, 0);
 	log_set_log_level(osmo_stderr_target, LOGL_INFO);
diff --git a/tests/gb/gprs_ns_test.c b/tests/gb/gprs_ns_test.c
index e8e8b80..454a29e 100644
--- a/tests/gb/gprs_ns_test.c
+++ b/tests/gb/gprs_ns_test.c
@@ -906,11 +906,9 @@
 	log_set_use_color(osmo_stderr_target, 0);
 	log_set_print_category(osmo_stderr_target, 0);
 	log_set_print_category_hex(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
-	osmo_signal_register_handler(SS_L_NS, &test_signal, NULL);
-
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_log_level(osmo_stderr_target, LOGL_INFO);
+	osmo_signal_register_handler(SS_L_NS, &test_signal, NULL);
 
 	setlinebuf(stdout);
 
diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c
index f84072c..3d7ea40 100644
--- a/tests/gsup/gsup_test.c
+++ b/tests/gsup/gsup_test.c
@@ -749,7 +749,7 @@
 {
 	void *ctx = talloc_named_const(NULL, 0, "gsup_test");
 	osmo_init_logging2(ctx, &info);
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_print_timestamp(osmo_stderr_target, 0);
 	log_set_use_color(osmo_stderr_target, 0);
 	log_set_print_category_hex(osmo_stderr_target, 0);
diff --git a/tests/logging/logging_test.c b/tests/logging/logging_test.c
index d036dc5..f873958 100644
--- a/tests/logging/logging_test.c
+++ b/tests/logging/logging_test.c
@@ -77,7 +77,7 @@
 	stderr_target = log_target_create_stderr();
 	log_add_target(stderr_target);
 	log_set_all_filter(stderr_target, 1);
-	log_set_print_filename(stderr_target, 0);
+	log_set_print_filename2(stderr_target, LOG_FILENAME_NONE);
 	log_set_print_category_hex(stderr_target, 0);
 	log_set_print_category(stderr_target, 1);
 	log_set_use_color(stderr_target, 0);
diff --git a/tests/loggingrb/loggingrb_test.c b/tests/loggingrb/loggingrb_test.c
index 4a4d1f9..19378c3 100644
--- a/tests/loggingrb/loggingrb_test.c
+++ b/tests/loggingrb/loggingrb_test.c
@@ -64,7 +64,7 @@
 	ringbuf_target = log_target_create_rb(0x1000);
 	log_add_target(ringbuf_target);
 	log_set_all_filter(ringbuf_target, 1);
-	log_set_print_filename(ringbuf_target, 0);
+	log_set_print_filename2(ringbuf_target, LOG_FILENAME_NONE);
 	log_set_print_category(ringbuf_target, 0);
 	log_set_print_category_hex(ringbuf_target, 0);
 
diff --git a/tests/oap/oap_client_test.c b/tests/oap/oap_client_test.c
index 0ac32ea..622912f 100644
--- a/tests/oap/oap_client_test.c
+++ b/tests/oap/oap_client_test.c
@@ -260,7 +260,7 @@
 	OSMO_ASSERT(osmo_stderr_target);
 	log_set_use_color(osmo_stderr_target, 0);
 	log_set_print_timestamp(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_print_category_hex(osmo_stderr_target, 0);
 	log_set_print_category(osmo_stderr_target, 1);
 	log_parse_category_mask(osmo_stderr_target, "DLOAP,1");
diff --git a/tests/socket/socket_sctp_test.c b/tests/socket/socket_sctp_test.c
index 9705038..4ca52a3 100644
--- a/tests/socket/socket_sctp_test.c
+++ b/tests/socket/socket_sctp_test.c
@@ -222,7 +222,7 @@
 	ctx = talloc_named_const(NULL, 0, "socket_test_sctp");
 	osmo_init_logging2(ctx, &info);
 	log_set_use_color(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_print_category(osmo_stderr_target, 0);
 	log_set_print_category_hex(osmo_stderr_target, 0);
 #ifdef HAVE_LIBSCTP
diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c
index 9619553..614db55 100644
--- a/tests/socket/socket_test.c
+++ b/tests/socket/socket_test.c
@@ -400,7 +400,7 @@
 	ctx = talloc_named_const(NULL, 0, "socket_test");
 	osmo_init_logging2(ctx, &info);
 	log_set_use_color(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_print_category(osmo_stderr_target, 0);
 	log_set_print_category_hex(osmo_stderr_target, 0);
 
diff --git a/tests/tdef/tdef_test.c b/tests/tdef/tdef_test.c
index ede3082..d188eed 100644
--- a/tests/tdef/tdef_test.c
+++ b/tests/tdef/tdef_test.c
@@ -477,7 +477,7 @@
 	ctx = talloc_named_const(NULL, 0, "tdef_test.c");
 	osmo_init_logging2(ctx, NULL);
 
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_print_category(osmo_stderr_target, 1);
 	log_set_use_color(osmo_stderr_target, 0);
 
diff --git a/tests/write_queue/wqueue_test.c b/tests/write_queue/wqueue_test.c
index 9c7a36e..3823ef5 100644
--- a/tests/write_queue/wqueue_test.c
+++ b/tests/write_queue/wqueue_test.c
@@ -72,7 +72,7 @@
 	log_init(&log_info, NULL);
 	stderr_target = log_target_create_stderr();
 	log_add_target(stderr_target);
-	log_set_print_filename(stderr_target, 0);
+	log_set_print_filename2(stderr_target, LOG_FILENAME_NONE);
 	log_set_print_category_hex(stderr_target, 0);
 	log_set_print_category(stderr_target, 0);
 
diff --git a/utils/osmo-ns-dummy.c b/utils/osmo-ns-dummy.c
index ee7f591..0af1a89 100644
--- a/utils/osmo-ns-dummy.c
+++ b/utils/osmo-ns-dummy.c
@@ -227,8 +227,7 @@
 
 	osmo_init_logging2(ctx, &log_info);
 	log_set_use_color(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
-	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
 	log_set_log_level(osmo_stderr_target, LOGL_INFO);
 	msgb_talloc_ctx_init(ctx, 0);
 	osmo_stats_init(ctx);

-- 
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22962
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ifc78e1dcba5baf0b41f6ccbbbd1e3f06552d73da
Gerrit-Change-Number: 22962
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-CC: fixeria <vyanitskiy at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210220/5baaacdd/attachment.htm>

More information about the gerrit-log mailing list