From 550be7dcce6696b3d3b7e9f3c049476bbfa3e5bc Mon Sep 17 00:00:00 2001 From: Ensiform Date: Thu, 28 Mar 2013 19:50:58 -0500 Subject: [PATCH] misc: remove Q_strrchr (ioq3), refs #31 --- src/client/snd_main.c | 2 +- src/qcommon/q_shared.c | 24 ------------------------ src/qcommon/q_shared.h | 1 - 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/src/client/snd_main.c b/src/client/snd_main.c index 054847394..7e5c2c6cb 100644 --- a/src/client/snd_main.c +++ b/src/client/snd_main.c @@ -532,7 +532,7 @@ void S_Play_f(void) for (i = 1; i < c; i++) { - if (!Q_strrchr(Cmd_Argv(i), '.')) + if (!strrchr(Cmd_Argv(i), '.')) { //Com_sprintf(name, sizeof(name), "%s.wav", Cmd_Argv(1)); // genuine ET 'forces' wav Com_Printf("Warning: S_Play_f sound name '%s' has no file extension", Cmd_Argv(i)); diff --git a/src/qcommon/q_shared.c b/src/qcommon/q_shared.c index 5d92e25d0..b9c76c834 100644 --- a/src/qcommon/q_shared.c +++ b/src/qcommon/q_shared.c @@ -954,30 +954,6 @@ int Q_isforfilename(int c) return (0); } -char *Q_strrchr(const char *string, int c) -{ - char cc = c; - char *s; - char *sp = (char *)0; - - s = (char *)string; - - while (*s) - { - if (*s == cc) - { - sp = s; - } - s++; - } - if (cc == 0) - { - sp = s; - } - - return sp; -} - #ifdef _MSC_VER /* ============= diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h index 32b2cbfb2..be2780492 100644 --- a/src/qcommon/q_shared.h +++ b/src/qcommon/q_shared.h @@ -998,7 +998,6 @@ int Q_strncmp(const char *s1, const char *s2, int n); int Q_stricmpn(const char *s1, const char *s2, int n); char *Q_strlwr(char *s1); char *Q_strupr(char *s1); -char *Q_strrchr(const char *string, int c); const char *Q_stristr(const char *s, const char *find); #ifdef _WIN32