Change in libosmocore[master]: osmo_strlcpy: Clarify length calculation

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20231 )

Change subject: osmo_strlcpy: Clarify length calculation
......................................................................

osmo_strlcpy: Clarify length calculation

Change-Id: I78dc7b87d5b42595c0b1392fce61606eae8f6ec8
---
M src/utils.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  laforge: Looks good to me, approved
  fixeria: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/utils.c b/src/utils.c
index 168f85f..772b671 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -576,7 +576,7 @@
 	size_t ret = src ? strlen(src) : 0;
 
 	if (siz) {
-		size_t len = (ret >= siz) ? siz - 1 : ret;
+		size_t len = OSMO_MIN(siz - 1, ret);
 		if (len)
 			memcpy(dst, src, len);
 		dst[len] = '\0';

-- 
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20231
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I78dc7b87d5b42595c0b1392fce61606eae8f6ec8
Gerrit-Change-Number: 20231
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200922/78af68df/attachment.htm>