X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=program%2Fsrc%2Frrd_restore.c;h=65bbb10438b0d9a7e0e72d0fbcaaa438e20fb46d;hb=a526bb76513a2c16552df83dfb73ec90a16c8e89;hp=368f7bcfbb041ee6de6d4ead1ce5a2d414351114;hpb=5052661f803fb4881b4d15a6d78683dc6a0aa418;p=rrdtool-all.git

diff --git a/program/src/rrd_restore.c b/program/src/rrd_restore.c
index 368f7bcf..65bbb104 100644
--- a/program/src/rrd_restore.c
+++ b/program/src/rrd_restore.c
@@ -366,6 +366,7 @@ int xml2rrd(
             } else {
                 switch (cf_conv(rrd->rra_def[rra_index].cf_nam)) {
                 case CF_HWPREDICT:
+                case CF_MHWPREDICT:
                     read_tag(&ptr2, "hw_alpha", "%lf",
                              &(rrd->rra_def[rra_index].par[RRA_hw_alpha].
                                u_val));
@@ -456,6 +457,7 @@ int xml2rrd(
                                         i].scratch[CDP_secondary_val].u_val));
                     switch (cf_conv(rrd->rra_def[rra_index].cf_nam)) {
                     case CF_HWPREDICT:
+                    case CF_MHWPREDICT:
                         read_tag(&ptr2, "intercept", "%lf",
                                  &(rrd->
                                    cdp_prep[rrd->stat_head->ds_cnt *
@@ -706,20 +708,19 @@ int rrd_restore(
     char     *buf;
     char      rc = 0;
     char      force_overwrite = 0;
+    struct option long_options[] = {
+        {"range-check", no_argument, 0, 'r'},
+        {"force-overwrite", no_argument, 0, 'f'},
+        {0, 0, 0, 0}
+    };
 
     /* init rrd clean */
     optind = 0;
     opterr = 0;         /* initialize getopt */
     while (1) {
-        static struct option long_options[] = {
-            {"range-check", no_argument, 0, 'r'},
-            {"force-overwrite", no_argument, 0, 'f'},
-            {0, 0, 0, 0}
-        };
         int       option_index = 0;
         int       opt;
 
-
         opt = getopt_long(argc, argv, "rf", long_options, &option_index);
 
         if (opt == EOF)