str: Add function xstrdup_if_nonnull() and introduce many users.

[pspp] / src / output / options.c

diff --git a/src/output/options.c b/src/output/options.c
index 74bc751c5595bed2137ef3f6e110c91e5cf80850..a212d1c63ee5190c752a7a007087df6338c47087 100644 (file)
--- a/src/output/options.c
+++ b/src/output/options.c
@@ -51,8 +51,8 @@ driver_option_create (const char *driver_name, const char *name,
   struct driver_option *o = xmalloc (sizeof *o);
   o->driver_name = xstrdup (driver_name);
   o->name = xstrdup (name);
-  o->value = value != NULL ? xstrdup (value) : NULL;
-  o->default_value = default_value ? xstrdup (default_value) : NULL;
+  o->value = xstrdup_if_nonnull (value);
+  o->default_value = xstrdup_if_nonnull (default_value);
   return o;
 }
 
@@ -516,7 +516,7 @@ lookup_color_name (const char *s)
   return -1;
 }
 
-static bool
+bool
 parse_color__ (const char *s, struct cell_color *color)
 {
   /* #rrrrggggbbbb */