X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_fetch.c;h=c065793992dc0f1fcecf90bed8b40e9a1214f693;hb=51d0e04444ef73e323a1a5132752cec9b12ca7fd;hp=618f3d3036a4561eda0c833ac3cbee89c02b5f3e;hpb=7f30ee2ae089520606cbb7e38fab9981618771f5;p=rrdtool.git

diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c
index 618f3d3..c065793 100644
--- a/src/rrd_fetch.c
+++ b/src/rrd_fetch.c
@@ -69,14 +69,18 @@ int rrd_fetch(
     char ***ds_namv,    /* names of data sources */
     rrd_value_t **data)
 {                       /* two dimensional array containing the data */
-
-
     long      step_tmp = 1;
     time_t    start_tmp = 0, end_tmp = 0;
     const char *cf;
 
     struct rrd_time_value start_tv, end_tv;
     char     *parsetime_error = NULL;
+    struct option long_options[] = {
+        {"resolution", required_argument, 0, 'r'},
+        {"start", required_argument, 0, 's'},
+        {"end", required_argument, 0, 'e'},
+        {0, 0, 0, 0}
+    };
 
     optind = 0;
     opterr = 0;         /* initialize getopt */
@@ -86,12 +90,6 @@ int rrd_fetch(
     parsetime("now", &end_tv);
 
     while (1) {
-        static struct option long_options[] = {
-            {"resolution", required_argument, 0, 'r'},
-            {"start", required_argument, 0, 's'},
-            {"end", required_argument, 0, 'e'},
-            {0, 0, 0, 0}
-        };
         int       option_index = 0;
         int       opt;
 
@@ -430,7 +428,7 @@ int rrd_fetch_fn(
                               POSIX_FADV_DONTNEED)) {
                 rrd_set_error("setting POSIX_FADV_DONTNEED on '%s': %s",
                               filename, rrd_strerror(errno));
-                goto err_close;/*XXX: should use err_free_all_ds_namv */
+                goto err_close; /*XXX: should use err_free_all_ds_namv */
             }
 #endif
 
@@ -454,22 +452,22 @@ int rrd_fetch_fn(
                       POSIX_FADV_DONTNEED)) {
         rrd_set_error("setting POSIX_FADV_DONTNEED on '%s': %s", filename,
                       rrd_strerror(errno));
-        goto err_free; /*XXX: should use err_free_all_ds_namv */
+        goto err_free;  /*XXX: should use err_free_all_ds_namv */
     }
 #endif
     rrd_close(rrd_file);
     return (0);
-err_free_data:
+  err_free_data:
     free(*data);
     *data = NULL;
-err_free_all_ds_namv:
-    for (i = 0; (unsigned long)i < rrd.stat_head->ds_cnt; ++i)
+  err_free_all_ds_namv:
+    for (i = 0; (unsigned long) i < rrd.stat_head->ds_cnt; ++i)
         free((*ds_namv)[i]);
-err_free_ds_namv:
+  err_free_ds_namv:
     free(*ds_namv);
-err_close:
+  err_close:
     rrd_close(rrd_file);
-err_free:
+  err_free:
     rrd_free(&rrd);
     return (-1);
 }