diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-11-19 15:45:12 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-11-20 09:26:47 -0500 |
| commit | 89c355b38601e0eda4e999219946bf2431d5de51 (patch) | |
| tree | 12f1c44a0dfad5492a0e282c43d78c70e87b3e34 /src/app | |
| parent | a30d143228b4211fd24093c244117e07e9409de5 (diff) | |
| download | tor-89c355b38601e0eda4e999219946bf2431d5de51.tar.gz tor-89c355b38601e0eda4e999219946bf2431d5de51.zip | |
Some tests for log changes, commit, and rollback
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 8 | ||||
| -rw-r--r-- | src/app/config/config.h | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index e0a334c797..8c5a53209c 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -862,8 +862,6 @@ static void options_clear_cb(const config_mgr_t *mgr, void *opts); static setopt_err_t options_validate_and_set(const or_options_t *old_options, or_options_t *new_options, char **msg_out); -struct log_transaction_t; -static void options_rollback_log_transaction(struct log_transaction_t *xn); struct listener_transaction_t; static void options_rollback_listener_transaction( struct listener_transaction_t *xn); @@ -1801,7 +1799,7 @@ typedef struct log_transaction_t { * On failure return NULL and write a message into a newly allocated string in * *<b>msg_out</b>. **/ -static log_transaction_t * +STATIC log_transaction_t * options_start_log_transaction(const or_options_t *old_options, char **msg_out) { @@ -1837,7 +1835,7 @@ options_start_log_transaction(const or_options_t *old_options, * Finish configuring the logs that started to get configured with <b>xn</b>. * Frees <b>xn</b>. **/ -static void +STATIC void options_commit_log_transaction(log_transaction_t *xn) { const or_options_t *options = get_options(); @@ -1891,7 +1889,7 @@ options_commit_log_transaction(log_transaction_t *xn) * Revert the log configuration changes that that started to get configured * with <b>xn</b>. Frees <b>xn</b>. **/ -static void +STATIC void options_rollback_log_transaction(log_transaction_t *xn) { if (!xn) diff --git a/src/app/config/config.h b/src/app/config/config.h index c6c03329bb..15c9352467 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -304,6 +304,12 @@ STATIC int options_init_logs(const or_options_t *old_options, const or_options_t *options, int validate_only); STATIC int options_create_directories(char **msg_out); +struct log_transaction_t; +STATIC struct log_transaction_t *options_start_log_transaction( + const or_options_t *old_options, + char **msg_out); +STATIC void options_commit_log_transaction(struct log_transaction_t *xn); +STATIC void options_rollback_log_transaction(struct log_transaction_t *xn); #ifdef TOR_UNIT_TESTS int options_validate(const or_options_t *old_options, |