Change in libosmocore[master]: Allow log_init() with NULL log_info

[Max]

Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12092 )

Change subject: Allow log_init() with NULL log_info
......................................................................

Allow log_init() with NULL log_info

Since we have library-internal categories we don't have to force
application to supply its own categories. This is especially useful for
testing code inside libosmocore which only use internal categories
anyway.

Change-Id: I42159780b57684bff225789f036f28a4b25fc7b8
---
M src/logging.c
1 file changed, 15 insertions(+), 10 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Stefan Sperling: Looks good to me, but someone else must approve
  Pau Espin Pedrol: Looks good to me, approved



diff --git a/src/logging.c b/src/logging.c
index e7cc472..2bb53ae 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -948,9 +948,11 @@
 }
 
 /*! Initialize the Osmocom logging core
- *  \param[in] inf Information regarding logging categories
+ *  \param[in] inf Information regarding logging categories, could be NULL
  *  \param[in] ctx \ref talloc context for logging allocations
  *  \returns 0 in case of success, negative in case of error
+ *
+ *  If inf is NULL then only library-internal categories are initialized.
  */
 int log_init(const struct log_info *inf, void *ctx)
 {
@@ -964,10 +966,13 @@
 	if (!osmo_log_info)
 		return -ENOMEM;
 
-	osmo_log_info->filter_fn = inf->filter_fn;
-	osmo_log_info->num_cat_user = inf->num_cat;
-	/* total number = number of user cat + library cat */
-	osmo_log_info->num_cat = inf->num_cat + ARRAY_SIZE(internal_cat);
+	osmo_log_info->num_cat = ARRAY_SIZE(internal_cat);
+
+	if (inf) {
+		osmo_log_info->filter_fn = inf->filter_fn;
+		osmo_log_info->num_cat_user = inf->num_cat;
+		osmo_log_info->num_cat += inf->num_cat;
+	}
 
 	osmo_log_info->cat = talloc_zero_array(osmo_log_info,
 					struct log_info_cat,
@@ -978,11 +983,11 @@
 		return -ENOMEM;
 	}
 
-	/* copy over the user part */
-	for (i = 0; i < inf->num_cat; i++) {
-		memcpy((struct log_info_cat *) &osmo_log_info->cat[i],
-			&inf->cat[i],
-			sizeof(struct log_info_cat));
+	if (inf) { /* copy over the user part */
+		for (i = 0; i < inf->num_cat; i++) {
+			memcpy((struct log_info_cat *) &osmo_log_info->cat[i],
+			       &inf->cat[i], sizeof(struct log_info_cat));
+		}
 	}
 
 	/* copy over the library part */

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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I42159780b57684bff225789f036f28a4b25fc7b8
Gerrit-Change-Number: 12092
Gerrit-PatchSet: 4
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Stefan Sperling <stsp at stsp.name>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181206/9bd5b99c/attachment.htm>