From 6d7c337c3821784700133e58f5c5e8093e779b68 Mon Sep 17 00:00:00 2001 From: Slavchu Date: Sun, 22 Mar 2026 01:52:25 +0200 Subject: [PATCH] config: remove unnecessary malloc from default config Removed unnecessary malloc + made a global config path a constant value --- doomgeneric/m_config.c | 12 ++++-------- doomgeneric/m_config.h | 4 ++-- doomgeneric/m_misc.c | 2 +- doomgeneric/m_misc.h | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/doomgeneric/m_config.c b/doomgeneric/m_config.c index 865e16842..8c52d3a27 100644 --- a/doomgeneric/m_config.c +++ b/doomgeneric/m_config.c @@ -42,7 +42,7 @@ // Location where all configuration data is stored - // default.cfg, savegames, etc. -char *configdir; +const char *configdir; // Default filenames for configuration files. @@ -2040,13 +2040,9 @@ float M_GetFloatVariable(char *name) // Get the path to the default configuration dir to use, if NULL // is passed to M_SetConfigDir. -static char *GetDefaultConfigDir(void) +static const char *GetDefaultConfigDir(void) { - char *result = (char *)malloc(2); - result[0] = '.'; - result[1] = '\0'; - - return result; + return "./"; } // @@ -2056,7 +2052,7 @@ static char *GetDefaultConfigDir(void) // files are stored - default.cfg, chocolate-doom.cfg, savegames, etc. // -void M_SetConfigDir(char *dir) +void M_SetConfigDir(const char *dir) { // Use the directory that was passed, or find the default. diff --git a/doomgeneric/m_config.h b/doomgeneric/m_config.h index a17de2b45..8e352f08c 100644 --- a/doomgeneric/m_config.h +++ b/doomgeneric/m_config.h @@ -25,7 +25,7 @@ void M_LoadDefaults(void); void M_SaveDefaults(void); void M_SaveDefaultsAlternate(char *main, char *extra); -void M_SetConfigDir(char *dir); +void M_SetConfigDir(const char *dir); void M_BindVariable(char *name, void *variable); boolean M_SetVariable(char *name, char *value); int M_GetIntVariable(char *name); @@ -34,6 +34,6 @@ float M_GetFloatVariable(char *name); void M_SetConfigFilenames(char *main_config, char *extra_config); char *M_GetSaveGameDir(char *iwadname); -extern char *configdir; +extern const char *configdir; #endif diff --git a/doomgeneric/m_misc.c b/doomgeneric/m_misc.c index 54b261344..d5314bf42 100644 --- a/doomgeneric/m_misc.c +++ b/doomgeneric/m_misc.c @@ -52,7 +52,7 @@ // Create a directory // -void M_MakeDirectory(char *path) +void M_MakeDirectory(const char *path) { #ifdef _WIN32 mkdir(path); diff --git a/doomgeneric/m_misc.h b/doomgeneric/m_misc.h index 844b48595..1b0f407f0 100644 --- a/doomgeneric/m_misc.h +++ b/doomgeneric/m_misc.h @@ -27,7 +27,7 @@ boolean M_WriteFile(char *name, void *source, int length); int M_ReadFile(char *name, byte **buffer); -void M_MakeDirectory(char *dir); +void M_MakeDirectory(const char *dir); char *M_TempFile(char *s); boolean M_FileExists(char *file); long M_FileLength(FILE *handle);