diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-03-13 15:11:56 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-03-13 15:11:56 +0000 |
| commit | 365f16b199ac7fbff00c70e6c03437decf868db9 (patch) | |
| tree | f37c5369fac1753c9708dc2371ac4772afd2f813 /src/or/or.h | |
| parent | 24884bb3ed970539e073358270fcff00669eb1fa (diff) | |
| download | tor-365f16b199ac7fbff00c70e6c03437decf868db9.tar.gz tor-365f16b199ac7fbff00c70e6c03437decf868db9.zip | |
r18787@catbus: nickm | 2008-03-13 11:11:52 -0400
Make set-option functions return sensible error codes from an enum, not mysterious negative integers
svn:r14004
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h index 57d2a8f824..1830889d54 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2636,6 +2636,15 @@ extern uint64_t stats_n_destroy_cells_processed; /********************************* config.c ***************************/ +/** An error from options_trial_assign or options_init_from_string. */ +typedef enum setopt_err_t { + SETOPT_OK = 0, + SETOPT_ERR_MISC = -1, + SETOPT_ERR_PARSE = -2, + SETOPT_ERR_TRANSITION = -3, + SETOPT_ERR_SETTING = -4, +} setopt_err_t; + or_options_t *get_options(void); int set_options(or_options_t *new_val, char **msg); void config_free_all(void); @@ -2652,8 +2661,8 @@ int resolve_my_address(int warn_severity, or_options_t *options, int is_local_IP(uint32_t ip) ATTR_PURE; void options_init(or_options_t *options); int options_init_from_torrc(int argc, char **argv); -int options_init_from_string(const char *cf, - int command, const char *command_arg, char **msg); +setopt_err_t options_init_from_string(const char *cf, + int command, const char *command_arg, char **msg); int option_is_recognized(const char *key); const char *option_get_canonical_name(const char *key); config_line_t *option_get_assignment(or_options_t *options, |