in color_to_int(), assert that colorname isn't NULL, since that case is

now handled elsewhere; also clarify an error message in parse_colors()

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2623 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 79f62e05406a99a844145e2841c64e6bb41f7845..161ab3fd885e39901a4a43763088ecb6fd80de0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -140,6 +140,9 @@ CVS code -
        - Disable extended output processing as well as extended input
          processing, and rename to disable_extended_io(). (DLR)
 - rcfile.c:
+  color_to_int()
+       - Since colorname's being NULL is handled elsewhere now, assert
+         that it isn't NULL at the beginning of the function. (DLR)
   parse_colors()
        - Properly parse a background color without a foreground color.
          (DLR)

diff --git a/src/rcfile.c b/src/rcfile.c
index 8eddeb6ef9d8098d17de572ef64e8026a879ed3b..790db3f98875414822ca70255005e6678489e241 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -188,12 +188,7 @@ int color_to_int(const char *colorname, bool *bright)
 {
     int mcolor = -1;
 
-    if (colorname == NULL) {
-       rcfile_error(N_("Missing color name"));
-       return -1;
-    }
-
-    assert(bright != NULL);
+    assert(colorname != NULL && bright != NULL);
 
     if (strncasecmp(colorname, "bright", 6) == 0) {
        *bright = TRUE;
@@ -403,8 +398,7 @@ void parse_colors(char *ptr)
     }
 
     if (*ptr == '\0') {
-       rcfile_error(
-               N_("Cannot add a color directive without a regex string"));
+       rcfile_error(N_("Missing regex string"));
        return;
     }