diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-19 15:32:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-19 15:32:17 -0400 |
| commit | a7b46336eb5f1f7f734ac2d978c7ab17d1c870c0 (patch) | |
| tree | 66cc240da6fb2cedc8dfa21adf9dc2183fd293f2 /src/common/util.h | |
| parent | 60d14421363bdbeee337ba69b21640058a26a6bd (diff) | |
| parent | 1827be0bd6a400f4b5970f5b37b1d2c8e83b6a3f (diff) | |
| download | tor-a7b46336eb5f1f7f734ac2d978c7ab17d1c870c0.tar.gz tor-a7b46336eb5f1f7f734ac2d978c7ab17d1c870c0.zip | |
Merge remote-tracking branch 'public/bug7950' into maint-0.2.4
Diffstat (limited to 'src/common/util.h')
| -rw-r--r-- | src/common/util.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/common/util.h b/src/common/util.h index 8206a6d8a4..fbf6d2bea4 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -369,8 +369,11 @@ char *read_file_to_str(const char *filename, int flags, struct stat *stat_out) char *read_file_to_str_until_eof(int fd, size_t max_bytes_to_read, size_t *sz_out) ATTR_MALLOC; -const char *parse_config_line_from_str(const char *line, - char **key_out, char **value_out); +const char *parse_config_line_from_str_verbose(const char *line, + char **key_out, char **value_out, + const char **err_out); +#define parse_config_line_from_str(line,key_out,value_out) \ + parse_config_line_from_str_verbose((line),(key_out),(value_out),NULL) char *expand_filename(const char *filename); struct smartlist_t *tor_listdir(const char *dirname); int path_is_relative(const char *filename); |