automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38388 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 1c8851750dcfa77faa22a8fa29ebe09e8b654d64..90a8574dd57d84fd51ddb71d8ecff91d50feeebf 100644 (file)
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -419,19 +419,19 @@ static int chanspy_exec(struct ast_channel *chan, void *data)
                char *opts[OPT_ARG_ARRAY_SIZE];
                ast_app_parse_options(chanspy_opts, &flags, opts, options);
                if (ast_test_flag(&flags, OPTION_GROUP)) {
-                       mygroup = opts[1];
+                       mygroup = opts[OPT_ARG_GROUP];
                }
                if (ast_test_flag(&flags, OPTION_RECORD)) {
-                       if (!(recbase = opts[2])) {
+                       if (!(recbase = opts[OPT_ARG_RECORD])) {
                                recbase = "chanspy";
                        }
                }
                silent = ast_test_flag(&flags, OPTION_QUIET);
                bronly = ast_test_flag(&flags, OPTION_BRIDGED);
-               if (ast_test_flag(&flags, OPTION_VOLUME) && opts[1]) {
+               if (ast_test_flag(&flags, OPTION_VOLUME) && opts[OPT_ARG_VOLUME]) {
                        int vol;
 
-                       if ((sscanf(opts[0], "%d", &vol) != 1) || (vol > 4) || (vol < -4))
+                       if ((sscanf(opts[OPT_ARG_VOLUME], "%d", &vol) != 1) || (vol > 4) || (vol < -4))
                                ast_log(LOG_NOTICE, "Volume factor must be a number between -4 and 4\n");
                        else
                                volfactor = vol;