diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-25 22:25:34 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-25 22:25:34 +0000 |
| commit | 2eab151b2d888ce386e2720e7af9694b201df11c (patch) | |
| tree | a5cfe3c5989bf776d44716f8febbfab67d960d4c /channels | |
| parent | a587ac5c8820034c4410cd0c14ed29470f1071bc (diff) | |
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.1@144578 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_oss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c index b3c29c031..7227c4b61 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -1299,7 +1299,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; } |