[asterisk-commits] oej: branch oej/codename-pineapple r53130 - /team/oej/codename-pineapple/chan...

[asterisk-commits at lists.digium.com]

Author: oej
Date: Fri Feb  2 22:10:07 2007
New Revision: 53130

URL: http://svn.digium.com/view/asterisk?view=rev&rev=53130
Log:
Rename function that has duplicate in chan_iax2. Doxygen can't handle
duplicates in the same name space properly.

Modified:
    team/oej/codename-pineapple/channels/sip3/sip3_config.c
    team/oej/codename-pineapple/channels/sip3/sip3_objects.c
    team/oej/codename-pineapple/channels/sip3/sip3funcs.h

Modified: team/oej/codename-pineapple/channels/sip3/sip3_config.c
URL: http://svn.digium.com/view/asterisk/team/oej/codename-pineapple/channels/sip3/sip3_config.c?view=diff&rev=53130&r1=53129&r2=53130
==============================================================================
--- team/oej/codename-pineapple/channels/sip3/sip3_config.c (original)
+++ team/oej/codename-pineapple/channels/sip3/sip3_config.c Fri Feb  2 22:10:07 2007
@@ -1106,7 +1106,7 @@
 
 	/* If not realtime and dynamic - check if we have a current registration */
 	if (!found && ast_test_flag(&device->flags[1], SIP_PAGE2_DYNAMIC) && !ast_test_flag(&device->flags[0], SIP_REALTIME))
-		reg_source_db(device);
+		sip_reg_source_db(device);
 	
 
 	/* If dynamic and realtime, check registration expiry - it might have

Modified: team/oej/codename-pineapple/channels/sip3/sip3_objects.c
URL: http://svn.digium.com/view/asterisk/team/oej/codename-pineapple/channels/sip3/sip3_objects.c?view=diff&rev=53130&r1=53129&r2=53130
==============================================================================
--- team/oej/codename-pineapple/channels/sip3/sip3_objects.c (original)
+++ team/oej/codename-pineapple/channels/sip3/sip3_objects.c Fri Feb  2 22:10:07 2007
@@ -272,7 +272,7 @@
 	ast_set_flag(&peer->flags[1], SIP_PAGE2_SELFDESTRUCT);
 	ast_set_flag(&peer->flags[1], SIP_PAGE2_DYNAMIC);
 	peer->prefs = global.default_prefs;
-	reg_source_db(peer);
+	sip_reg_source_db(peer);
 
 	return peer;
 }
@@ -280,7 +280,7 @@
 /*! \brief Get registration details from Asterisk DB 
 	\ref chan_sip3_registrydb
 */
-GNURK void reg_source_db(struct sip_device *peer)
+GNURK void sip_reg_source_db(struct sip_device *peer)
 {
 	/*! \page chan_sip3_registrydb SIP3 :: THe registry database (astdb)
 		The SIP3 registry database contains a string that contains
@@ -301,7 +301,7 @@
 
 		\b Functions:
 	
-		- \ref reg_source_db()
+		- \ref sip_reg_source_db()
 
 		A problem with this is that if Asterisk has not been running for more
 		than 30 secs, we might not be able to keep NAT relations alive and will

Modified: team/oej/codename-pineapple/channels/sip3/sip3funcs.h
URL: http://svn.digium.com/view/asterisk/team/oej/codename-pineapple/channels/sip3/sip3funcs.h?view=diff&rev=53130&r1=53129&r2=53130
==============================================================================
--- team/oej/codename-pineapple/channels/sip3/sip3funcs.h (original)
+++ team/oej/codename-pineapple/channels/sip3/sip3funcs.h Fri Feb  2 22:10:07 2007
@@ -90,7 +90,7 @@
 GNURK void register_peer_exten(struct sip_device *device, int onoff); 
 GNURK void update_peer(struct sip_device *device, int expiry);
 GNURK struct sip_device *temp_device(const char *name);
-GNURK void reg_source_db(struct sip_device *peer);
+GNURK void sip_reg_source_db(struct sip_device *peer);
 GNURK void destroy_association(struct sip_device *peer);
 GNURK int expire_register(void *data);