src/rrd_args.[ch]: Split up the "draw" part (into "areas" and "lines").

diff --git a/src/rrd_args.c b/src/rrd_args.c
index f9137332276faf7a7fb89d3d86035f99b162deaf..4c66a15f424d56a6f0df9968dc9519d8d567cf2a 100644 (file)
--- a/src/rrd_args.c
+++ b/src/rrd_args.c
@@ -16,12 +16,14 @@ rrd_args_t *ra_create (void) /* {{{ */
   ra->options = array_create ();
   ra->data    = array_create ();
   ra->calc    = array_create ();
-  ra->draw    = array_create ();
+  ra->areas   = array_create ();
+  ra->lines   = array_create ();
 
   if ((ra->options == NULL)
       || (ra->data == NULL)
       || (ra->calc == NULL)
-      || (ra->draw == NULL))
+      || (ra->areas == NULL)
+      || (ra->lines == NULL))
   {
     ra_destroy (ra);
     return (NULL);
@@ -38,7 +40,8 @@ void ra_destroy (rrd_args_t *ra) /* {{{ */
   array_destroy (ra->options);
   array_destroy (ra->data);
   array_destroy (ra->calc);
-  array_destroy (ra->draw);
+  array_destroy (ra->areas);
+  array_destroy (ra->lines);
 
   free (ra);
 } /* }}} void ra_destroy */
@@ -51,7 +54,8 @@ int ra_argc (rrd_args_t *ra)
   return (array_argc (ra->options)
       + array_argc (ra->data)
       + array_argc (ra->calc)
-      + array_argc (ra->draw));
+      + array_argc (ra->areas)
+      + array_argc (ra->lines));
 } /* }}} int ra_argc */
 
 char **ra_argv (rrd_args_t *ra) /* {{{ */
@@ -95,7 +99,8 @@ char **ra_argv (rrd_args_t *ra) /* {{{ */
   APPEND_FIELD (options);
   APPEND_FIELD (data);
   APPEND_FIELD (calc);
-  APPEND_FIELD (draw);
+  APPEND_FIELD (areas);
+  APPEND_FIELD (lines);
 
 #undef APPEND_FIELD
 

diff --git a/src/rrd_args.h b/src/rrd_args.h
index b3ef34adcbd974c106716be65def7ebce7d08868..9c29325ce8d0e33f0535580296bc19e14b7b8cd7 100644 (file)
--- a/src/rrd_args.h
+++ b/src/rrd_args.h
@@ -8,7 +8,8 @@ struct rrd_args_s
   str_array_t *options;
   str_array_t *data;
   str_array_t *calc;
-  str_array_t *draw;
+  str_array_t *areas;
+  str_array_t *lines;
 
   int index;
   char last_stack_cdef[64];