projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.7' into collectd-5.8
[collectd.git]
/
src
/
liboconfig
/
oconfig.h
diff --git
a/src/liboconfig/oconfig.h
b/src/liboconfig/oconfig.h
index
840137c
..
3b81062
100644
(file)
--- a/
src/liboconfig/oconfig.h
+++ b/
src/liboconfig/oconfig.h
@@
-32,17
+32,15
@@
/*
* Types
*/
/*
* Types
*/
-#define OCONFIG_TYPE_STRING
0
-#define OCONFIG_TYPE_NUMBER
1
+#define OCONFIG_TYPE_STRING 0
+#define OCONFIG_TYPE_NUMBER 1
#define OCONFIG_TYPE_BOOLEAN 2
#define OCONFIG_TYPE_BOOLEAN 2
-struct oconfig_value_s
-{
- union
- {
- char *string;
+struct oconfig_value_s {
+ union {
+ char *string;
double number;
double number;
- int
boolean;
+ int boolean;
} value;
int type;
};
} value;
int type;
};
@@
-50,28
+48,23
@@
typedef struct oconfig_value_s oconfig_value_t;
struct oconfig_item_s;
typedef struct oconfig_item_s oconfig_item_t;
struct oconfig_item_s;
typedef struct oconfig_item_s oconfig_item_t;
-struct oconfig_item_s
-{
- char *key;
+struct oconfig_item_s {
+ char *key;
oconfig_value_t *values;
oconfig_value_t *values;
- int
values_num;
+ int values_num;
- oconfig_item_t
*parent;
- oconfig_item_t
*children;
- int
children_num;
+ oconfig_item_t *parent;
+ oconfig_item_t *children;
+ int children_num;
};
/*
* Functions
*/
};
/*
* Functions
*/
-oconfig_item_t *oconfig_parse_fh (FILE *fh);
-oconfig_item_t *oconfig_parse_file (const char *file);
+oconfig_item_t *oconfig_parse_file(const char *file);
-oconfig_item_t *oconfig_clone
(const oconfig_item_t *ci);
+oconfig_item_t *oconfig_clone(const oconfig_item_t *ci);
-void oconfig_free
(oconfig_item_t *ci);
+void oconfig_free(oconfig_item_t *ci);
-/*
- * vim: shiftwidth=2:tabstop=8:softtabstop=2
- */
#endif /* OCONFIG_H */
#endif /* OCONFIG_H */