From 98f3d6efca15c237b31e9c6803ae06cc30c9b18d Mon Sep 17 00:00:00 2001 From: Ron Koenderink Date: Thu, 10 Mar 2005 18:00:40 +0000 Subject: [PATCH] (main,service_main) [_WIN32]: Change startup errors to stderr from logerror() as log file is not open yet. --- src/lib/gen/service.c | 14 +++++++------- src/server/main.c | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lib/gen/service.c b/src/lib/gen/service.c index cded65518..89b9c500a 100644 --- a/src/lib/gen/service.c +++ b/src/lib/gen/service.c @@ -70,7 +70,7 @@ install_service(char *program_name, char *service_name, int datadir_set, char *c schSCManager = OpenSCManager(NULL,NULL,SC_MANAGER_ALL_ACCESS); if (schSCManager == NULL) { - logerror("install_service failed to open Service Control Manager"); + fprintf(stderr, "install_service failed to open Service Control Manager\n"); return EXIT_FAILURE; } @@ -91,7 +91,7 @@ install_service(char *program_name, char *service_name, int datadir_set, char *c NULL); /* no password */ if (schService == NULL) { - logerror("install_service failed to create service %s", service_name); + fprintf(stderr, "install_service failed to create service %s\n", service_name); return EXIT_FAILURE; } sdBuf.lpDescription = "Server for Empire game"; @@ -100,7 +100,7 @@ install_service(char *program_name, char *service_name, int datadir_set, char *c schService, /* handle to service */ SERVICE_CONFIG_DESCRIPTION, /* change: description */ &sdBuf)) { /* value: new description */ - logerror("install_service failed to set the description"); + fprintf(stderr, "install_service failed to set the description\n"); } printf("Service %s installed.\n", service_name); @@ -122,24 +122,24 @@ remove_service(char *service_name) schSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (schSCManager == NULL) { - logerror("remove_service failed to open Service Control Manager"); + fprintf(stderr, "remove_service failed to open Service Control Manager\n"); return EXIT_FAILURE; } hService = OpenService(schSCManager, service_name, SERVICE_ALL_ACCESS); if (hService == NULL) { - logerror("remove_service failed to open service %s", service_name); + fprintf(stderr, "remove_service failed to open service %s\n", service_name); return EXIT_FAILURE; } if (DeleteService(hService) == 0) { - logerror("remove_service failed to remove service %s", service_name); + fprintf(stderr, "remove_service failed to remove service %s\n", service_name); return EXIT_FAILURE; } if (CloseServiceHandle(hService) == 0) { - logerror("remove_service failed to close service %s", service_name); + fprintf(stderr, "remove_service failed to close service %s\n", service_name); return EXIT_FAILURE; } else { printf("Service %s removed.\n", service_name); diff --git a/src/server/main.c b/src/server/main.c index 3c6836095..632437af1 100644 --- a/src/server/main.c +++ b/src/server/main.c @@ -169,18 +169,18 @@ main(int argc, char **argv) #if defined(_WIN32) if ((debug || datadir_set || config_file != NULL) && remove_service_set) { - logerror("Can't use -d, -D or -e with either " - "-r or -R options when starting the server"); + fprintf(stderr, "Can't use -d, -D or -e with either " + "-r or -R options when starting the server\n"); exit(EXIT_FAILURE); } if (debug && install_service_set) { - logerror("Can't use -d with either " - "-i or -I options when starting the server"); + fprintf(stderr, "Can't use -d with either " + "-i or -I options when starting the server\n"); exit(EXIT_FAILURE); } if (install_service_set && remove_service_set) { - logerror("Can't use both -r or -R and -i or -I options when starting " - "the server"); + fprintf(stderr, "Can't use both -r or -R and -i or -I options when starting " + "the server\n"); exit(EXIT_FAILURE); } #endif /* _WIN32 */ -- 2.43.0