These functions that were moved need to be static.

Also wrap test functions in a #ifdef.

(issue AST-807)
(issue AST-901)
(issue AST-908)

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 901c4b88930b7a4491e73d31cd34533acc16a34b..edb3dc143e373003a250206b892863c28b96fb68 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -979,9 +979,10 @@ static int vm_msg_move(const char *mailbox, const char *context, size_t num_msgs
 static int vm_msg_remove(const char *mailbox, const char *context, size_t num_msgs, const char *folder, int *msgs);
 static int vm_msg_play(struct ast_channel *chan, const char *mailbox, const char *context, const char *folder, const char *msg_num, ast_vm_msg_play_cb cb);
 
-int vm_test_destroy_user(const char *context, const char *mailbox);
-int vm_test_create_user(const char *context, const char *mailbox);
-
+#ifdef TEST_FRAMEWORK
+static int vm_test_destroy_user(const char *context, const char *mailbox);
+static int vm_test_create_user(const char *context, const char *mailbox);
+#endif
 
 struct ao2_container *inprocess_container;
 
@@ -14157,7 +14158,7 @@ static struct ast_vm_msg_snapshot *vm_msg_snapshot_destroy(struct ast_vm_msg_sna
 
 #ifdef TEST_FRAMEWORK
 
-int vm_test_destroy_user(const char *context, const char *mailbox)
+static int vm_test_destroy_user(const char *context, const char *mailbox)
 {
        struct ast_vm_user *vmu;
 
@@ -14175,7 +14176,7 @@ int vm_test_destroy_user(const char *context, const char *mailbox)
        return 0;
 }
 
-int vm_test_create_user(const char *context, const char *mailbox)
+static int vm_test_create_user(const char *context, const char *mailbox)
 {
        struct ast_vm_user *vmu;
 
@@ -14481,7 +14482,7 @@ static void notify_new_state(struct ast_vm_user *vmu)
        queue_mwi_event(ext_context, urgent, new, old);
 }
 
-int vm_msg_forward(const char *from_mailbox,
+static int vm_msg_forward(const char *from_mailbox,
        const char *from_context,
        const char *from_folder,
        const char *to_mailbox,
@@ -14618,7 +14619,7 @@ vm_forward_cleanup:
        return res;
 }
 
-int vm_msg_move(const char *mailbox,
+static int vm_msg_move(const char *mailbox,
        const char *context,
        size_t num_msgs,
        const char *oldfolder,
@@ -14713,7 +14714,7 @@ vm_move_cleanup:
        return res;
 }
 
-int vm_msg_remove(const char *mailbox,
+static int vm_msg_remove(const char *mailbox,
        const char *context,
        size_t num_msgs,
        const char *folder,
@@ -14807,7 +14808,7 @@ vm_remove_cleanup:
        return res;
 }
 
-int vm_msg_play(struct ast_channel *chan,
+static int vm_msg_play(struct ast_channel *chan,
        const char *mailbox,
        const char *context,
        const char *folder,