X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tune.c;h=89559af7a51f71c17996ee39e377e12386ba59e0;hb=a9c2a94950e57c9d8847073c579a24455e749a66;hp=36b2bb0b409984c3a0a2a54428ac70c7b62b1490;hpb=1b8f812fbf8d14bad0fcf9749ac71f640bda2868;p=rrdtool.git diff --git a/src/rrd_tune.c b/src/rrd_tune.c index 36b2bb0..89559af 100644 --- a/src/rrd_tune.c +++ b/src/rrd_tune.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.99907080300 Copyright by Tobi Oetiker, 1997-2007 + * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * change header parameters of an rrd ***************************************************************************** @@ -98,6 +98,7 @@ int rrd_tune( opterr = 0; /* initialize getopt */ + rrd_init(&rrd); rrd_file = rrd_open(argv[1], &rrd, RRD_READWRITE); if (rrd_file == NULL) { rrd_free(&rrd); @@ -197,15 +198,17 @@ int rrd_tune( rrd_close(rrd_file); return -1; } - strncpy(rrd.ds_def[ds].dst, dst, DST_SIZE - 1); - rrd.ds_def[ds].dst[DST_SIZE - 1] = '\0'; - - rrd.pdp_prep[ds].last_ds[0] = 'U'; - rrd.pdp_prep[ds].last_ds[1] = 'N'; - rrd.pdp_prep[ds].last_ds[2] = 'K'; - rrd.pdp_prep[ds].last_ds[3] = 'N'; - rrd.pdp_prep[ds].last_ds[4] = '\0'; + /* only reset when something is changed */ + if (strncmp(rrd.ds_def[ds].dst, dst, DST_SIZE - 1) != 0) { + strncpy(rrd.ds_def[ds].dst, dst, DST_SIZE - 1); + rrd.ds_def[ds].dst[DST_SIZE - 1] = '\0'; + rrd.pdp_prep[ds].last_ds[0] = 'U'; + rrd.pdp_prep[ds].last_ds[1] = 'N'; + rrd.pdp_prep[ds].last_ds[2] = 'K'; + rrd.pdp_prep[ds].last_ds[3] = 'N'; + rrd.pdp_prep[ds].last_ds[4] = '\0'; + } break; case 'r': if ((matches = @@ -300,14 +303,17 @@ int rrd_tune( break; case 's': strcpy(rrd.stat_head->version, RRD_VERSION); /* smoothing_window causes Version 4 */ - if (set_hwarg(&rrd, CF_SEASONAL, RRA_seasonal_smoothing_window, optarg)) { + if (set_hwarg + (&rrd, CF_SEASONAL, RRA_seasonal_smoothing_window, optarg)) { rrd_free(&rrd); return -1; } break; case 'S': strcpy(rrd.stat_head->version, RRD_VERSION); /* smoothing_window causes Version 4 */ - if (set_hwarg(&rrd, CF_DEVSEASONAL, RRA_seasonal_smoothing_window, optarg)) { + if (set_hwarg + (&rrd, CF_DEVSEASONAL, RRA_seasonal_smoothing_window, + optarg)) { rrd_free(&rrd); return -1; }