From 8869b0542d677bae65ec606d4eb14fa2b043e9b6 Mon Sep 17 00:00:00 2001 From: svdijk Date: Sat, 11 May 2013 12:46:49 +0200 Subject: [PATCH] rename strlwr to Q_strlwr --- src/common/filesystem.c | 2 +- src/common/header/shared.h | 6 +++--- src/common/shared/shared.c | 2 +- src/refresh/header/local.h | 2 -- src/refresh/r_main.c | 4 ++-- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/common/filesystem.c b/src/common/filesystem.c index ecbe884b..e36cf984 100644 --- a/src/common/filesystem.c +++ b/src/common/filesystem.c @@ -485,7 +485,7 @@ FS_FOpenFileRead(fsHandle_t *handle) if (!handle->file) { - strlwr(path); + Q_strlwr(path); handle->file = fopen(path, "rb"); } diff --git a/src/common/header/shared.h b/src/common/header/shared.h index 7f46d87f..f77f2031 100644 --- a/src/common/header/shared.h +++ b/src/common/header/shared.h @@ -213,8 +213,6 @@ void Com_sprintf(char *dest, int size, char *fmt, ...); void Com_PageInMemory(byte *buffer, int size); -char *strlwr(char *s); - /* ============================================= */ /* portable case insensitive compare */ @@ -222,6 +220,9 @@ int Q_stricmp(const char *s1, const char *s2); int Q_strcasecmp(char *s1, char *s2); int Q_strncasecmp(char *s1, char *s2, int n); +/* portable string lowercase */ +char *Q_strlwr(char *s); + /* ============================================= */ short BigShort(short l); @@ -266,7 +267,6 @@ extern int curtime; /* time returned by last Sys_Milliseconds */ int Sys_Milliseconds(void); void Sys_Mkdir(char *path); -char *strlwr(char *s); /* large block stack allocation routines */ void *Hunk_Begin(int maxsize); diff --git a/src/common/shared/shared.c b/src/common/shared/shared.c index d62b7411..edeae7ee 100644 --- a/src/common/shared/shared.c +++ b/src/common/shared/shared.c @@ -1119,7 +1119,7 @@ Com_sprintf(char *dest, int size, char *fmt, ...) } char * -strlwr ( char *s ) +Q_strlwr ( char *s ) { char *p = s; diff --git a/src/refresh/header/local.h b/src/refresh/header/local.h index c3a0c154..982d192a 100644 --- a/src/refresh/header/local.h +++ b/src/refresh/header/local.h @@ -93,8 +93,6 @@ typedef struct #endif -char *strlwr(char *s); - extern viddef_t vid; /* diff --git a/src/refresh/r_main.c b/src/refresh/r_main.c index eb2ae8f2..77635533 100644 --- a/src/refresh/r_main.c +++ b/src/refresh/r_main.c @@ -1186,11 +1186,11 @@ R_Init(void *hinstance, void *hWnd) strncpy(renderer_buffer, gl_config.renderer_string, sizeof(renderer_buffer)); renderer_buffer[sizeof(renderer_buffer) - 1] = 0; - strlwr(renderer_buffer); + Q_strlwr(renderer_buffer); strncpy(vendor_buffer, gl_config.vendor_string, sizeof(vendor_buffer)); vendor_buffer[sizeof(vendor_buffer) - 1] = 0; - strlwr(vendor_buffer); + Q_strlwr(vendor_buffer); ri.Cvar_Set("scr_drawall", "0"); gl_config.allow_cds = true;