From: Peter Stamfest <peter@stamfest.at>
Date: Wed, 13 Aug 2014 18:23:04 +0000 (+0200)
Subject: Extend rrd_create_r2 with a new (as of now unused) sources argument
X-Git-Tag: v1.5.0-rc1~42^2~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9fbffec34cbfe0510bec83c0776e4e66bcfc855;p=thirdparty%2Frrdtool-1.x.git

Extend rrd_create_r2 with a new (as of now unused) sources argument
---

diff --git a/src/rrd.h b/src/rrd.h
index 22371c4c..6156475d 100644
--- a/src/rrd.h
+++ b/src/rrd.h
@@ -239,6 +239,7 @@ extern    "C" {
     unsigned long pdp_step,
     time_t last_up,
     int no_overwrite,
+    const char **sources,
     int argc,
     const char **argv);
     rrd_info_t *rrd_info_r(
diff --git a/src/rrd_create.c b/src/rrd_create.c
index a8f098ad..141837ef 100644
--- a/src/rrd_create.c
+++ b/src/rrd_create.c
@@ -126,6 +126,7 @@ int rrd_create(
 	} else {
         rc = rrd_create_r2(argv[optind],
                       pdp_step, last_up, opt_no_overwrite,
+                      NULL,
                       argc - optind - 1, (const char **) (argv + optind + 1));
 	}
 
@@ -501,13 +502,14 @@ int rrd_create_r(
     int argc,
     const char **argv)
 {
-	return rrd_create_r2(filename,pdp_step,last_up,0,argc,argv);
+	return rrd_create_r2(filename,pdp_step,last_up,0, NULL, argc,argv);
 }
 int rrd_create_r2(
     const char *filename,
     unsigned long pdp_step,
     time_t last_up,
     int no_overwrite,
+    const char **sources,
     int argc,
     const char **argv)
 {
diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c
index 6ff84003..b8ba1589 100644
--- a/src/rrd_daemon.c
+++ b/src/rrd_daemon.c
@@ -1977,7 +1977,7 @@ static int handle_request_create (HANDLER_PROTO) /* {{{ */
 
   rrd_clear_error ();
   pthread_mutex_lock(&rrdfilecreate_lock);
-  status = rrd_create_r2(file,step,last_up,no_overwrite,ac,(const char **)av);
+  status = rrd_create_r2(file,step,last_up,no_overwrite,NULL, ac,(const char **)av);
   pthread_mutex_unlock(&rrdfilecreate_lock);
 
   if(!status) {