automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43321 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 69aad49c1c45c94736453ad5062e4ef230fac179..d94b33690edbe1592f3cc8865509ede13d32d774 100644 (file)
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -210,7 +210,7 @@ static struct robin_list *robin = NULL;
 
 
 
-struct ast_frame *process_ast_dsp(struct chan_list *tmp, struct ast_frame *frame);
+static struct ast_frame *process_ast_dsp(struct chan_list *tmp, struct ast_frame *frame);
 
 
 
@@ -695,7 +695,7 @@ static char *misdn_get_ch_state(struct chan_list *p)
 
 
 
-void reload_config(void)
+static void reload_config(void)
 {
        int i, cfg_debug;
        
@@ -2739,7 +2739,7 @@ static struct ast_channel *misdn_new(struct chan_list *chlist, int state,  char
 }
 
 
-struct ast_frame *process_ast_dsp(struct chan_list *tmp, struct ast_frame *frame)
+static struct ast_frame *process_ast_dsp(struct chan_list *tmp, struct ast_frame *frame)
 {
        struct ast_frame *f,*f2;
        if (tmp->trans)
@@ -2878,7 +2878,7 @@ static void cl_dequeue_chan(struct chan_list **list, struct chan_list *chan)
 /** Channel Queue End **/
 
 
-int pbx_start_chan(struct chan_list *ch)
+static int pbx_start_chan(struct chan_list *ch)
 {
        int ret=ast_pbx_start(ch->ast); 
 

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index c50a32c24a31e5c08149f83f5d8174fcdb32b670..917123e1e29ba90a86d3fc6fc61c8588c0267c98 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1010,7 +1010,7 @@ static force_inline int thread_safe_rand(void)
 /*! \brief  find_sip_method: Find SIP method from header
  * Strictly speaking, SIP methods are case SENSITIVE, but we don't check 
  * following Jon Postel's rule: Be gentle in what you accept, strict with what you send */
-int find_sip_method(char *msg)
+static int find_sip_method(char *msg)
 {
        int i, res = 0;
        
@@ -1025,7 +1025,7 @@ int find_sip_method(char *msg)
 }
 
 /*! \brief  parse_sip_options: Parse supported header in incoming packet */
-unsigned int parse_sip_options(struct sip_pvt *pvt, char *supported)
+static unsigned int parse_sip_options(struct sip_pvt *pvt, char *supported)
 {
        char *next = NULL;
        char *sep = NULL;

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 1dc6c8c2afa7cd11953b7cb714eb2a292eaa86e6..54524ce4eaba9196b2cf4c74e02869a32b96345b 100644 (file)
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -3215,7 +3215,7 @@ static int reload_config(void)
        return 0;
 }
 
-void delete_devices(void)
+static void delete_devices(void)
 {
        struct skinny_device *d, *dlast;
        struct skinny_line *l, *llast;