diff options
author | Simon Howard | 2014-03-29 20:08:31 -0400 |
---|---|---|
committer | Simon Howard | 2014-03-29 20:08:31 -0400 |
commit | 62b5c602821cee8ac703ebe6362f3e1fc6d9ad3c (patch) | |
tree | 3703b069d3d200e8c6edac3c99de00da34cbc7f3 /src/i_pcsound.c | |
parent | e85edb9e6fcdc77d69d1b4d9f14f705a03e753e1 (diff) | |
download | chocolate-doom-62b5c602821cee8ac703ebe6362f3e1fc6d9ad3c.tar.gz chocolate-doom-62b5c602821cee8ac703ebe6362f3e1fc6d9ad3c.tar.bz2 chocolate-doom-62b5c602821cee8ac703ebe6362f3e1fc6d9ad3c.zip |
misc: Add string utility functions.
It's more readable to write "M_StringEndsWith(..." than doing a bunch of
pointer arithmetic, and this is a common pattern. Also add
M_StringStartsWith, M_StringJoin and M_StringCopy. The latter is a
safe alternative for strcpy() that works the same as OpenBSD's
strlcpy(). Use these functions in a few places where it makes sense.
Diffstat (limited to 'src/i_pcsound.c')
-rw-r--r-- | src/i_pcsound.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/i_pcsound.c b/src/i_pcsound.c index 655f5a8b..0303d2e4 100644 --- a/src/i_pcsound.c +++ b/src/i_pcsound.c @@ -30,7 +30,7 @@ #include "deh_str.h" #include "i_sound.h" - +#include "m_misc.h" #include "w_wad.h" #include "z_zone.h" @@ -253,11 +253,11 @@ static int I_PCS_GetSfxLumpNum(sfxinfo_t* sfx) if (use_sfx_prefix) { - sprintf(namebuf, "dp%s", DEH_String(sfx->name)); + snprintf(namebuf, sizeof(namebuf), "dp%s", DEH_String(sfx->name)); } else { - strcpy(namebuf, DEH_String(sfx->name)); + M_StringCopy(namebuf, DEH_String(sfx->name), sizeof(namebuf)); } return W_GetNumForName(namebuf); |