Changeset 601733d

Timestamp:

Jul 30, 2008, 6:35:08 PM (16 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

731dd1e

Parents:

bfc127b

Message:

The color default has been -1 for a while now, so we match what curses thinks.
We shouldn't also believe that -1 means invalid color.
Adding OWL_COLOR_INVALID (-2) and using that in place of -1 when checking for invalid colors.

Files:

• filter.c (modified) (1 diff)
• functions.c (modified) (4 diffs)
• owl.h (modified) (1 diff)
• util.c (modified) (1 diff)

filter.c

@@ -29 +29 @@
   while ( argc>=2 && ( !strcmp(argv[0], "-c") ||
                        !strcmp(argv[0], "-b") ) ) {
-    if (owl_util_string_to_color(argv[1])==-1) {
+    if (owl_util_string_to_color(argv[1])==OWL_COLOR_INVALID) {
       owl_function_error("The color '%s' is not available, using default.", argv[1]);
     } else {

functions.c

@@ -2392 +2392 @@
       return;
     }
-    if (owl_util_string_to_color(argv[3])==-1) {
+    if (owl_util_string_to_color(argv[3])==OWL_COLOR_INVALID) {
       owl_function_error("The color '%s' is not available.", argv[3]);
       return;
@@ -2407 +2407 @@
       return;
     }
-    if (owl_util_string_to_color(argv[3])==-1) {
+    if (owl_util_string_to_color(argv[3])==OWL_COLOR_INVALID) {
       owl_function_error("The color '%s' is not available.", argv[3]);
       return;
@@ -2941 +2941 @@
   }
 
-  if (owl_util_string_to_color(fgcolor)==-1) {
+  if (owl_util_string_to_color(fgcolor)==OWL_COLOR_INVALID) {
     owl_function_error("No color named '%s' avilable.", fgcolor);
     return(-1);
@@ -2948 +2948 @@
 
   if (bgcolor != NULL) {
-    if (owl_util_string_to_color(bgcolor)==-1) {
+    if (owl_util_string_to_color(bgcolor)==OWL_COLOR_INVALID) {
       owl_function_error("No color named '%s' avilable.", bgcolor);
       return(-1);

owl.h

@@ -100 +100 @@
 #define OWL_COLOR_WHITE     7
 #define OWL_COLOR_DEFAULT   -1
+#define OWL_COLOR_INVALID   -2
 
 #define OWL_EDITWIN_STYLE_MULTILINE 0

util.c

@@ -498 +498 @@
     return(c);
   }
-  return(-1);
+  return(OWL_COLOR_INVALID);
 }