From 98f0dbb71a9732df94209c6b916d9ab9244c7194 Mon Sep 17 00:00:00 2001 From: murf Date: Thu, 25 Sep 2008 22:23:21 +0000 Subject: Merged revisions 144569 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r144569 | murf | 2008-09-25 16:21:28 -0600 (Thu, 25 Sep 2008) | 14 lines (closes issue #13557) Reported by: nickpeirson The user attached a patch, but the license is not yet recorded. I took the liberty of finding and replacing ALL index() calls with strchr() calls, and that involves more than just main/pbx.c; chan_oss, app_playback, func_cut also had calls to index(), and I changed them out. 1.4 had no references to index() at all. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@144570 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_oss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'channels') diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 12800d975..9cfd6449e 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -1292,7 +1292,7 @@ static void store_mixer(struct chan_oss_pvt *o, const char *s) int i; for (i = 0; i < strlen(s); i++) { - if (!isalnum(s[i]) && index(" \t-/", s[i]) == NULL) { + if (!isalnum(s[i]) && strchr(" \t-/", s[i]) == NULL) { ast_log(LOG_WARNING, "Suspect char %c in mixer cmd, ignoring:\n\t%s\n", s[i], s); return; } -- cgit v1.2.3