[Freeswitch-svn] [commit] r10814 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su libsofia-sip-ua/su/sofia-sip
FreeSWITCH SVN
mikej at freeswitch.org
Tue Dec 16 11:53:46 PST 2008
Author: mikej
Date: Tue Dec 16 14:53:46 2008
New Revision: 10814
Log:
Mon Dec 8 08:59:04 CST 2008 Pekka Pessi <first.last at nokia.com>
* su: removed private functions accidentally declared as globals
su_t64_to_time(), mutex_trylocker(), su_port_set_system_preferences()
Modified:
freeswitch/trunk/libs/sofia-sip/.update
freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c
freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h
freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c
freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c
freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h
freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c
freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c
Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update (original)
+++ freeswitch/trunk/libs/sofia-sip/.update Tue Dec 16 14:53:46 2008
@@ -1 +1 @@
-Tue Dec 16 13:51:53 CST 2008
+Tue Dec 16 13:52:51 CST 2008
Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c (original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c Tue Dec 16 14:53:46 2008
@@ -37,6 +37,8 @@
#include "config.h"
+#include <sofia-sip/heap.h>
+
#include <assert.h>
#include <stdio.h>
#include <sys/types.h>
Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h (original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h Tue Dec 16 14:53:46 2008
@@ -111,6 +111,19 @@
SOFIAPUBFUN uint32_t su_ntp_fraq(su_time_t t);
SOFIAPUBFUN uint32_t su_time_ms(su_time_t t);
#else
+su_inline uint32_t su_ntp_fraq(su_time_t t);
+su_inline uint32_t su_time_ms(su_time_t t);
+#endif
+
+SOFIAPUBFUN su_ntp_t su_ntp_hilo(uint32_t hi, uint32_t lo);
+
+SOFIAPUBFUN uint64_t su_counter(void);
+
+SOFIAPUBFUN uint64_t su_nanocounter(void);
+
+SOFIAPUBFUN uint32_t su_random(void);
+
+#if SU_HAVE_INLINE
/** Middle 32 bit of NTP timestamp. */
su_inline uint32_t su_ntp_fraq(su_time_t t)
{
@@ -129,14 +142,6 @@
}
#endif
-SOFIAPUBFUN su_ntp_t su_ntp_hilo(uint32_t hi, uint32_t lo);
-
-SOFIAPUBFUN uint64_t su_counter(void);
-
-SOFIAPUBFUN uint64_t su_nanocounter(void);
-
-SOFIAPUBFUN uint32_t su_random();
-
SOFIA_END_DECLS
#endif /* !defined(SU_TIME_H) */
Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c (original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c Tue Dec 16 14:53:46 2008
@@ -57,7 +57,7 @@
return pthread_mutex_lock(mutex + 1);
}
-int mutex_trylocker(void *_mutex)
+static int mutex_trylocker(void *_mutex)
{
pthread_mutex_t *mutex = _mutex;
return pthread_mutex_trylock(mutex + 1);
Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c (original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.c Tue Dec 16 14:53:46 2008
@@ -106,6 +106,7 @@
if (start) preferred_su_clone_start = start;
}
+static
void su_port_set_system_preferences(char const *name)
{
su_port_create_f *create = preferred_su_port_create;
Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h (original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_port.h Tue Dec 16 14:53:46 2008
@@ -168,6 +168,8 @@
SOFIAPUBFUN char const *su_port_name(su_port_t const *port);
+SOFIAPUBFUN int su_timer_reset_all(su_timer_queue_t *, su_task_r );
+
/* ---------------------------------------------------------------------- */
/* React to multiple events per one poll() to make sure
Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c (original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Tue Dec 16 14:53:46 2008
@@ -115,6 +115,14 @@
* Contains hint of number of sockets supported by su_root_t */
int su_root_size_hint = 64;
+/* ====================================================================== */
+
+_su_task_r su_task_new(su_task_r task, su_root_t *root, su_port_t *port);
+int su_task_attach(su_task_r self, su_root_t *root);
+int su_task_detach(su_task_r self);
+
+int su_timer_reset_all(su_timer_t **t0, su_task_r);
+
/* =========================================================================
* Tasks
*/
@@ -348,12 +356,6 @@
}
}
-_su_task_r su_task_new(su_task_r task, su_root_t *root, su_port_t *port);
-int su_task_attach(su_task_r self, su_root_t *root);
-int su_task_detach(su_task_r self);
-
-int su_timer_reset_all(su_timer_t **t0, su_task_r);
-
/* Note that is *not* necessary same as su_root_t,
* as su_root_t can be extended */
Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c (original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_time.c Tue Dec 16 14:53:46 2008
@@ -202,6 +202,8 @@
typedef uint64_t su_t64_t; /* time with 64 bits */
+static su_time_t su_t64_to_time(su_t64_t const us);
+
const uint32_t su_res32 = 1000000UL;
const su_t64_t su_res64 = (su_t64_t)1000000UL;
@@ -307,6 +309,7 @@
return (uint32_t) (ntp >> 16) & 0xffffffffLU;
}
+static
su_time_t su_t64_to_time(su_t64_t const us)
{
su_time_t tv;
More information about the Freeswitch-svn
mailing list