diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2017-01-13 03:12:08 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-01-23 11:59:01 +0000 |
| commit | 93bafb611a58293e0353320a14db298133c9d99a (patch) | |
| tree | 4ba6d276b7f5e2fda43f21b765d7cca8c6b00d5e /openbsc/src/libmsc/meas_feed.c | |
| parent | 59504dc80fe8c0d9a18994d82586a550c7efa341 (diff) | |
cosmetic: use osmo_strlcpy() everywhere
Shorten some code and make obvious to the reader that the string copy is done
in a safe way.
Change-Id: I900726cf06d34128db22a3d3d911ee0d1423b1bd
Diffstat (limited to 'openbsc/src/libmsc/meas_feed.c')
| -rw-r--r-- | openbsc/src/libmsc/meas_feed.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/openbsc/src/libmsc/meas_feed.c b/openbsc/src/libmsc/meas_feed.c index cd2b64842..3ddcdc39c 100644 --- a/openbsc/src/libmsc/meas_feed.c +++ b/openbsc/src/libmsc/meas_feed.c @@ -8,6 +8,7 @@ #include <osmocom/core/socket.h> #include <osmocom/core/write_queue.h> #include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> #include <osmocom/vty/command.h> #include <osmocom/vty/vty.h> @@ -52,12 +53,9 @@ static int process_meas_rep(struct gsm_meas_rep *mr) mfm->hdr.version = MEAS_FEED_VERSION; /* fill in MEAS_FEED_MEAS specific header */ - strncpy(mfm->imsi, subscr->imsi, sizeof(mfm->imsi)-1); - mfm->imsi[sizeof(mfm->imsi)-1] = '\0'; - strncpy(mfm->name, subscr->name, sizeof(mfm->name)-1); - mfm->name[sizeof(mfm->name)-1] = '\0'; - strncpy(mfm->scenario, g_mfs.scenario, sizeof(mfm->scenario)); - mfm->scenario[sizeof(mfm->scenario)-1] = '\0'; + osmo_strlcpy(mfm->imsi, subscr->imsi, sizeof(mfm->imsi)); + osmo_strlcpy(mfm->name, subscr->name, sizeof(mfm->name)); + osmo_strlcpy(mfm->scenario, g_mfs.scenario, sizeof(mfm->scenario)); /* copy the entire measurement report */ memcpy(&mfm->mr, mr, sizeof(mfm->mr)); @@ -160,8 +158,7 @@ void meas_feed_cfg_get(char **host, uint16_t *port) void meas_feed_scenario_set(const char *name) { - strncpy(g_mfs.scenario, name, sizeof(g_mfs.scenario)-1); - g_mfs.scenario[sizeof(g_mfs.scenario)-1] = '\0'; + osmo_strlcpy(g_mfs.scenario, name, sizeof(g_mfs.scenario)); } const char *meas_feed_scenario_get(void) |