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/osmo-bsc_nat/bsc_nat_rewrite.c b/openbsc/src/osmo-bsc_nat/bsc_nat_rewrite.c
index 58667fe..e7c387c 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_rewrite.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_rewrite.c
@@ -31,6 +31,7 @@
#include <osmocom/core/linuxlist.h>
#include <osmocom/core/talloc.h>
+#include <osmocom/core/utils.h>
#include <osmocom/gsm/gsm0808.h>
#include <osmocom/gsm/ipa.h>
@@ -129,15 +130,15 @@
{
if (strncmp(chosen_number, "00", 2) == 0) {
called->type = 1;
- strncpy(called->number, chosen_number + 2, sizeof(called->number));
+ osmo_strlcpy(called->number, chosen_number + 2,
+ sizeof(called->number));
} else {
/* rewrite international to unknown */
if (called->type == 1)
called->type = 0;
- strncpy(called->number, chosen_number, sizeof(called->number));
+ osmo_strlcpy(called->number, chosen_number,
+ sizeof(called->number));
}
-
- called->number[sizeof(called->number) - 1] = '\0';
}
/**