summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/osmocom/core/logging.h2
-rw-r--r--src/logging.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h
index 989228b9..28f7549d 100644
--- a/include/osmocom/core/logging.h
+++ b/include/osmocom/core/logging.h
@@ -101,7 +101,7 @@ struct log_info {
log_filter *filter_fn;
/*! \brief per-category information */
- struct log_info_cat *cat;
+ const struct log_info_cat *cat;
/*! \brief total number of categories */
unsigned int num_cat;
/*! \brief total number of user categories (not library) */
diff --git a/src/logging.c b/src/logging.c
index 1ab8767f..eed0b26c 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -740,14 +740,15 @@ int log_init(const struct log_info *inf, void *ctx)
/* copy over the user part */
for (i = 0; i < inf->num_cat; i++) {
- memcpy(&osmo_log_info->cat[i], &inf->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 */
for (i = 0; i < ARRAY_SIZE(internal_cat); i++) {
unsigned int cn = osmo_log_info->num_cat_user + i;
- memcpy(&osmo_log_info->cat[cn],
+ memcpy((struct log_info_cat *) &osmo_log_info->cat[cn],
&internal_cat[i], sizeof(struct log_info_cat));
}