diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-10 21:40:36 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-10 21:40:36 +0000 |
| commit | d73eb218f9ddb1f68b1244483eb16db3e15427f1 (patch) | |
| tree | 4ff1338edeb4032d96ca860821074ea717d31801 /main/indications.c | |
| parent | 190edd24e377bc80baef2872d604ec76493b4d6b (diff) | |
1.6.1.4 changes
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.1.4@211674 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/indications.c')
| -rw-r--r-- | main/indications.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/main/indications.c b/main/indications.c index 1769dce6d..0dbbe8afe 100644 --- a/main/indications.c +++ b/main/indications.c @@ -239,46 +239,46 @@ int ast_playtones_start(struct ast_channel *chan, int vol, const char *playlst, s++; else if (d.reppos == -1) d.reppos = d.nitems; - if (sscanf(s, "%d+%d/%d", &freq1, &freq2, &duration) == 3) { + if (sscanf(s, "%30d+%30d/%30d", &freq1, &freq2, &duration) == 3) { /* f1+f2/time format */ - } else if (sscanf(s, "%d+%d", &freq1, &freq2) == 2) { + } else if (sscanf(s, "%30d+%30d", &freq1, &freq2) == 2) { /* f1+f2 format */ duration = 0; - } else if (sscanf(s, "%d*%d/%d", &freq1, &freq2, &duration) == 3) { + } else if (sscanf(s, "%30d*%30d/%30d", &freq1, &freq2, &duration) == 3) { /* f1*f2/time format */ modulate = 1; - } else if (sscanf(s, "%d*%d", &freq1, &freq2) == 2) { + } else if (sscanf(s, "%30d*%30d", &freq1, &freq2) == 2) { /* f1*f2 format */ duration = 0; modulate = 1; - } else if (sscanf(s, "%d/%d", &freq1, &duration) == 2) { + } else if (sscanf(s, "%30d/%30d", &freq1, &duration) == 2) { /* f1/time format */ freq2 = 0; - } else if (sscanf(s, "%d", &freq1) == 1) { + } else if (sscanf(s, "%30d", &freq1) == 1) { /* f1 format */ freq2 = 0; duration = 0; - } else if (sscanf(s, "M%d+M%d/%d", &freq1, &freq2, &duration) == 3) { + } else if (sscanf(s, "M%30d+M%30d/%30d", &freq1, &freq2, &duration) == 3) { /* Mf1+Mf2/time format */ midinote = 1; - } else if (sscanf(s, "M%d+M%d", &freq1, &freq2) == 2) { + } else if (sscanf(s, "M%30d+M%30d", &freq1, &freq2) == 2) { /* Mf1+Mf2 format */ duration = 0; midinote = 1; - } else if (sscanf(s, "M%d*M%d/%d", &freq1, &freq2, &duration) == 3) { + } else if (sscanf(s, "M%30d*M%30d/%30d", &freq1, &freq2, &duration) == 3) { /* Mf1*Mf2/time format */ modulate = 1; midinote = 1; - } else if (sscanf(s, "M%d*M%d", &freq1, &freq2) == 2) { + } else if (sscanf(s, "M%30d*M%30d", &freq1, &freq2) == 2) { /* Mf1*Mf2 format */ duration = 0; modulate = 1; midinote = 1; - } else if (sscanf(s, "M%d/%d", &freq1, &duration) == 2) { + } else if (sscanf(s, "M%30d/%30d", &freq1, &duration) == 2) { /* Mf1/time format */ freq2 = -1; midinote = 1; - } else if (sscanf(s, "M%d", &freq1) == 1) { + } else if (sscanf(s, "M%30d", &freq1) == 1) { /* Mf1 format */ freq2 = -1; duration = 0; |