projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
redis plugin: Change text of some error messages
[collectd.git]
/
src
/
utils_parse_option.c
diff --git
a/src/utils_parse_option.c
b/src/utils_parse_option.c
index
7f06f29
..
005715c
100644
(file)
--- a/
src/utils_parse_option.c
+++ b/
src/utils_parse_option.c
@@
-25,12
+25,10
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
-#include "common.h"
-#include "plugin.h"
+
#include "utils_parse_option.h"
#include "utils_parse_option.h"
-int parse_string (char **ret_buffer, char **ret_string)
-{
+int parse_string(char **ret_buffer, char **ret_string) {
char *buffer;
char *string;
char *buffer;
char *string;
@@
-38,31
+36,28
@@
int parse_string (char **ret_buffer, char **ret_string)
/* Eat up leading spaces. */
string = buffer;
/* Eat up leading spaces. */
string = buffer;
- while (isspace
((int)
*string))
+ while (isspace
((int)
*string))
string++;
if (*string == 0)
string++;
if (*string == 0)
- return
(1)
;
+ return
1
;
/* A quoted string */
/* A quoted string */
- if (*string == '"')
- {
+ if (*string == '"') {
char *dst;
string++;
if (*string == 0)
char *dst;
string++;
if (*string == 0)
- return
(1)
;
+ return
1
;
dst = string;
buffer = string;
dst = string;
buffer = string;
- while ((*buffer != '"') && (*buffer != 0))
- {
+ while ((*buffer != '"') && (*buffer != 0)) {
/* Un-escape backslashes */
/* Un-escape backslashes */
- if (*buffer == '\\')
- {
+ if (*buffer == '\\') {
buffer++;
/* Catch a backslash at the end of buffer */
if (*buffer == 0)
buffer++;
/* Catch a backslash at the end of buffer */
if (*buffer == 0)
- return
(-1)
;
+ return
-1
;
}
*dst = *buffer;
buffer++;
}
*dst = *buffer;
buffer++;
@@
-70,7
+65,7
@@
int parse_string (char **ret_buffer, char **ret_string)
}
/* No quote sign has been found */
if (*buffer == 0)
}
/* No quote sign has been found */
if (*buffer == 0)
- return
(-1)
;
+ return
-1
;
*dst = 0;
dst++;
*dst = 0;
dst++;
@@
-78,29
+73,27
@@
int parse_string (char **ret_buffer, char **ret_string)
buffer++;
/* Check for trailing spaces. */
buffer++;
/* Check for trailing spaces. */
- if ((*buffer != 0) && !isspace ((int) *buffer))
- return (-1);
- }
- else /* an unquoted string */
+ if ((*buffer != 0) && !isspace((int)*buffer))
+ return -1;
+ } else /* an unquoted string */
{
buffer = string;
{
buffer = string;
- while ((*buffer != 0) && !isspace
((int)
*buffer))
+ while ((*buffer != 0) && !isspace
((int)
*buffer))
buffer++;
buffer++;
- if (*buffer != 0)
- {
+ if (*buffer != 0) {
*buffer = 0;
buffer++;
}
}
*buffer = 0;
buffer++;
}
}
-
+
/* Eat up trailing spaces */
/* Eat up trailing spaces */
- while (isspace
((int)
*buffer))
+ while (isspace
((int)
*buffer))
buffer++;
*ret_buffer = buffer;
*ret_string = string;
buffer++;
*ret_buffer = buffer;
*ret_string = string;
- return
(0)
;
+ return
0
;
} /* int parse_string */
/*
} /* int parse_string */
/*
@@
-114,8
+107,7
@@
int parse_string (char **ret_buffer, char **ret_string)
* However, if the value does *not* contain a space character, you can skip
* the quotes.
*/
* However, if the value does *not* contain a space character, you can skip
* the quotes.
*/
-int parse_option (char **ret_buffer, char **ret_key, char **ret_value)
-{
+int parse_option(char **ret_buffer, char **ret_key, char **ret_value) {
char *buffer;
char *key;
char *value;
char *buffer;
char *key;
char *value;
@@
-125,26
+117,26
@@
int parse_option (char **ret_buffer, char **ret_key, char **ret_value)
/* Eat up leading spaces */
key = buffer;
/* Eat up leading spaces */
key = buffer;
- while (isspace
((int)
*key))
+ while (isspace
((int)
*key))
key++;
if (*key == 0)
key++;
if (*key == 0)
- return
(1)
;
+ return
1
;
/* Look for the equal sign */
buffer = key;
/* Look for the equal sign */
buffer = key;
- while (isalnum
((int)
*buffer) || *buffer == '_' || *buffer == ':')
+ while (isalnum
((int)
*buffer) || *buffer == '_' || *buffer == ':')
buffer++;
if ((*buffer != '=') || (buffer == key))
buffer++;
if ((*buffer != '=') || (buffer == key))
- return
(1)
;
+ return
1
;
*buffer = 0;
buffer++;
/* Empty values must be written as "" */
*buffer = 0;
buffer++;
/* Empty values must be written as "" */
- if (isspace
((int)
*buffer) || (*buffer == 0))
- return
(-1)
;
+ if (isspace
((int)
*buffer) || (*buffer == 0))
+ return
-1
;
- status = parse_string
(&buffer, &value);
+ status = parse_string(&buffer, &value);
if (status != 0)
if (status != 0)
- return
(-1)
;
+ return
-1
;
/* NB: parse_string will have eaten up all trailing spaces. */
/* NB: parse_string will have eaten up all trailing spaces. */
@@
-152,7
+144,5
@@
int parse_option (char **ret_buffer, char **ret_key, char **ret_value)
*ret_key = key;
*ret_value = value;
*ret_key = key;
*ret_value = value;
- return
(0)
;
+ return
0
;
} /* int parse_option */
} /* int parse_option */
-
-/* vim: set sw=2 ts=8 tw=78 et : */