diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-03-05 08:23:32 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-03-05 08:23:32 -0500 |
| commit | 686494f0f71b9235399b8241aba3e0c2fcb03ea1 (patch) | |
| tree | 39256173e40ef50d45cc35c22561da9279f9753b /src/app | |
| parent | edc0bf5089df13d1d6a246e67bddb484ac99ad59 (diff) | |
| parent | b5ccdd978ea138cde92b3513c9d653ba18b8b463 (diff) | |
| download | tor-686494f0f71b9235399b8241aba3e0c2fcb03ea1.tar.gz tor-686494f0f71b9235399b8241aba3e0c2fcb03ea1.zip | |
Merge branch 'clang_format_prep_3'
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 2 | ||||
| -rw-r--r-- | src/app/config/statefile.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 57aa055e73..9d5344838a 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -182,7 +182,7 @@ static const char unix_q_socket_prefix[] = "unix:\""; * *DowloadInitialDelay . */ #ifndef COCCI #define DOWNLOAD_SCHEDULE(name) \ - { #name "DownloadSchedule", #name "DownloadInitialDelay", 0, 1 } + { (#name "DownloadSchedule"), (#name "DownloadInitialDelay"), 0, 1 } #else #define DOWNLOAD_SCHEDULE(name) { NULL, NULL, 0, 1 } #endif /* !defined(COCCI) */ diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c index d9667733cc..dcc55f1898 100644 --- a/src/app/config/statefile.c +++ b/src/app/config/statefile.c @@ -78,6 +78,7 @@ DUMMY_TYPECHECK_INSTANCE(or_state_t); VAR(#member, conftype, member, initvalue) /** Array of "state" variables saved to the ~/.tor/state file. */ +// clang-format off static const config_var_t state_vars_[] = { /* Remember to document these in state-contents.txt ! */ @@ -134,6 +135,7 @@ static const config_var_t state_vars_[] = { END_OF_CONFIG_VARS }; +// clang-format on #undef VAR #undef V |