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
diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c
index 0c723e8..2698225 100644
--- a/openbsc/src/libbsc/abis_nm.c
+++ b/openbsc/src/libbsc/abis_nm.c
@@ -40,6 +40,7 @@
#include <osmocom/gsm/tlv.h>
#include <osmocom/gsm/abis_nm.h>
#include <osmocom/core/talloc.h>
+#include <osmocom/core/utils.h>
#include <openbsc/abis_nm.h>
#include <openbsc/misdn.h>
#include <openbsc/signal.h>
@@ -2235,8 +2236,7 @@
}
/* construct new filename */
- strncpy(dir, bs11_sw->swl_fname, sizeof(dir));
- dir[sizeof(dir)-1] = '\0';
+ osmo_strlcpy(dir, bs11_sw->swl_fname, sizeof(dir));
strncat(fle->fname, dirname(dir), sizeof(fle->fname) - 1);
strcat(fle->fname, "/");
strncat(fle->fname, file_id, sizeof(fle->fname) - 1 -strlen(fle->fname));
@@ -2307,8 +2307,7 @@
bs11_sw->user_cb = cbfn;
bs11_sw->forced = forced;
- strncpy(bs11_sw->swl_fname, fname, sizeof(bs11_sw->swl_fname));
- bs11_sw->swl_fname[sizeof(bs11_sw->swl_fname)-1] = '\0';
+ osmo_strlcpy(bs11_sw->swl_fname, fname, sizeof(bs11_sw->swl_fname));
rc = bs11_read_swl_file(bs11_sw);
if (rc < 0)
return rc;