From 18c014de6771a3032308123af9969c966e20b7c8 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 30 Jan 2018 14:33:01 +0100 Subject: utils: add helper wrapper for osmo_strlcpy() Add wrapper for osmo_strlcpy() which uses sizeof() to automatically determine buffer's size and use it for GSMTAP logging. This is pretty common use case for osmo_strlcpy() so it's a good idea to save some typing by using generic define. Related: OS#2864 Change-Id: I03d0d3d32a8d572ad573d03c603e14cdc27a3f7b --- src/logging_gsmtap.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/logging_gsmtap.c b/src/logging_gsmtap.c index 82535adc..cb379b07 100644 --- a/src/logging_gsmtap.c +++ b/src/logging_gsmtap.c @@ -81,17 +81,16 @@ static void _gsmtap_raw_output(struct log_target *target, int subsys, /* Logging header */ golh = (struct gsmtap_osmocore_log_hdr *) msgb_put(msg, sizeof(*golh)); - osmo_strlcpy(golh->proc_name, target->tgt_gsmtap.ident, - sizeof(golh->proc_name)); + OSMO_STRLCPY_ARRAY(golh->proc_name, target->tgt_gsmtap.ident); if (subsys_name) - osmo_strlcpy(golh->subsys, subsys_name+1, sizeof(golh->subsys)); + OSMO_STRLCPY_ARRAY(golh->subsys, subsys_name + 1); else golh->subsys[0] = '\0'; /* strip all leading path elements from file, if any. */ file_basename = strrchr(file, '/'); file = (file_basename && file_basename[1])? file_basename + 1 : file; - osmo_strlcpy(golh->src_file.name, file, sizeof(golh->src_file.name)); + OSMO_STRLCPY_ARRAY(golh->src_file.name, file); golh->src_file.line_nr = osmo_htonl(line); golh->level = level; /* we always store the timestamp in the message, irrespective -- cgit v1.2.3