Use correct variable for atxfercallbackretries config option.

* Misc formatting changes.

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

diff --git a/main/features.c b/main/features.c
index 6ac5147f8fc6c0fa632000e79040a943ab9af5fc..fc9ef5593dd03ec5aeec7dcd7b08d0d0e8dd7c6a 100644 (file)
--- a/main/features.c
+++ b/main/features.c
@@ -160,14 +160,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
        </application>
  ***/
 
-#define DEFAULT_PARK_TIME 45000
-#define DEFAULT_TRANSFER_DIGIT_TIMEOUT 3000
-#define DEFAULT_FEATURE_DIGIT_TIMEOUT 1000
-#define DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER 15000
-#define DEFAULT_PARKINGLOT "default"                   /*!< Default parking lot */
-#define DEFAULT_ATXFER_DROP_CALL 0
-#define DEFAULT_ATXFER_LOOP_DELAY 10000
-#define DEFAULT_ATXFER_CALLBACK_RETRIES 2
+#define DEFAULT_PARK_TIME                                                      45000   /*!< ms */
+#define DEFAULT_TRANSFER_DIGIT_TIMEOUT                         3000    /*!< ms */
+#define DEFAULT_FEATURE_DIGIT_TIMEOUT                          1000    /*!< ms */
+#define DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER     15000   /*!< ms */
+#define DEFAULT_PARKINGLOT                                                     "default"
+#define DEFAULT_ATXFER_DROP_CALL                                       0               /*!< Do not drop call. */
+#define DEFAULT_ATXFER_LOOP_DELAY                                      10000   /*!< ms */
+#define DEFAULT_ATXFER_CALLBACK_RETRIES                                2
 
 #define AST_MAX_WATCHERS 256
 #define MAX_DIAL_FEATURE_OPTIONS 30
@@ -2818,7 +2818,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
                                }
                                config->start_time = ast_tvnow();
                                config->feature_timer = featuredigittimeout;
-                               ast_debug(1, "Set time limit to %ld\n", config->feature_timer);
+                               ast_debug(1, "Set time limit to %ld ms\n", config->feature_timer);
                        }
                }
                if (f)
@@ -3920,7 +3920,7 @@ static int load_config(void)
                } else if (!strcasecmp(var->name, "atxferdropcall")) {
                        atxferdropcall = ast_true(var->value);
                } else if (!strcasecmp(var->name, "atxfercallbackretries")) {
-                       if ((sscanf(var->value, "%30u", &atxferloopdelay) != 1)) {
+                       if ((sscanf(var->value, "%30u", &atxfercallbackretries) != 1)) {
                                ast_log(LOG_WARNING, "%s is not a valid atxfercallbackretries\n", var->value);
                                atxfercallbackretries = DEFAULT_ATXFER_CALLBACK_RETRIES;
                        }