lib: cosmetic - rename parameters so that .h and .c files match

These functions were flagging sparse warnings, but those warnings are
trivially (robotically) dismissable if the parameters are identically
named in the two contexts. Opted for whichever name seemed to be more
meaningful or sensible. e.g. char** became p rather than s, as it's
a pointer more than a string.

diff --git a/src/lib/strfuncs.c b/src/lib/strfuncs.c
index 231d64e17fc19cfb0bfc5eb80282bddbc8cd385e..f64de574f941f9a41b6c60d1e6c3f15859a04423 100644 (file)
--- a/src/lib/strfuncs.c
+++ b/src/lib/strfuncs.c
@@ -366,9 +366,9 @@ int bsearch_strcmp(const char *key, const char *const *member)
        return strcmp(key, *member);
 }
 
-int i_strcmp_p(const char *const *s1, const char *const *s2)
+int i_strcmp_p(const char *const *p1, const char *const *p2)
 {
-       return strcmp(*s1, *s2);
+       return strcmp(*p1, *p2);
 }
 
 int bsearch_strcasecmp(const char *key, const char *const *member)
@@ -376,9 +376,9 @@ int bsearch_strcasecmp(const char *key, const char *const *member)
        return strcasecmp(key, *member);
 }
 
-int i_strcasecmp_p(const char *const *s1, const char *const *s2)
+int i_strcasecmp_p(const char *const *p1, const char *const *p2)
 {
-       return strcasecmp(*s1, *s2);
+       return strcasecmp(*p1, *p2);
 }
 
 static char **

diff --git a/src/lib/strfuncs.h b/src/lib/strfuncs.h
index 46114ac17629f9bc856c82544d42481b633b54cb..ec91dd35b5049b6e9d3718c12b07204fa0ed8fc3 100644 (file)
--- a/src/lib/strfuncs.h
+++ b/src/lib/strfuncs.h
@@ -50,7 +50,7 @@ const char *t_str_lcase(const char *str);
 const char *t_str_ucase(const char *str);
 
 int null_strcmp(const char *s1, const char *s2) ATTR_PURE;
-int bsearch_strcmp(const char *p1, const char *const *member) ATTR_PURE;
+int bsearch_strcmp(const char *key, const char *const *member) ATTR_PURE;
 int bsearch_strcasecmp(const char *key, const char *const *member) ATTR_PURE;
 int i_memcasecmp(const void *p1, const void *p2, size_t size) ATTR_PURE;
 int i_strcmp_p(const char *const *p1, const char *const *p2) ATTR_PURE;