diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2012-09-11 10:31:29 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2012-09-11 10:31:29 +0200 |
| commit | 06f645542cc9ca4e881eb3c0a441b510866a1a9f (patch) | |
| tree | 447677b7c03a93163ce6bf8855f4e023da75297a | |
| parent | e92866bbb1aade3eead0dc6169d26e0b7b30a605 (diff) | |
logging: Mark the log_info_cat pointer as consts
Applications should keep the log area in a static const area. Mark
the pointer as const to address compiler warnings in OpenBSC, cast
the const away for the osmo_log_info as it is not declared as const.
| -rw-r--r-- | include/osmocom/core/logging.h | 2 | ||||
| -rw-r--r-- | src/logging.c | 5 |
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)); } |