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

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Sep 14 14:24:10 2010
New Revision: 286755

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=286755
Log:
a few minor fixes before handling reloads properly

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=286755&r1=286754&r2=286755
==============================================================================
--- team/jpeeler/feature14882/main/features.c (original)
+++ team/jpeeler/feature14882/main/features.c Tue Sep 14 14:24:10 2010
@@ -345,7 +345,7 @@
 /*! \brief Structure for parking lots which are put in a container. */
 struct ast_parkinglot {
 	char name[AST_MAX_CONTEXT];
-	char parkext[AST_MAX_CONTEXT];				/*!< Parkingextension */
+	char parkext[AST_MAX_EXTENSION];				/*!< Parkingextension */
 	char parking_con[AST_MAX_EXTENSION];		/*!< Context for which parking is made accessible */
 	char parking_con_dial[AST_MAX_EXTENSION];	/*!< Context for dialback for parking (KLUDGE) */
 	int parking_start;				/*!< First available extension for parking */
@@ -475,6 +475,10 @@
 	const char *app_at_exten;
 
 	exten = pbx_find_extension(chan, NULL, &q, context, exten_str, 1, NULL, NULL, E_MATCH);
+	if (!exten) {
+		return 0;
+	}
+
 	app_at_exten = ast_get_extension_app(exten);
 	if (!app_at_exten || strcmp(PARK_APP_NAME, app_at_exten)) {
 		return 0;
@@ -1057,8 +1061,8 @@
 }
 
 /*!
- * \param rchan is the transferee 
- * \param peer is the transferer 
+ * \param rchan is the transferee
+ * \param peer is the transferer
  */
 static int masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, int timeout, int *extout, int play_announcement, struct ast_park_call_args *args)
 {
@@ -1871,8 +1875,9 @@
 	 * the different variables for handling this properly with a builtin_atxfer */
 	parkinglot = ao2_callback(parkinglots, 0, find_parkinglot_by_exten_cb, &xferto);
 	if (parkinglot) {
-		struct ast_park_call_args args = {0,};
-		args.parkinglot = parkinglot;
+		struct ast_park_call_args args = {
+			.parkinglot = parkinglot,
+		};
 		finishup(transferee);
 		return parkcall_helper(chan, peer, config, code, sense, &args);
 	}