[asterisk-commits] jpeeler: branch jpeeler/feature14882 r284480 - /team/jpeeler/feature14882/main/

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Sep  1 13:52:37 2010
New Revision: 284480

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=284480
Log:
minor fixes, time for reviewboard

Modified:
    team/jpeeler/feature14882/main/features.c

Modified: team/jpeeler/feature14882/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/jpeeler/feature14882/main/features.c?view=diff&rev=284480&r1=284479&r2=284480
==============================================================================
--- team/jpeeler/feature14882/main/features.c (original)
+++ team/jpeeler/feature14882/main/features.c Wed Sep  1 13:52:37 2010
@@ -748,8 +748,7 @@
 		if (parkinglotname) {
 			parkinglot = find_parkinglot(parkinglotname);
 		} else {
-			/* JPEELER change to ast_debug */
-			ast_log(LOG_WARNING, "This could be an indication channel driver needs updating, using default lot.\n");
+			ast_debug(4, "This could be an indication channel driver needs updating, using default lot.\n");
 			parkinglot = parkinglot_addref(default_parkinglot);
 		}
 		ast_debug(1, "Found chanvar Parkinglot: %s\n", parkinglot->name);
@@ -1071,7 +1070,7 @@
 	}
 
 	if ((args->pu = park_space_reserve(rchan, peer, args)) == NULL) {
-		if (peer) { /* if error */
+		if (peer) {
 			ast_stream_and_wait(peer, "pbx-parkingfailed", "");
 		}
 		return AST_FEATURE_RETURN_PARKFAILED;
@@ -4025,7 +4024,7 @@
 	struct ast_parkinglot *parkinglot;
 
 	if (data) {
-		park = atoi((char *) data);	/* char to int */
+		park = atoi((char *) data);
 	}
 
 	parkinglot = ao2_callback(parkinglots, 0, find_parkinglot_by_position_cb, (void *) &park);
@@ -4730,11 +4729,11 @@
 		ast_log(LOG_ERROR, "Parking context '%s' does not exist and unable to create\n", default_parkinglot->parking_con);
 		return -1;
 	}
-	res = ast_add_extension2(con, 1, DEFAULT_PARK_EXTENSION, 1, NULL, NULL, parkcall, NULL, NULL, registrar);
+	res = ast_add_extension2(con, 1, default_parkinglot->parkext, 1, NULL, NULL, parkcall, NULL, NULL, registrar);
 	if (default_parkinglot->parkaddhints)
 		park_add_hints(default_parkinglot->parking_con, default_parkinglot->parking_start, default_parkinglot->parking_stop);
 	if (!res)
-		notify_metermaids(DEFAULT_PARK_EXTENSION, default_parkinglot->parking_con, AST_DEVICE_INUSE); 
+		notify_metermaids(default_parkinglot->parkext, default_parkinglot->parking_con, AST_DEVICE_INUSE); 
 	return res;
 
 }