From 6fb0f4de860245e7f176e65bc157ecae2afdc370 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Tue, 17 Apr 2018 13:55:09 +0200 Subject: examples: use osmo_init_logging2 Change-Id: I7f1f4503f254931edeebfbadf3953efa7b20f85f --- examples/channel/abis_ipa_stream_client.c | 4 ++-- examples/channel/abis_ipa_stream_server.c | 4 ++-- examples/ipa-stream-client.c | 4 ++-- examples/ipa-stream-server.c | 4 ++-- examples/lapd-over-datagram-network.c | 4 ++-- examples/lapd-over-datagram-user.c | 4 ++-- examples/osmux-test-input.c | 4 ++-- examples/osmux-test-output.c | 4 ++-- examples/rs232-read.c | 4 ++-- examples/rs232-write.c | 4 ++-- examples/rtp-udp-test-client.c | 4 ++-- examples/rtp-udp-test-server.c | 4 ++-- examples/stream-client.c | 4 ++-- examples/stream-server.c | 4 ++-- examples/udp-test.h | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-) (limited to 'examples') diff --git a/examples/channel/abis_ipa_stream_client.c b/examples/channel/abis_ipa_stream_client.c index 07ee481..8795cc6 100644 --- a/examples/channel/abis_ipa_stream_client.c +++ b/examples/channel/abis_ipa_stream_client.c @@ -50,8 +50,8 @@ int main(void) struct osmo_ipa_unit *unit; tall_example = talloc_named_const(NULL, 1, "example"); - - osmo_init_logging(&example_log_info); + msgb_talloc_ctx_init(tall_example, 0); + osmo_init_logging2(tall_example, &example_log_info); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); /* initialize channel infrastructure. */ diff --git a/examples/channel/abis_ipa_stream_server.c b/examples/channel/abis_ipa_stream_server.c index a1b2ffd..58a4e15 100644 --- a/examples/channel/abis_ipa_stream_server.c +++ b/examples/channel/abis_ipa_stream_server.c @@ -47,8 +47,8 @@ static struct osmo_chan *chan; int main(void) { tall_example = talloc_named_const(NULL, 1, "example"); - - osmo_init_logging(&example_log_info); + msgb_talloc_ctx_init(tall_example, 0); + osmo_init_logging2(tall_example, &example_log_info); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); /* initialize channel infrastructure. */ diff --git a/examples/ipa-stream-client.c b/examples/ipa-stream-client.c index 05ad4f5..2151090 100644 --- a/examples/ipa-stream-client.c +++ b/examples/ipa-stream-client.c @@ -160,8 +160,8 @@ int main(int argc, char *argv[]) num_msgs = atoi(argv[1]); tall_test = talloc_named_const(NULL, 1, "osmo_stream_client_test"); - - osmo_init_logging(&osmo_stream_client_test_log_info); + msgb_talloc_ctx_init(tall_test, 0); + osmo_init_logging2(tall_test, &osmo_stream_client_test_log_info); log_set_log_level(osmo_stderr_target, LOGL_NOTICE); /* diff --git a/examples/ipa-stream-server.c b/examples/ipa-stream-server.c index b475552..e774b31 100644 --- a/examples/ipa-stream-server.c +++ b/examples/ipa-stream-server.c @@ -101,8 +101,8 @@ static int accept_cb(struct osmo_stream_srv_link *srv, int fd) int main(void) { tall_test = talloc_named_const(NULL, 1, "osmo_stream_srv_test"); - - osmo_init_logging(&osmo_stream_srv_test_log_info); + msgb_talloc_ctx_init(tall_test, 0); + osmo_init_logging2(tall_test, &osmo_stream_srv_test_log_info); log_set_log_level(osmo_stderr_target, LOGL_NOTICE); /* diff --git a/examples/lapd-over-datagram-network.c b/examples/lapd-over-datagram-network.c index 9b41808..58ba0ce 100644 --- a/examples/lapd-over-datagram-network.c +++ b/examples/lapd-over-datagram-network.c @@ -132,8 +132,8 @@ int main(int argc, char *argv[]) struct lapd_tei *teip; tall_test = talloc_named_const(NULL, 1, "lapd_test"); - - osmo_init_logging(&lapd_test_log_info); + msgb_talloc_ctx_init(tall_test, 0); + osmo_init_logging2(tall_test, &lapd_test_log_info); log_set_log_level(osmo_stderr_target, LOGL_NOTICE); /* diff --git a/examples/lapd-over-datagram-user.c b/examples/lapd-over-datagram-user.c index e2fcdfb..f11f49f 100644 --- a/examples/lapd-over-datagram-user.c +++ b/examples/lapd-over-datagram-user.c @@ -194,8 +194,8 @@ int main(int argc, char *argv[]) num_msgs = atoi(argv[1]); tall_test = talloc_named_const(NULL, 1, "lapd_test"); - - osmo_init_logging(&lapd_test_log_info); + msgb_talloc_ctx_init(tall_test, 0); + osmo_init_logging2(tall_test, &lapd_test_log_info); log_set_log_level(osmo_stderr_target, LOGL_NOTICE); /* * initialize LAPD stuff. diff --git a/examples/osmux-test-input.c b/examples/osmux-test-input.c index b4e5b24..57e199c 100644 --- a/examples/osmux-test-input.c +++ b/examples/osmux-test-input.c @@ -198,8 +198,8 @@ int main(int argc, char *argv[]) signal(SIGINT, sighandler); tall_test = talloc_named_const(NULL, 1, "osmux_test"); - - osmo_init_logging(&osmux_test_log_info); + msgb_talloc_ctx_init(tall_test, 0); + osmo_init_logging2(tall_test, &osmux_test_log_info); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); /* diff --git a/examples/osmux-test-output.c b/examples/osmux-test-output.c index ff5f04c..9b7c113 100644 --- a/examples/osmux-test-output.c +++ b/examples/osmux-test-output.c @@ -138,8 +138,8 @@ int main(int argc, char *argv[]) signal(SIGINT, sighandler); tall_test = talloc_named_const(NULL, 1, "osmux_test"); - - osmo_init_logging(&osmux_test_log_info); + msgb_talloc_ctx_init(tall_test, 0); + osmo_init_logging2(tall_test, &osmux_test_log_info); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); /* diff --git a/examples/rs232-read.c b/examples/rs232-read.c index 8aeb6f8..0003459 100644 --- a/examples/rs232-read.c +++ b/examples/rs232-read.c @@ -66,8 +66,8 @@ static void *tall_test; int main(void) { tall_test = talloc_named_const(NULL, 1, "osmo_rs232_test"); - - osmo_init_logging(&osmo_rs232_test_log_info); + msgb_talloc_ctx_init(tall_test, 0); + osmo_init_logging2(tall_test, &osmo_rs232_test_log_info); log_set_log_level(osmo_stderr_target, LOGL_NOTICE); r = osmo_rs232_create(tall_test); diff --git a/examples/rs232-write.c b/examples/rs232-write.c index d5aee68..dfe1bd5 100644 --- a/examples/rs232-write.c +++ b/examples/rs232-write.c @@ -350,8 +350,8 @@ int main(void) int rc; tall_test = talloc_named_const(NULL, 1, "osmo_rs232_test"); - - osmo_init_logging(&osmo_rs232_test_log_info); + msgb_talloc_ctx_init(tall_test, 0); + osmo_init_logging2(tall_test, &osmo_rs232_test_log_info); log_set_log_level(osmo_stderr_target, LOGL_NOTICE); r = osmo_rs232_create(tall_test); diff --git a/examples/rtp-udp-test-client.c b/examples/rtp-udp-test-client.c index 78802b1..3f44838 100644 --- a/examples/rtp-udp-test-client.c +++ b/examples/rtp-udp-test-client.c @@ -87,8 +87,8 @@ int main(int argc, char *argv[]) signal(SIGINT, sighandler); tall_test = talloc_named_const(NULL, 1, "rtp_test"); - - osmo_init_logging(&rtp_test_log_info); + msgb_talloc_ctx_init(tall_test, 0); + osmo_init_logging2(tall_test, &rtp_test_log_info); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); /* diff --git a/examples/rtp-udp-test-server.c b/examples/rtp-udp-test-server.c index 7d56d44..fb06376 100644 --- a/examples/rtp-udp-test-server.c +++ b/examples/rtp-udp-test-server.c @@ -101,8 +101,8 @@ int main(int argc, char *argv[]) signal(SIGINT, sighandler); tall_test = talloc_named_const(NULL, 1, "udp_rtp_test"); - - osmo_init_logging(&rtp_test_log_info); + msgb_talloc_ctx_init(tall_test, 0); + osmo_init_logging2(tall_test, &rtp_test_log_info); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); /* diff --git a/examples/stream-client.c b/examples/stream-client.c index b0aea5e..92f6fd3 100644 --- a/examples/stream-client.c +++ b/examples/stream-client.c @@ -97,8 +97,8 @@ int main(void) int rc; tall_test = talloc_named_const(NULL, 1, "osmo_stream_cli_test"); - - osmo_init_logging(&osmo_stream_cli_test_log_info); + msgb_talloc_ctx_init(tall_test, 0); + osmo_init_logging2(tall_test, &osmo_stream_cli_test_log_info); log_set_log_level(osmo_stderr_target, 1); /* diff --git a/examples/stream-server.c b/examples/stream-server.c index c1bfd66..0c5e351 100644 --- a/examples/stream-server.c +++ b/examples/stream-server.c @@ -122,8 +122,8 @@ int main(void) struct osmo_fd *kbd_ofd; tall_test = talloc_named_const(NULL, 1, "osmo_stream_srv_test"); - - osmo_init_logging(&osmo_stream_srv_test_log_info); + msgb_talloc_ctx_init(tall_test, 0); + osmo_init_logging2(tall_test, &osmo_stream_srv_test_log_info); log_set_log_level(osmo_stderr_target, 1); /* diff --git a/examples/udp-test.h b/examples/udp-test.h index 14bbd91..ad91b19 100644 --- a/examples/udp-test.h +++ b/examples/udp-test.h @@ -81,8 +81,8 @@ static inline bool dgram_init(const char *host, uint16_t lport, uint16_t rport, signal(SIGINT, sighandler); tall_test = talloc_named_const(NULL, 1, "udp_test"); - - osmo_init_logging(&udp_test_log_info); + msgb_talloc_ctx_init(tall_test, 0); + osmo_init_logging2(tall_test, &udp_test_log_info); log_set_log_level(osmo_stderr_target, LOGL_NOTICE); conn = osmo_dgram_create(tall_test); -- cgit v1.2.3