osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Max 2018-12-04 11:24:18 +01:00
parent 5986a3d89d
commit 72dfd43799
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/logging.c
View File

@ -948,9 +948,11 @@ int log_targets_reopen(void)
}
/*! 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 @@ int log_init(const struct log_info *inf, void *ctx)
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 @@ int log_init(const struct log_info *inf, void *ctx)
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 */