Run clang-format on the whole tree

[lttng-tools.git] / src / common / ini-config / ini.cpp

diff --git a/src/common/ini-config/ini.cpp b/src/common/ini-config/ini.cpp
index ec5a41119e87c17f66b47d3656909ed670c11ea4..978b185fac98073f6e5beccdb952822cc301d183 100644 (file)
--- a/src/common/ini-config/ini.cpp
+++ b/src/common/ini-config/ini.cpp
@@ -33,36 +33,37 @@
  * http://code.google.com/p/inih/
  */
 
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
+#include "ini.hpp"
+
 #include <common/common.hpp>
 
-#include "ini.hpp"
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
 
 #if !INI_USE_STACK
 #include <stdlib.h>
 #endif
 
 #define MAX_SECTION 50
-#define MAX_NAME 50
+#define MAX_NAME    50
 
 /* Strip whitespace chars off end of given string, in place. Return s. */
-static char* rstrip(char* s)
+static char *rstrip(char *s)
 {
-       char* p = s + strlen(s);
+       char *p = s + strlen(s);
 
-       while (p > s && isspace((unsigned char)(*--p)))
+       while (p > s && isspace((unsigned char) (*--p)))
                *p = '\0';
        return s;
 }
 
 /* Return pointer to first non-whitespace char in given string. */
-static char* lskip(const char* s)
+static char *lskip(const char *s)
 {
-       while (*s && isspace((unsigned char)(*s)))
+       while (*s && isspace((unsigned char) (*s)))
                s++;
-       return (char*)s;
+       return (char *) s;
 }
 
 /*
@@ -70,19 +71,19 @@ static char* lskip(const char* s)
  * null at end of string if neither found. ';' must be prefixed by a whitespace
  * character to register as a comment.
  */
-static char* find_char_or_comment(const char* s, char c)
+static char *find_char_or_comment(const char *s, char c)
 {
        int was_whitespace = 0;
 
        while (*s && *s != c && !(was_whitespace && *s == ';')) {
-               was_whitespace = isspace((unsigned char)(*s));
+               was_whitespace = isspace((unsigned char) (*s));
                s++;
        }
-       return (char*)s;
+       return (char *) s;
 }
 
 /* Version of strncpy that ensures dest (size bytes) is null-terminated. */
-static char* strncpy0(char* dest, const char* src, size_t size)
+static char *strncpy0(char *dest, const char *src, size_t size)
 {
        strncpy(dest, src, size - 1);
        dest[size - 1] = '\0';
@@ -90,21 +91,21 @@ static char* strncpy0(char* dest, const char* src, size_t size)
 }
 
 /* See documentation in header file. */
-int ini_parse_file(FILE* file, ini_entry_handler handler, void* user)
+int ini_parse_file(FILE *file, ini_entry_handler handler, void *user)
 {
        /* Uses a fair bit of stack (use heap instead if you need to) */
 #if INI_USE_STACK
        char line[INI_MAX_LINE];
 #else
-       char* line;
+       char *line;
 #endif
        char section[MAX_SECTION] = "";
        char prev_name[MAX_NAME] = "";
 
-       char* start;
-       char* end;
-       char* name;
-       char* value;
+       char *start;
+       char *end;
+       char *name;
+       char *value;
        int lineno = 0;
        int error = 0;
 
@@ -121,9 +122,8 @@ int ini_parse_file(FILE* file, ini_entry_handler handler, void* user)
 
                start = line;
 #if INI_ALLOW_BOM
-               if (lineno == 1 && (unsigned char)start[0] == 0xEF &&
-                       (unsigned char)start[1] == 0xBB &&
-                       (unsigned char)start[2] == 0xBF) {
+               if (lineno == 1 && (unsigned char) start[0] == 0xEF &&
+                   (unsigned char) start[1] == 0xBB && (unsigned char) start[2] == 0xBF) {
                        start += 3;
                }
 #endif
@@ -141,8 +141,7 @@ int ini_parse_file(FILE* file, ini_entry_handler handler, void* user)
                         * continuation of previous name's value
                         * (as per Python ConfigParser).
                         */
-                       if (handler(user, section, prev_name, start) < 0 &&
-                               !error) {
+                       if (handler(user, section, prev_name, start) < 0 && !error) {
                                error = lineno;
                        }
                }
@@ -154,13 +153,11 @@ int ini_parse_file(FILE* file, ini_entry_handler handler, void* user)
                                *end = '\0';
                                strncpy0(section, start + 1, sizeof(section));
                                *prev_name = '\0';
-                       }
-                       else if (!error) {
+                       } else if (!error) {
                                /* No ']' found on section line */
                                error = lineno;
                        }
-               }
-               else if (*start && *start != ';') {
+               } else if (*start && *start != ';') {
                        /* Not a comment, must be a name[=:]value pair */
                        end = find_char_or_comment(start, '=');
                        if (*end != '=') {
@@ -182,12 +179,10 @@ int ini_parse_file(FILE* file, ini_entry_handler handler, void* user)
                                 * handler
                                 */
                                strncpy0(prev_name, name, sizeof(prev_name));
-                               if (handler(user, section, name, value) < 0 &&
-                                       !error) {
+                               if (handler(user, section, name, value) < 0 && !error) {
                                        error = lineno;
                                }
-                       }
-                       else if (!error) {
+                       } else if (!error) {
                                /* No '=' or ':' found on name[=:]value line */
                                error = lineno;
                        }
@@ -202,9 +197,9 @@ int ini_parse_file(FILE* file, ini_entry_handler handler, void* user)
 }
 
 /* See documentation in header file. */
-int ini_parse(const char* filename, ini_entry_handler handler, void* user)
+int ini_parse(const char *filename, ini_entry_handler handler, void *user)
 {
-       FILE* file;
+       FILE *file;
        int error;
 
        file = fopen(filename, "r");