From: Wolfgang Stöggl <c72578@yahoo.de>
Date: Wed, 17 Jul 2019 10:30:15 +0000 (+0200)
Subject: Indent rrd_cgi.c
X-Git-Tag: v1.8.0~72
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=50f99f94e6448d577352e086c8673edb41569450;p=thirdparty%2Frrdtool-1.x.git

Indent rrd_cgi.c

- indent src/rrd_cgi.c using GNU indent 2.2.12
  before further changes to the code
---

diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c
index 7abd2797..1bcf213f 100644
--- a/src/rrd_cgi.c
+++ b/src/rrd_cgi.c
@@ -146,7 +146,7 @@ static s_cgi *rrdcgiInit(
  *  or doesn't exist.
  */
 static char *rrdcgiGetValue(
-    s_cgi * parms,
+    s_cgi *parms,
     const char *name);
 
 /*  rrdcgiReadVariables()
@@ -397,11 +397,11 @@ static int readfile(
         totalcnt = (ftell(input) + 1) / sizeof(char) - offset;
         if (totalcnt < MEMBLK)
             totalcnt = MEMBLK;  /* sanitize */
-        if (fseek(input, offset * sizeof(char), SEEK_SET) == -1)
-        {
-           rrd_set_error("fseek() failed on %s: %s", file_name, rrd_strerror(errno));
-           fclose(input);
-           return (-1);
+        if (fseek(input, offset * sizeof(char), SEEK_SET) == -1) {
+            rrd_set_error("fseek() failed on %s: %s", file_name,
+                          rrd_strerror(errno));
+            fclose(input);
+            return (-1);
         }
     }
     if (((*buffer) = (char *) malloc((totalcnt + 4) * sizeof(char))) == NULL) {
@@ -436,12 +436,13 @@ int main(
     char     *buffer;
     long      i;
     long      filter = 0;
+
     struct optparse_long longopts[] = {
         {"filter", 'f', OPTPARSE_NONE},
         {0},
     };
     struct optparse options;
-    int opt;
+    int       opt;
 
 #ifdef MUST_DISABLE_SIGFPE
     signal(SIGFPE, SIG_IGN);
@@ -454,7 +455,7 @@ int main(
        for (i=0;i<argc;i++)
        printf("%d-'%s'\n",i,argv[i]); */
     optparse_init(&options, argc, argv);
-    while ((opt = optparse_long(&options,longopts,NULL)) != -1) {
+    while ((opt = optparse_long(&options, longopts, NULL)) != -1) {
         switch (opt) {
         case 'f':
             filter = 1;
@@ -561,7 +562,7 @@ static char *rrdsetenv(
 {
     if (argc >= 2) {
         const size_t len = strlen(args[0]) + strlen(args[1]) + 2;
-        char *xyz = (char *) malloc(len);
+        char     *xyz = (char *) malloc(len);
 
         if (xyz == NULL) {
             return stralloc("[ERROR: allocating setenv buffer]");
@@ -754,7 +755,8 @@ static char *includefile(
 
         readfile(filename, &buffer, 0);
         if (rrd_test_error()) {
-            char err[4096];
+            char      err[4096];
+
             snprintf(err, sizeof(err), "[ERROR %s]", rrd_get_error());
             rrd_clear_error();
 
@@ -921,7 +923,8 @@ static char *drawgraph(
         return stralloc(calcpr[0]);
     } else {
         if (rrd_test_error()) {
-            char err[4096];
+            char      err[4096];
+
             snprintf(err, sizeof(err), "[ERROR %s]", rrd_get_error());
             rrd_clear_error();
 
@@ -964,7 +967,8 @@ static char *printtimelast(
 
         last = rrd_last(argc, (char **) args - 1);
         if (rrd_test_error()) {
-            char err[4096];
+            char      err[4096];
+
             snprintf(err, sizeof(err), "[ERROR %s]", rrd_get_error());
             rrd_clear_error();
 
@@ -975,7 +979,9 @@ static char *printtimelast(
         strftime(buf, 254, args[1], &tm_last);
         return buf;
     }
-    return stralloc("[ERROR: expected <RRD::TIME::LAST file.rrd strftime-format>]");
+    return
+        stralloc
+        ("[ERROR: expected <RRD::TIME::LAST file.rrd strftime-format>]");
 }
 
 static char *printtimenow(
@@ -1167,8 +1173,8 @@ static char *scanargs(
        over seemingly the old array ... but doing argv-1 will actually end
        up in a 'good' place now. */
 
-    *arguments = argv+1;
-    *argument_count = argc-1;
+    *arguments = argv + 1;
+    *argument_count = argc - 1;
 
     if (Quote) {
         return NULL;
@@ -1190,8 +1196,8 @@ static int parse(
     char **buf,         /* buffer */
     long i,             /* offset in buffer */
     char *tag,          /* tag to handle  */
-    char *    (*func) (long,
-                       const char **)   /* function to call for 'tag' */
+    char *    (*func)(long,
+                      const char **)    /* function to call for 'tag' */
     )
 {
     /* the name of the vairable ... */
@@ -1222,7 +1228,7 @@ static int parse(
     if (end) {
         /* got arguments, call function for 'tag' with arguments */
         val = func(argc, (const char **) args);
-        free(args-1);
+        free(args - 1);
     } else {
         /* next call, try parsing at current offset +1 */
         end = (*buf) + i + 1;
@@ -1333,11 +1339,13 @@ static char *rrdcgiDecodeString(
  * We can safely call free() on result[i]->{name,value} because they are
  * memset() to 0 after their allocation.
  */
-static void free_result(s_var **result, int number)
+static void free_result(
+    s_var **result,
+    int number)
 {
-    int i;
+    int       i;
 
-    for(i = 0; i < number; i++) {
+    for (i = 0; i < number; i++) {
         if (result && result[i]) {
             free(result[i]->name);
             free(result[i]->value);
@@ -1488,7 +1496,8 @@ static s_var **rrdcgiReadVariables(
                     return NULL;
                 }
                 if ((result[i]->name =
-                     (char *) malloc((esp - cp + 1) * sizeof(char))) == NULL) {
+                     (char *) malloc((esp - cp + 1) * sizeof(char))) ==
+                    NULL) {
                     free_result(result, i);
                     free(line);
                     return NULL;
@@ -1497,7 +1506,8 @@ static s_var **rrdcgiReadVariables(
                 strncpy(result[i]->name, cp, esp - cp);
                 cp = ++esp;
                 if ((result[i]->value =
-                     (char *) malloc((ip - esp + 1) * sizeof(char))) == NULL) {
+                     (char *) malloc((ip - esp + 1) * sizeof(char))) ==
+                    NULL) {
                     free_result(result, i);
                     free(line);
                     return NULL;
@@ -1552,7 +1562,7 @@ static s_cgi *rrdcgiInit(
     vars = rrdcgiReadVariables();
 
     if (!vars) {
-    	free(res);
+        free(res);
         return NULL;
     }
 
@@ -1562,7 +1572,7 @@ static s_cgi *rrdcgiInit(
 }
 
 static char *rrdcgiGetValue(
-    s_cgi * parms,
+    s_cgi *parms,
     const char *name)
 {
     int       i;
@@ -1589,4 +1599,3 @@ static char *rrdcgiGetValue(
     }
     return NULL;
 }
-