# HG changeset patch
# User [EMAIL PROTECTED]
# Date 1206754011 -3600
# Branch noext
# Node ID 5f57d76fe0baae472037101d0d9f7b841348a8a2
# Parent 85eb91a757ae2ec9d7866e96b23740277986eb78
fix prototypes, includes and compiler warnings
diff -r 85eb91a757ae -r 5f57d76fe0ba wifo/libosip2/src/osip2/osip.c
--- a/wifo/libosip2/src/osip2/osip.c Sat Mar 29 00:42:07 2008 +0100
+++ b/wifo/libosip2/src/osip2/osip.c Sat Mar 29 02:26:51 2008 +0100
@@ -133,7 +133,7 @@ osip_response_get_destination (osip_mess
}
-int
+static int
osip_ixt_lock (osip_t * osip)
{
#ifdef OSIP_MT
@@ -143,7 +143,7 @@ osip_ixt_lock (osip_t * osip)
#endif
}
-int
+static int
osip_ixt_unlock (osip_t * osip)
{
#ifdef OSIP_MT
@@ -154,7 +154,7 @@ osip_ixt_unlock (osip_t * osip)
}
/* these are for transactions that would need retransmission not handled by
state machines */
-void
+static void
osip_add_ixt (osip_t * osip, ixt_t * ixt)
{
/* add in list osip_t->ixt */
@@ -163,7 +163,7 @@ osip_add_ixt (osip_t * osip, ixt_t * ixt
osip_ixt_unlock (osip);
}
-void
+static void
osip_remove_ixt (osip_t * osip, ixt_t * ixt)
{
int i;
@@ -185,7 +185,7 @@ osip_remove_ixt (osip_t * osip, ixt_t *
osip_ixt_unlock (osip);
}
-int
+static int
ixt_init (ixt_t ** ixt)
{
ixt_t *pixt;
@@ -206,7 +206,7 @@ ixt_init (ixt_t ** ixt)
return 0;
}
-void
+static void
ixt_free (ixt_t * ixt)
{
osip_message_free (ixt->ack);
@@ -295,7 +295,7 @@ osip_stop_retransmissions_from_dialog (o
osip_ixt_unlock (osip);
}
-void
+static void
ixt_retransmit (osip_t * osip, ixt_t * ixt, struct timeval *current)
{
if (osip_timercmp(current, &ixt->start, >))
diff -r 85eb91a757ae -r 5f57d76fe0ba
wifo/libosip2/src/osipparser2/osip_message_parse.c
--- a/wifo/libosip2/src/osipparser2/osip_message_parse.c Sat Mar 29
00:42:07 2008 +0100
+++ b/wifo/libosip2/src/osipparser2/osip_message_parse.c Sat Mar 29
02:26:51 2008 +0100
@@ -761,7 +761,7 @@ msg_osip_body_parse (osip_message_t * si
&& 0 == osip_strcasecmp (sip->content_type->subtype, "sdp"))
{
osip_body_len = strlen (start_of_body);
- sprintf (tmp, "%i", osip_body_len);
+ sprintf (tmp, "%lu", osip_body_len);
i = osip_message_set_content_length (sip, tmp);
if (i != 0)
return -1;
diff -r 85eb91a757ae -r 5f57d76fe0ba
wifo/libosip2/src/osipparser2/osip_message_to_str.c
--- a/wifo/libosip2/src/osipparser2/osip_message_to_str.c Sat Mar 29
00:42:07 2008 +0100
+++ b/wifo/libosip2/src/osipparser2/osip_message_to_str.c Sat Mar 29
02:26:51 2008 +0100
@@ -1028,7 +1028,7 @@ _osip_message_to_str (osip_message_t * s
char tmp2[15];
total_length += size;
- sprintf (tmp2, "%i", size);
+ sprintf (tmp2, "%lu", size);
/* do not use osip_strncpy here! */
strncpy (content_length_to_modify + 5 - strlen (tmp2), tmp2, strlen
(tmp2));
}
diff -r 85eb91a757ae -r 5f57d76fe0ba wifo/libosip2/src/osipparser2/osip_port.c
--- a/wifo/libosip2/src/osipparser2/osip_port.c Sat Mar 29 00:42:07 2008 +0100
+++ b/wifo/libosip2/src/osipparser2/osip_port.c Sat Mar 29 02:26:51 2008 +0100
@@ -210,7 +210,7 @@ osip_atoi (const char *number)
osip_atoi (const char *number)
{
#if defined(__linux) || defined(HAVE_STRTOL)
- int i;
+ long i;
if (number == NULL)
return -1;
@@ -696,7 +696,7 @@ void
void
osip_trace_enable_until_level (osip_trace_level_t level)
{
- int i = 0;
+ osip_trace_level_t i = 0;
while (i < END_TRACE_LEVEL)
{
@@ -711,7 +711,7 @@ void
void
osip_trace_initialize_func (osip_trace_level_t level, osip_trace_func_t * func)
{
- int i = 0;
+ osip_trace_level_t i = 0;
trace_func = func;
@@ -1089,7 +1089,7 @@ osip_hash (const char *str)
unsigned int hash = 5381;
int c;
- while (c = *str++)
+ while ((c = *str++))
hash = ((hash << 5) + hash) + c;
return hash;
_______________________________________________
Wengophone-devel mailing list
[email protected]
http://dev.openwengo.com/mailman/listinfo/wengophone-devel
