[asterisk-commits] qwell: branch 10-digiumphones r368965 - in /branches/10-digiumphones: ./ apps/

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu Jun 14 14:04:57 2012
New Revision: 368965

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=368965
Log:
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)
........

Merged revisions 368964 from http://svn.asterisk.org/svn/asterisk/certified/branches/1.8.11

Modified:
    branches/10-digiumphones/   (props changed)
    branches/10-digiumphones/apps/app_voicemail.c

Propchange: branches/10-digiumphones/
------------------------------------------------------------------------------
--- certified-branch-1.8.11-merged (original)
+++ certified-branch-1.8.11-merged Thu Jun 14 14:04:57 2012
@@ -1,1 +1,1 @@
-/certified/branches/1.8.11:364761,365395,368790,368962
+/certified/branches/1.8.11:364761,365395,368790,368962,368964

Modified: branches/10-digiumphones/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/10-digiumphones/apps/app_voicemail.c?view=diff&rev=368965&r1=368964&r2=368965
==============================================================================
--- branches/10-digiumphones/apps/app_voicemail.c (original)
+++ branches/10-digiumphones/apps/app_voicemail.c Thu Jun 14 14:04:57 2012
@@ -978,9 +978,10 @@
 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;
 
@@ -14186,7 +14187,7 @@
 
 #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;
 
@@ -14204,7 +14205,7 @@
 	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;
 
@@ -14510,7 +14511,7 @@
 	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,
@@ -14647,7 +14648,7 @@
 	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,
@@ -14742,7 +14743,7 @@
 	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,
@@ -14836,7 +14837,7 @@
 	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,