Minor parking cleanup.

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

main/features.c

@@ -232,8 +232,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 	</manager>
  ***/
 
-/* TODO Scrape all of the parking stuff out of features.c */
-
 typedef enum {
 	FEATURE_INTERPRET_DETECT, /* Used by ast_feature_detect */
 	FEATURE_INTERPRET_DO,     /* Used by feature_interpret */

res/parking/parking_tests.c

@@ -804,42 +804,32 @@ cleanup:
 #endif /* TEST_FRAMEWORK */
 
 
-int unload_parking_tests(void)
+void unload_parking_tests(void)
 {
 /* NOOP without test framework */
 #if defined(TEST_FRAMEWORK)
-
+	AST_TEST_UNREGISTER(create_lot);
-	int res = 0;
+	AST_TEST_UNREGISTER(park_call);
-
+	AST_TEST_UNREGISTER(retrieve_call);
-	res |= AST_TEST_UNREGISTER(create_lot);
+	AST_TEST_UNREGISTER(park_extensions);
-	res |= AST_TEST_UNREGISTER(park_call);
+	AST_TEST_UNREGISTER(extension_conflicts);
-	res |= AST_TEST_UNREGISTER(retrieve_call);
+	AST_TEST_UNREGISTER(dynamic_parking_variables);
-	res |= AST_TEST_UNREGISTER(park_extensions);
-	res |= AST_TEST_UNREGISTER(extension_conflicts);
-	res |= AST_TEST_UNREGISTER(dynamic_parking_variables);
-
-	return res;
 #endif
-
-	return 0;
 }
 
 int load_parking_tests(void)
 {
-/* NOOP without test framework */
-#if defined(TEST_FRAMEWORK)
-
 	int res = 0;
 
+/* NOOP without test framework */
+#if defined(TEST_FRAMEWORK)
 	res |= AST_TEST_REGISTER(create_lot);
 	res |= AST_TEST_REGISTER(park_call);
 	res |= AST_TEST_REGISTER(retrieve_call);
 	res |= AST_TEST_REGISTER(park_extensions);
 	res |= AST_TEST_REGISTER(extension_conflicts);
 	res |= AST_TEST_REGISTER(dynamic_parking_variables);
-
-	return res;
 #endif
 
-	return 0;
+	return res;
 }

res/parking/res_parking.h

@@ -568,7 +568,6 @@ int load_parking_tests(void);
  * \since 12.0.0
  * \brief Unregister parking unit tests
  *
- * \retval 0 on success
+ * \return Nothing
- * \retval nonzero on failure
  */
-int unload_parking_tests(void);
+void unload_parking_tests(void);

res/res_parking.c

@@ -196,8 +196,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #define PARKED_CALL_APPLICATION "ParkedCall"
 #define PARK_AND_ANNOUNCE_APPLICATION "ParkAndAnnounce"
 
-/* TODO Add unit tests for parking */
-
 static int parking_lot_sort_fn(const void *obj_left, const void *obj_right, int flags)
 {
 	const struct parking_lot *left = obj_left;