lib/fields.*: valid_field: Make sure that $2 is a string literal

and thus, nonnull.

Suggested-by: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/lib/fields.c b/lib/fields.c
index 06e741da122a419986bf43bcc81baf6786972c0a..d30ed698ab76fa0ef7757e7cb4e38986315d4ac1 100644 (file)
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -32,7 +32,8 @@
  *       but the field contains a non-printable character.
  *  +  0 is returned otherwise.
  */
-int valid_field (const char *field, const char *illegal)
+int
+valid_field_(const char *field, const char *illegal)
 {
        const char *cp;
        int err = 0;

diff --git a/lib/fields.h b/lib/fields.h
index 293d9bde3fde1b90edb47dadaae0d4673a44cc84..6e5d61aac3b28a6b27aea381553bb889991df580 100644 (file)
--- a/lib/fields.h
+++ b/lib/fields.h
@@ -10,7 +10,10 @@
 #include <stddef.h>
 
 
-int valid_field(const char *field, const char *illegal);
+#define valid_field(field, illegal)  valid_field_(field, "" illegal "")
+
+
+int valid_field_(const char *field, const char *illegal);
 void change_field(char *buf, size_t maxsize, const char *prompt);