# HG changeset patch
# User [EMAIL PROTECTED]
# Date 1206746767 -3600
# Node ID 7c1d0567f3d9c23c2ed9f8c3f881c8dc010f932f
# Parent b578255283fabf281da11755e8f544f399eb928b
use %zu for printfing size_t
add missing prototype
fix compiler warnings
diff -r b578255283fa -r 7c1d0567f3d9 wifo/eXosip/include/eXosip/eXosip.h
--- a/wifo/eXosip/include/eXosip/eXosip.h Sat Mar 29 00:23:18 2008 +0100
+++ b/wifo/eXosip/include/eXosip/eXosip.h Sat Mar 29 00:26:07 2008 +0100
@@ -963,6 +963,9 @@ eXosip_event_t *eXosip_event_wait(int tv
*/
eXosip_event_t *eXosip_event_get(void);
+void eXosip_update(void);
+int eXosip_get_subscribe_id(const char * remote_uri, int * sid);
+
#ifdef __cplusplus
}
#endif
diff -r b578255283fa -r 7c1d0567f3d9 wifo/eXosip/src/eXosip.c
--- a/wifo/eXosip/src/eXosip.c Sat Mar 29 00:23:18 2008 +0100
+++ b/wifo/eXosip/src/eXosip.c Sat Mar 29 00:26:07 2008 +0100
@@ -917,7 +917,7 @@ int eXosip_initiate_call_with_body(OWSIP
if (body!=NULL){
size= (char *)osip_malloc(7*sizeof(char));
- sprintf(size,"%i",strlen(body));
+ sprintf(size,"%lu",strlen(body));
osip_message_set_content_length(invite, size);
osip_free(size);
osip_message_set_body(invite, body, strlen(body));
@@ -1204,7 +1204,7 @@ int eXosip_initiate_call
#ifdef __APPLE_CC__
sprintf(size,"%li",strlen(body));
#else
- sprintf(size,"%i",strlen(body));
+ sprintf(size,"%lu",strlen(body));
#endif
osip_message_set_content_length(invite, size);
osip_free(size);
@@ -1926,7 +1926,7 @@ int eXosip_on_hold_call (int jid)
#ifdef __APPLE_CC__
sprintf(size,"%li",strlen(body));
#else
- sprintf(size,"%i",strlen(body));
+ sprintf(size,"%lu",strlen(body));
#endif
osip_message_set_content_length(invite, size);
osip_free(size);
@@ -2020,7 +2020,7 @@ int eXosip_on_hold_call_with_body(int ji
#ifdef __APPLE_CC__
sprintf(size,"%li",strlen(body));
#else
- sprintf(size,"%i",strlen(body));
+ sprintf(size,"%lu",strlen(body));
#endif
osip_message_set_content_length(invite, size);
osip_free(size);
@@ -2159,7 +2159,7 @@ int eXosip_off_hold_call (int jid, char
#ifdef __APPLE_CC__
sprintf(size,"%li",strlen(body));
#else
- sprintf(size,"%i",strlen(body));
+ sprintf(size,"%lu",strlen(body));
#endif
osip_message_set_content_length(invite, size);
osip_free(size);
@@ -2250,7 +2250,7 @@ int eXosip_off_hold_call_with_body(int j
#ifdef __APPLE_CC__
sprintf(size,"%li",strlen(body));
#else
- sprintf(size,"%i",strlen(body));
+ sprintf(size,"%lu",strlen(body));
#endif
osip_message_set_content_length(invite, size);
osip_free(size);
@@ -3631,7 +3631,7 @@ int _eXosip_transfer_send_notify(eXosip_
osip_message_t *notify;
osip_event_t *sipevent;
int i;
- char subscription_state[50];
+ char subscription_state[50] = "";
char *tmp;
transaction = eXosip_find_last_inc_refer(jc, jd);
@@ -3679,8 +3679,8 @@ int _eXosip_transfer_send_notify(eXosip_
osip_strncpy(subscription_state, "terminated;reason=noresource", 29);
}
- if ( ! subscription_state ) {
- fprintf(stderr, "%s,%d: subscription_state is NULL", __FILE__, __LINE__);
+ if ( ! subscription_state[0] ) {
+ fprintf(stderr, "%s,%d: subscription_state is empty", __FILE__, __LINE__);
return -1;
}
@@ -3743,7 +3743,7 @@ int eXosip_notify_send_notify2(eXosip_no
osip_message_t *notify;
osip_event_t *sipevent;
int i;
- char subscription_state[50];
+ char subscription_state[50] = "";
char *tmp;
int now = time(NULL);
transaction = eXosip_find_last_out_notify(jn, jd);
@@ -3785,7 +3785,7 @@ int eXosip_notify_send_notify2(eXosip_no
osip_strncpy(subscription_state, "terminated;reason=noresource", 29);
}
- if ( ! subscription_state ) {
+ if ( ! subscription_state[0] ) {
fprintf(stderr, "%s,%d: subscription_state is NULL", __FILE__, __LINE__);
return -1;
}
diff -r b578255283fa -r 7c1d0567f3d9 wifo/eXosip/src/jcallback.c
--- a/wifo/eXosip/src/jcallback.c Sat Mar 29 00:23:18 2008 +0100
+++ b/wifo/eXosip/src/jcallback.c Sat Mar 29 00:26:07 2008 +0100
@@ -1434,7 +1434,7 @@ static void cb_rcv2xx_4invite(osip_trans
#ifdef __APPLE_CC__
sprintf(size,"%li",strlen(body));
#else
- sprintf(size,"%i",strlen(body));
+ sprintf(size,"%lu",strlen(body));
#endif
osip_free(body);
i = osip_message_set_content_length(ack, size);
diff -r b578255283fa -r 7c1d0567f3d9 wifo/eXosip/src/jresponse.c
--- a/wifo/eXosip/src/jresponse.c Sat Mar 29 00:23:18 2008 +0100
+++ b/wifo/eXosip/src/jresponse.c Sat Mar 29 00:26:07 2008 +0100
@@ -260,7 +260,7 @@ generating_no_sdp_answer(eXosip_call_t *
#ifdef __APPLE_CC__
sprintf(size,"%li",strlen(local_body));
#else
- sprintf(size,"%i",strlen(local_body));
+ sprintf(size,"%lu",strlen(local_body));
#endif
osip_message_set_content_length(orig_request, size);
osip_free(size);
@@ -433,7 +433,7 @@ eXosip_answer_options_2xx(eXosip_call_t
#ifdef __APPLE_CC__
snprintf(size, 9,"%li",strlen(body));
#else
- snprintf(size, 9,"%i",strlen(body));
+ snprintf(size, 9,"%lu",strlen(body));
#endif
i = osip_message_set_content_length(response, size);
if (i!=0) {
@@ -847,7 +847,7 @@ eXosip_answer_invite_2xx_with_body(eXosi
goto g2atii_error_1;
}
size = (char *) osip_malloc(6*sizeof(char));
- sprintf(size,"%i",strlen(body));
+ sprintf(size,"%lu",strlen(body));
i = osip_message_set_content_length(response, size);
osip_free(size);
if (i!=0) goto g2atii_error_1;
@@ -984,7 +984,7 @@ eXosip_answer_invite_2xx(eXosip_call_t *
#ifdef __APPLE_CC__
sprintf(size,"%li",strlen(body));
#else
- sprintf(size,"%i",strlen(body));
+ sprintf(size,"%lu",strlen(body));
#endif
i = osip_message_set_content_length(response, size);
osip_free(size);
diff -r b578255283fa -r 7c1d0567f3d9 wifo/eXosip/src/udp.c
--- a/wifo/eXosip/src/udp.c Sat Mar 29 00:23:18 2008 +0100
+++ b/wifo/eXosip/src/udp.c Sat Mar 29 00:26:07 2008 +0100
@@ -796,7 +796,7 @@ eXosip_process_reinvite(eXosip_call_t *j
#ifdef __APPLE_CC__
sprintf(size,"%li",strlen(local_body));
#else
- sprintf(size,"%i",strlen(local_body));
+ sprintf(size,"%lu",strlen(local_body));
#endif
osip_free(local_body);
osip_message_set_content_length(answer, size);
@@ -1246,7 +1246,7 @@ static void eXosip_process_new_subscribe
eXosip_notify_t *jn;
eXosip_dialog_t *jd;
osip_message_t *answer;
- int code;
+// int code;
int i;
eXosip_notify_init(&jn, owsip_transaction_account_get (transaction),
evt->sip);
@@ -2466,7 +2466,7 @@ eXosip_recv (OWSLSocket socket)
int i ;
char * buffer ;
OWSLAddress address ;
- int address_length = OWSL_ADDRESS_SIZE ;
+ socklen_t address_length = OWSL_ADDRESS_SIZE ;
buffer = osip_malloc (SIP_MESSAGE_MAX_LENGTH * sizeof (char) + 1) ;
_______________________________________________
Wengophone-devel mailing list
[email protected]
http://dev.openwengo.com/mailman/listinfo/wengophone-devel
