Minor parking cleanup.

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

diff --git a/main/features.c b/main/features.c
index d4ecf657e7079a0936f7956ac5358f1fc2393bfe..70c5423aebd8a44b326d7058ace23f8fc3306019 100644 (file)
--- a/main/features.c
+++ b/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 */

diff --git a/res/parking/parking_tests.c b/res/parking/parking_tests.c
index 1b1cfc1dd4d8bcff9da46aa047a63796dce59448..57edd37ceaec96c90d43b56d9bd4318ece145715 100644 (file)
--- a/res/parking/parking_tests.c
+++ b/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)
-
-       int res = 0;
-
-       res |= AST_TEST_UNREGISTER(create_lot);
-       res |= AST_TEST_UNREGISTER(park_call);
-       res |= AST_TEST_UNREGISTER(retrieve_call);
-       res |= AST_TEST_UNREGISTER(park_extensions);
-       res |= AST_TEST_UNREGISTER(extension_conflicts);
-       res |= AST_TEST_UNREGISTER(dynamic_parking_variables);
-
-       return res;
+       AST_TEST_UNREGISTER(create_lot);
+       AST_TEST_UNREGISTER(park_call);
+       AST_TEST_UNREGISTER(retrieve_call);
+       AST_TEST_UNREGISTER(park_extensions);
+       AST_TEST_UNREGISTER(extension_conflicts);
+       AST_TEST_UNREGISTER(dynamic_parking_variables);
 #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;
 }

diff --git a/res/parking/res_parking.h b/res/parking/res_parking.h
index b376a99e1cf0f27e5d95dc3381ecde6bb2cb5b09..5dc99b79618b4d4390367d01ccaf5086510c885a 100644 (file)
--- a/res/parking/res_parking.h
+++ b/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
- * \retval nonzero on failure
+ * \return Nothing
  */
-int unload_parking_tests(void);
+void unload_parking_tests(void);

diff --git a/res/res_parking.c b/res/res_parking.c
index 668ed63a4dcf4d3270ca40ff782cad6dd50e7299..c7156fbe05c27a21bc035a086a311a49c8294a8b 100644 (file)
--- a/res/res_parking.c
+++ b/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;