logging: fix default initialization of per-category loglevels
Before this patch, there was a bug in the code caused by a memcpy from one data structure to another. unfortuantely the data structures were not the same, so we have to explicitly iterate over the array and assign the structure members manually.
This commit is contained in:
parent
3ae2758fba
commit
cc6313cc69
|
@ -311,16 +311,26 @@ static void _stderr_output(struct log_target *target, const char *log)
|
|||
struct log_target *log_target_create(void)
|
||||
{
|
||||
struct log_target *target;
|
||||
unsigned int i;
|
||||
|
||||
target = talloc_zero(tall_log_ctx, struct log_target);
|
||||
if (!target)
|
||||
return NULL;
|
||||
|
||||
INIT_LLIST_HEAD(&target->entry);
|
||||
memcpy(target->categories, log_info->cat,
|
||||
sizeof(struct log_category)*log_info->num_cat);
|
||||
|
||||
/* initialize the per-category enabled/loglevel from defaults */
|
||||
for (i = 0; i < log_info->num_cat; i++) {
|
||||
struct log_category *cat = &target->categories[i];
|
||||
cat->enabled = log_info->cat[i].enabled;
|
||||
cat->loglevel = log_info->cat[i].loglevel;
|
||||
}
|
||||
|
||||
/* global settings */
|
||||
target->use_color = 1;
|
||||
target->print_timestamp = 0;
|
||||
|
||||
/* global log level */
|
||||
target->loglevel = 0;
|
||||
return target;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue