[asterisk-commits] rizzo: branch rizzo/astobj2 r47887 - /team/rizzo/astobj2/channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Tue Nov 21 08:35:54 2006
New Revision: 47887

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47887
Log:
call the body of __sip_do_register() in line, since it is just one line.


Modified:
    team/rizzo/astobj2/channels/chan_sip.c

Modified: team/rizzo/astobj2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/astobj2/channels/chan_sip.c?view=diff&rev=47887&r1=47886&r2=47887
==============================================================================
--- team/rizzo/astobj2/channels/chan_sip.c (original)
+++ team/rizzo/astobj2/channels/chan_sip.c Tue Nov 21 08:35:54 2006
@@ -1518,7 +1518,6 @@
 static int sip_register(char *value, int lineno);
 static char *regstate2str(enum sipregistrystate regstate) attribute_const;
 static int sip_reregister(void *data);
-static int __sip_do_register(struct sip_registry *r);
 static int sip_reg_timeout(void *data);
 static void sip_send_all_registers(void);
 
@@ -7345,18 +7344,9 @@
 		ast_log(LOG_NOTICE, "   -- Re-registration for  %s@%s\n", r->username, r->hostname);
 
 	r->expire = -1;
-	__sip_do_register(r);
+	transmit_register(r, SIP_REGISTER, NULL, NULL);
 	unref_registry(r);
 	return 0;
-}
-
-/*! \brief Register with SIP proxy */
-static int __sip_do_register(struct sip_registry *r)
-{
-	int res;
-
-	res = transmit_register(r, SIP_REGISTER, NULL, NULL);
-	return res;
 }
 
 /*! \brief Registration timeout, register again */