X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconfig.c;h=8c4f1b5a8602e10069126e582d721b170f419b8a;hp=eafadddcf3ad71d0ea0a7ccf6263e010818e6ce1;hb=f37c86753d5005bf7ae341d0cbcc15ef75393567;hpb=3e10387c490e2db8997d6e909d7d13d71fe876e3 diff --git a/src/config.c b/src/config.c index eafadddc..8c4f1b5a 100644 --- a/src/config.c +++ b/src/config.c @@ -15,17 +15,17 @@ #include "conftime.h" -char *getSourceDateString() +char *getSourceDateString(void) { return SOURCE_DATE_STRING; } -char *getProgramTitleString() +char *getProgramTitleString(void) { return program.program_title; } -char *getProgramRealVersionString() +char *getProgramRealVersionString(void) { static char program_version_string[32]; @@ -36,12 +36,12 @@ char *getProgramRealVersionString() return program_version_string; } -char *getProgramVersionString() +char *getProgramVersionString(void) { return program.version_string; } -char *getProgramInitString() +char *getProgramInitString(void) { static char *program_init_string = NULL; @@ -57,7 +57,7 @@ char *getProgramInitString() return program_init_string; } -char *getConfigProgramTitleString() +char *getConfigProgramTitleString(void) { TreeInfo *graphics_current = getArtworkTreeInfoForUserLevelSet(ARTWORK_TYPE_GRAPHICS); @@ -69,7 +69,7 @@ char *getConfigProgramTitleString() setup.internal.program_title); } -char *getConfigProgramCopyrightString() +char *getConfigProgramCopyrightString(void) { TreeInfo *graphics_current = getArtworkTreeInfoForUserLevelSet(ARTWORK_TYPE_GRAPHICS); @@ -81,7 +81,7 @@ char *getConfigProgramCopyrightString() setup.internal.program_copyright); } -char *getConfigProgramCompanyString() +char *getConfigProgramCompanyString(void) { TreeInfo *graphics_current = getArtworkTreeInfoForUserLevelSet(ARTWORK_TYPE_GRAPHICS); @@ -93,14 +93,12 @@ char *getConfigProgramCompanyString() setup.internal.program_company); } -char *getWindowTitleString() +char *getWindowTitleString(void) { static char *window_title_string = NULL; checked_free(window_title_string); -#if defined(TARGET_SDL2) - #ifdef DEBUG window_title_string = checked_malloc(strlen(getProgramInitString()) + 20 + strlen(getSourceDateString()) + 2 + 1); @@ -122,23 +120,6 @@ char *getWindowTitleString() else sprintf(window_title_string, "%s", getProgramInitString()); -#endif - -#else - -#ifdef DEBUG - window_title_string = checked_malloc(strlen(getProgramInitString()) + 1 + - strlen(getSourceDateString()) + 2 + 1); - - sprintf(window_title_string, "%s [%s]", - getProgramInitString(), getSourceDateString()); -#else - window_title_string = checked_malloc(strlen(getProgramInitString()) + 1); - - sprintf(window_title_string, "%s", - getProgramInitString()); -#endif - #endif return window_title_string;