From 44491acfefa21523fa31922d6aeb2b48bcafe841 Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Thu, 9 Jun 2005 14:04:08 +0000
Subject: [PATCH] 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
---
ChangeLog | 3 +++
src/rcfile.c | 10 ++--------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 79f62e05..161ab3fd 100644
--- 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 8eddeb6e..790db3f9 100644
--- 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;
}
--
GitLab