Format code

This commit is contained in:
Maschell 2022-01-26 23:20:21 +01:00
parent cceda5e231
commit 7ad9df8a8c
6 changed files with 52 additions and 60 deletions

View File

@ -18,7 +18,9 @@ https://github.com/benhoyt/inih
#include "ini.h"
#if !INI_USE_STACK
#include <stdlib.h>
#endif
#define MAX_SECTION 50
@ -31,8 +33,7 @@ typedef struct {
} ini_parse_string_ctx;
/* 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);
while (p > s && isspace((unsigned char) (*--p)))
*p = '\0';
@ -40,8 +41,7 @@ static char* rstrip(char* 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)))
s++;
return (char *) s;
@ -50,8 +50,7 @@ static char* lskip(const char* s)
/* Return pointer to first char (of chars) or inline comment in given string,
or pointer to null at end of string if neither found. Inline comment must
be prefixed by a whitespace character to register as a comment. */
static char* find_chars_or_comment(const char* s, const char* chars)
{
static char *find_chars_or_comment(const char *s, const char *chars) {
#if INI_ALLOW_INLINE_COMMENTS
int was_space = 0;
while (*s && (!chars || !strchr(chars, *s)) &&
@ -68,8 +67,7 @@ static char* find_chars_or_comment(const char* s, const char* chars)
}
/* 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) {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-truncation"
strncpy(dest, src, size - 1);
@ -80,8 +78,7 @@ static char* strncpy0(char* dest, const char* src, size_t size)
/* See documentation in header file. */
int ini_parse_stream(ini_reader reader, void *stream, ini_handler handler,
void* user)
{
void *user) {
/* Uses a fair bit of stack (use heap instead if you need to) */
#if INI_USE_STACK
char line[INI_MAX_LINE];
@ -169,13 +166,11 @@ int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler,
*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) {
} else if (*start) {
/* Not a comment, must be a name[=:]value pair */
end = find_chars_or_comment(start, "=:");
if (*end == '=' || *end == ':') {
@ -194,8 +189,7 @@ int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler,
strncpy0(prev_name, name, sizeof(prev_name));
if (!HANDLER(user, section, name, value) && !error)
error = lineno;
}
else if (!error) {
} else if (!error) {
/* No '=' or ':' found on name[=:]value line */
error = lineno;
}
@ -215,14 +209,12 @@ int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler,
}
/* See documentation in header file. */
int ini_parse_file(FILE* file, ini_handler handler, void* user)
{
int ini_parse_file(FILE *file, ini_handler handler, void *user) {
return ini_parse_stream((ini_reader) fgets, file, handler, user);
}
/* See documentation in header file. */
int ini_parse(const char* filename, ini_handler handler, void* user)
{
int ini_parse(const char *filename, ini_handler handler, void *user) {
FILE *file;
int error;