mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
Make ntmain.h functions stubs when NT_SERVICE not enabled.
This lets us simplify main.c a little, and avoid a practracker exception. Followup from #32883.
This commit is contained in:
+4
-11
@@ -1238,15 +1238,10 @@ tor_run_main(const tor_main_configuration_t *tor_cfg)
|
||||
memcpy(argv + tor_cfg->argc, tor_cfg->argv_owned,
|
||||
tor_cfg->argc_owned*sizeof(char*));
|
||||
|
||||
#ifdef NT_SERVICE
|
||||
{
|
||||
int done = 0;
|
||||
result = nt_service_parse_options(argc, argv, &done);
|
||||
if (done) {
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
#endif /* defined(NT_SERVICE) */
|
||||
int done = 0;
|
||||
result = nt_service_parse_options(argc, argv, &done);
|
||||
if (done)
|
||||
goto done;
|
||||
|
||||
pubsub_install();
|
||||
|
||||
@@ -1288,9 +1283,7 @@ tor_run_main(const tor_main_configuration_t *tor_cfg)
|
||||
|
||||
switch (get_options()->command) {
|
||||
case CMD_RUN_TOR:
|
||||
#ifdef NT_SERVICE
|
||||
nt_service_set_state(SERVICE_RUNNING);
|
||||
#endif
|
||||
result = run_tor_main_loop();
|
||||
break;
|
||||
case CMD_KEYGEN:
|
||||
|
||||
@@ -22,7 +22,8 @@ int nt_service_is_stopping(void);
|
||||
void nt_service_set_state(DWORD state);
|
||||
#else
|
||||
#define nt_service_is_stopping() 0
|
||||
#define nt_service_parse_options(a, b, c) (0)
|
||||
#define nt_service_set_state(s) STMT_NIL
|
||||
#endif /* defined(NT_SERVICE) */
|
||||
|
||||
#endif /* !defined(TOR_NTMAIN_H) */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user