nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 15:23:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

feature/control: wrap some problem macros in COCCI

Browse Source
This commit is contained in:
Nick Mathewson 2019-10-09 12:36:47 -04:00
parent d6ce8527f8
commit 54c5366aa1
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/feature/control/control_cmd.c
View File

@ -2245,6 +2245,7 @@ typedef struct control_cmd_def_t {
*/ */
#define CMD_FL_WIPE (1u<<0) #define CMD_FL_WIPE (1u<<0)
#ifndef COCCI
/** Macro: declare a command with a one-line argument, a given set of flags, /** Macro: declare a command with a one-line argument, a given set of flags,
* and a syntax definition. * and a syntax definition.
**/ **/
@ -2277,6 +2278,7 @@ typedef struct control_cmd_def_t {
0, \ 0, \
&obsolete_syntax, \ &obsolete_syntax, \
} }
#endif
/** /**
* An array defining all the recognized controller commands. * An array defining all the recognized controller commands.

2
src/feature/control/control_events.c
View File

@ -1660,6 +1660,7 @@ control_event_status(int type, int severity, const char *format, va_list args)
return 0; return 0;
} }
#ifndef COCCI
#define CONTROL_EVENT_STATUS_BODY(event, sev) \ #define CONTROL_EVENT_STATUS_BODY(event, sev) \
int r; \ int r; \
do { \ do { \
@ -1671,6 +1672,7 @@ control_event_status(int type, int severity, const char *format, va_list args)
r = control_event_status((event), (sev), format, ap); \ r = control_event_status((event), (sev), format, ap); \
va_end(ap); \ va_end(ap); \
} while (0) } while (0)
#endif
/** Format and send an EVENT_STATUS_GENERAL event whose main text is obtained /** Format and send an EVENT_STATUS_GENERAL event whose main text is obtained
* by formatting the arguments using the printf-style <b>format</b>. */ * by formatting the arguments using the printf-style <b>format</b>. */