diff options
Diffstat (limited to 'utility/config.h')
-rw-r--r-- | utility/config.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/utility/config.h b/utility/config.h index 67f8ea5..0e80856 100644 --- a/utility/config.h +++ b/utility/config.h | |||
@@ -4,7 +4,6 @@ | |||
4 | #include "apr_tables.h" | 4 | #include "apr_tables.h" |
5 | #include "apr_hash.h" | 5 | #include "apr_hash.h" |
6 | #include "apr_file_io.h" | 6 | #include "apr_file_io.h" |
7 | |||
8 | #include "ap_pcre.h" | 7 | #include "ap_pcre.h" |
9 | 8 | ||
10 | typedef enum { | 9 | typedef enum { |
@@ -14,6 +13,7 @@ typedef enum { | |||
14 | LOGLEVEL_DEBUG = 3, | 13 | LOGLEVEL_DEBUG = 3, |
15 | } loglevel_e; | 14 | } loglevel_e; |
16 | 15 | ||
16 | typedef struct config_dbd_t config_dbd_t; | ||
17 | typedef struct config_t config_t; | 17 | typedef struct config_t config_t; |
18 | struct config_t { | 18 | struct config_t { |
19 | /** the structures pool (to ease function arguments) */ | 19 | /** the structures pool (to ease function arguments) */ |
@@ -32,7 +32,10 @@ struct config_t { | |||
32 | apr_array_header_t *input_files; | 32 | apr_array_header_t *input_files; |
33 | 33 | ||
34 | /** db connection configuration */ | 34 | /** db connection configuration */ |
35 | apr_table_t *dbconfig; | 35 | const char *dbdriver; |
36 | const char *dbparams; | ||
37 | config_dbd_t *dbconn; | ||
38 | |||
36 | /** Logging table */ | 39 | /** Logging table */ |
37 | const char *table; | 40 | const char *table; |
38 | /** Use transactons */ | 41 | /** Use transactons */ |
@@ -111,10 +114,12 @@ struct config_output_field_t { | |||
111 | const char *field; | 114 | const char *field; |
112 | logsql_field_datatype datatype; | 115 | logsql_field_datatype datatype; |
113 | apr_size_t size; | 116 | apr_size_t size; |
117 | const char *def; | ||
114 | const char *source; | 118 | const char *source; |
115 | const char *fname; | 119 | const char *fname; |
116 | void *func; | 120 | void *func; |
117 | const char **args; | 121 | const char **args; |
122 | void *data; | ||
118 | }; | 123 | }; |
119 | 124 | ||
120 | #define CHECK_YESNO(c) ((!strcasecmp(c,"on") || !strcasecmp(c,"yes")) ? 1 : 0) | 125 | #define CHECK_YESNO(c) ((!strcasecmp(c,"on") || !strcasecmp(c,"yes")) ? 1 : 0) |