tidy mutt_str_strdup

diff --git a/mutt/string.c b/mutt/string.c
index e2580eb530af6a89bec09b33a4d32f1ee16832d4..e2bccd2e0a58128330f56408c6a42c67ec29df9c 100644 (file)
--- a/mutt/string.c
+++ b/mutt/string.c
@@ -276,21 +276,19 @@ int mutt_str_atoul(const char *str, unsigned long *dst)
 
 /**
  * mutt_str_strdup - Copy a string, safely
- * @param s String to copy
+ * @param str String to copy
  * @retval ptr  Copy of the string
  * @retval NULL if s was NULL
  */
-char *mutt_str_strdup(const char *s)
+char *mutt_str_strdup(const char *str)
 {
-  char *p = NULL;
-  size_t l;
+  if (!str || !*str)
+    return NULL;
 
-  if (!s || !*s)
-    return 0;
-  l = strlen(s) + 1;
-  p = mutt_mem_malloc(l);
-  memcpy(p, s, l);
-  return p;
+  const size_t len = strlen(str) + 1;
+  char *copy = mutt_mem_malloc(len);
+  memcpy(copy, str, len);
+  return copy;
 }
 
 /**

diff --git a/mutt/string2.h b/mutt/string2.h
index 4f4c4c2ad699e40a0990510d40937f440bf90ae6..ae1d17aa0f097677954e25238d779b22feff73b6 100644 (file)
--- a/mutt/string2.h
+++ b/mutt/string2.h
@@ -87,7 +87,7 @@ char *      mutt_str_strcat(char *d, size_t l, const char *s);
 const char *mutt_str_strchrnul(const char *s, char c);
 int         mutt_str_strcmp(const char *a, const char *b);
 int         mutt_str_strcoll(const char *a, const char *b);
-char *      mutt_str_strdup(const char *s);
+char *      mutt_str_strdup(const char *str);
 size_t      mutt_str_strfcpy(char *dest, const char *src, size_t dsize);
 const char *mutt_str_stristr(const char *haystack, const char *needle);
 size_t      mutt_str_strlen(const char *a);