diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2009-08-10 19:20:57 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2009-08-10 19:20:57 +0000 |
| commit | 642bec4d6fea7afad99b6a4853418081137a48ba (patch) | |
| tree | 2596a6cb913ad8bd78e4670d298dc1d4682b2d23 /main/indications.c | |
| parent | 41894bea92b7d2079fd666a3186b84ff92a5e0e5 (diff) | |
AST-2009-005
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@211539 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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 f0aba5ff3..b658e3f51 100644 --- a/main/indications.c +++ b/main/indications.c @@ -243,50 +243,50 @@ static struct ast_generator playtones = { int ast_tone_zone_part_parse(const char *s, struct ast_tone_zone_part *tone_data) { - if (sscanf(s, "%u+%u/%u", &tone_data->freq1, &tone_data->freq2, + if (sscanf(s, "%30u+%30u/%30u", &tone_data->freq1, &tone_data->freq2, &tone_data->time) == 3) { /* f1+f2/time format */ - } else if (sscanf(s, "%u+%u", &tone_data->freq1, &tone_data->freq2) == 2) { + } else if (sscanf(s, "%30u+%30u", &tone_data->freq1, &tone_data->freq2) == 2) { /* f1+f2 format */ tone_data->time = 0; - } else if (sscanf(s, "%u*%u/%u", &tone_data->freq1, &tone_data->freq2, + } else if (sscanf(s, "%30u*%30u/%30u", &tone_data->freq1, &tone_data->freq2, &tone_data->time) == 3) { /* f1*f2/time format */ tone_data->modulate = 1; - } else if (sscanf(s, "%u*%u", &tone_data->freq1, &tone_data->freq2) == 2) { + } else if (sscanf(s, "%30u*%30u", &tone_data->freq1, &tone_data->freq2) == 2) { /* f1*f2 format */ tone_data->time = 0; tone_data->modulate = 1; - } else if (sscanf(s, "%u/%u", &tone_data->freq1, &tone_data->time) == 2) { + } else if (sscanf(s, "%30u/%30u", &tone_data->freq1, &tone_data->time) == 2) { /* f1/time format */ tone_data->freq2 = 0; - } else if (sscanf(s, "%u", &tone_data->freq1) == 1) { + } else if (sscanf(s, "%30u", &tone_data->freq1) == 1) { /* f1 format */ tone_data->freq2 = 0; tone_data->time = 0; - } else if (sscanf(s, "M%u+M%u/%u", &tone_data->freq1, &tone_data->freq2, + } else if (sscanf(s, "M%30u+M%30u/%30u", &tone_data->freq1, &tone_data->freq2, &tone_data->time) == 3) { /* Mf1+Mf2/time format */ tone_data->midinote = 1; - } else if (sscanf(s, "M%u+M%u", &tone_data->freq1, &tone_data->freq2) == 2) { + } else if (sscanf(s, "M%30u+M%30u", &tone_data->freq1, &tone_data->freq2) == 2) { /* Mf1+Mf2 format */ tone_data->time = 0; tone_data->midinote = 1; - } else if (sscanf(s, "M%u*M%u/%u", &tone_data->freq1, &tone_data->freq2, + } else if (sscanf(s, "M%30u*M%30u/%30u", &tone_data->freq1, &tone_data->freq2, &tone_data->time) == 3) { /* Mf1*Mf2/time format */ tone_data->modulate = 1; tone_data->midinote = 1; - } else if (sscanf(s, "M%u*M%u", &tone_data->freq1, &tone_data->freq2) == 2) { + } else if (sscanf(s, "M%30u*M%30u", &tone_data->freq1, &tone_data->freq2) == 2) { /* Mf1*Mf2 format */ tone_data->time = 0; tone_data->modulate = 1; tone_data->midinote = 1; - } else if (sscanf(s, "M%u/%u", &tone_data->freq1, &tone_data->time) == 2) { + } else if (sscanf(s, "M%30u/%30u", &tone_data->freq1, &tone_data->time) == 2) { /* Mf1/time format */ tone_data->freq2 = -1; tone_data->midinote = 1; - } else if (sscanf(s, "M%u", &tone_data->freq1) == 1) { + } else if (sscanf(s, "M%30u", &tone_data->freq1) == 1) { /* Mf1 format */ tone_data->freq2 = -1; tone_data->time = 0; |