From a8c0ac5da5374f83333b570ed77848c4bb90e1d2 Mon Sep 17 00:00:00 2001
From: "Rob Swindell (on Debian Linux)" <rob@synchro.net>
Date: Fri, 22 Mar 2024 11:47:21 -0700
Subject: [PATCH] Fix stale comment about XSAFECOPY (now uses strlcpy, not
strncpy)
---
src/xpdev/gen_defs.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/xpdev/gen_defs.h b/src/xpdev/gen_defs.h
index ab51334ea1..cb19438229 100644
--- a/src/xpdev/gen_defs.h
+++ b/src/xpdev/gen_defs.h
@@ -439,7 +439,7 @@ typedef struct {
#define SAFECOPY(dst,src) strlcpy(dst,src,sizeof(dst))
#endif
-/* Extra-safe SAFECOPY doesn't pass NULL-pointer to strncpy */
+/* Extra-safe SAFECOPY doesn't pass NULL-pointer to strlcpy */
#ifdef _DEBUG
#define XSAFECOPY(dst,src) do { \
static_assert(sizeof(dst) != sizeof(void*), "SAFECOPY() on pointer-sized dst, use strlcpy"); \
@@ -462,7 +462,7 @@ typedef struct {
#define SAFEPRINTF2(dst,fmt,a1,a2) snprintf(dst,sizeof(dst),fmt,a1,a2)
#define SAFEPRINTF3(dst,fmt,a1,a2,a3) snprintf(dst,sizeof(dst),fmt,a1,a2,a3)
#define SAFEPRINTF4(dst,fmt,a1,a2,a3,a4) snprintf(dst,sizeof(dst),fmt,a1,a2,a3,a4)
-#else
+#else
#define SAFEPRINTF(dst,fmt,arg) snprintf(dst,sizeof(dst),fmt,arg), TERMINATE(dst)
#define SAFEPRINTF2(dst,fmt,a1,a2) snprintf(dst,sizeof(dst),fmt,a1,a2), TERMINATE(dst)
#define SAFEPRINTF3(dst,fmt,a1,a2,a3) snprintf(dst,sizeof(dst),fmt,a1,a2,a3), TERMINATE(dst)
--
GitLab