marcel/gamemode
1
0
Fork 0
mirror of https://github.com/FeralInteractive/gamemode.git synced 2025-06-06 23:57:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix up a few more logs not using our macros

Browse Source
This commit is contained in:
Marc Di Luzio 2019-02-06 19:18:08 +00:00
parent 3ae26596bc
commit 66cc9e10f2
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/cpugovctl.c
View File

@ -79,7 +79,7 @@ int main(int argc, char *argv[])
/* Must be root to set the state */ /* Must be root to set the state */
if (geteuid() != 0) { if (geteuid() != 0) {
fprintf(stderr, "This program must be run as root\n"); LOG_ERROR("This program must be run as root\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }

27
daemon/main.c
View File

@ -113,12 +113,12 @@ int main(int argc, char *argv[])
break; break;
case 's': { case 's': {
if ((status = gamemode_query_status()) < 0) { if ((status = gamemode_query_status()) < 0) {
fprintf(stderr, "gamemode status request failed: %s\n", gamemode_error_string()); LOG_ERROR("gamemode status request failed: %s\n", gamemode_error_string());
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} else if (status > 0) { } else if (status > 0) {
fprintf(stdout, "gamemode is active\n"); LOG_MSG("gamemode is active\n");
} else { } else {
fprintf(stdout, "gamemode is inactive\n"); LOG_MSG("gamemode is inactive\n");
} }
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
@ -126,18 +126,17 @@ int main(int argc, char *argv[])
} }
case 'r': case 'r':
if (gamemode_request_start() < 0) { if (gamemode_request_start() < 0) {
fprintf(stderr, "gamemode request failed: %s\n", gamemode_error_string()); LOG_ERROR("gamemode request failed: %s\n", gamemode_error_string());
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if ((status = gamemode_query_status()) == 2) { if ((status = gamemode_query_status()) == 2) {
fprintf(stdout, "gamemode request succeeded and is active\n"); LOG_MSG("gamemode request succeeded and is active\n");
} else if (status == 1) { } else if (status == 1) {
fprintf(stderr, LOG_ERROR("gamemode request succeeded and is active but registration failed\n");
"gamemode request succeeded and is active but registration failed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} else { } else {
fprintf(stderr, "gamemode request succeeded but is not active\n"); LOG_ERROR("gamemode request succeeded but is not active\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -149,7 +148,7 @@ int main(int argc, char *argv[])
// Explicitly clean up // Explicitly clean up
if (gamemode_request_end() < 0) { if (gamemode_request_end() < 0) {
fprintf(stderr, "gamemode request failed: %s\n", gamemode_error_string()); LOG_ERROR("gamemode request failed: %s\n", gamemode_error_string());
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -157,22 +156,22 @@ int main(int argc, char *argv[])
break; break;
case 't': case 't':
if ((status = game_mode_run_client_tests()) == 0) { if ((status = game_mode_run_client_tests()) == 0) {
fprintf(stdout, "gamemode tests succeeded\n"); LOG_MSG("gamemode tests succeeded\n");
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} else if (status == -1) { } else if (status == -1) {
fprintf(stderr, "gamemode tests failed\n"); LOG_ERROR("gamemode tests failed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} else { } else {
fprintf(stderr, "gamemode test results unknown: %d\n", status); LOG_ERROR("gamemode test results unknown: %d\n", status);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
break; break;
case 'v': case 'v':
fprintf(stdout, VERSION_TEXT); LOG_MSG(VERSION_TEXT);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
break; break;
case 'h': case 'h':
fprintf(stdout, USAGE_TEXT, argv[0]); LOG_MSG(USAGE_TEXT, argv[0]);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
break; break;
default: default: