From 17794d77b97fcb8af263bcecbe03dad5d0e9a89a Mon Sep 17 00:00:00 2001 From: "kay.sievers@vrfy.org" Date: Tue, 9 Mar 2004 19:50:15 -0800 Subject: [PATCH] rename strn*() macros to strmax Hey, I wrote the strn*() macros just 10 days ago and yesterday this trap caught me with the %c{x} bug. The names are misleading cause we all expect that the from field is limited by the size argument, but we actually limit the overall size of the destination string to prevent a overflow. Here we rename all strn*() macros to str*max(). That should be more self-explanatory. --- udev.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'udev.h') diff --git a/udev.h b/udev.h index 32fda379e5..8752f595d6 100644 --- a/udev.h +++ b/udev.h @@ -73,13 +73,13 @@ do { \ strncat(to, from, sizeof(to) - strlen(to)-1); \ } while (0) -#define strnfieldcpy(to, from, maxsize) \ +#define strfieldcpymax(to, from, maxsize) \ do { \ to[maxsize-1] = '\0'; \ strncpy(to, from, maxsize-1); \ } while (0) -#define strnfieldcat(to, from, maxsize) \ +#define strfieldcatmax(to, from, maxsize) \ do { \ to[maxsize-1] = '\0'; \ strncat(to, from, maxsize - strlen(to)-1); \ @@ -91,7 +91,7 @@ do { \ snprintf((to) + strlen(to), sizeof(to) - strlen(to)-1, "%u", i); \ } while (0) -#define strnintcat(to, i, maxsize) \ +#define strintcatmax(to, i, maxsize) \ do { \ to[maxsize-1] = '\0'; \ snprintf((to) + strlen(to), maxsize - strlen(to)-1, "%u", i); \ -- cgit v1.2.3-54-g00ecf