sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed printf style format warnings

This commit is contained in:
bennylp 2023-03-22 08:45:23 +07:00
parent eaa8c37872
commit 398fabd77f
52 changed files with 99 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -2,6 +2,7 @@ pjlib/include/pj/config_site.h
lib/
bin/
output/
tmp/
# VS stuff
*.ncb
@ -80,3 +81,7 @@ tests/fuzz/*.o
*/docs/xml/
*/docs/latex/
*/docs/*.tag
# Coverity scan stuff
cov-int/
getversion.mak

6
pjlib-util/src/pjlib-util-test/http_client.c
View File

@ -153,7 +153,7 @@ static void on_data_read(pj_http_req *hreq, void *data, pj_size_t size)
PJ_UNUSED_ARG(hreq);
PJ_UNUSED_ARG(data);
PJ_LOG(5, (THIS_FILE, "\nData received: %d bytes", size));
PJ_LOG(5, (THIS_FILE, "\nData received: %ld bytes", size));
if (size > 0) {
#ifdef VERBOSE
printf("%.*s\n", (int)size, (char *)data);
@ -180,7 +180,7 @@ static void on_send_data(pj_http_req *hreq,
*data = sdata;
*size = sendsz;
PJ_LOG(5, (THIS_FILE, "\nSending data progress: %d out of %d bytes",
PJ_LOG(5, (THIS_FILE, "\nSending data progress: %ld out of %ld bytes",
send_size, total_size));
}
@ -200,7 +200,7 @@ static void on_complete(pj_http_req *hreq, pj_status_t status,
PJ_LOG(3, (THIS_FILE, "Error %d", status));
return;
}
PJ_LOG(5, (THIS_FILE, "\nData completed: %d bytes", resp->size));
PJ_LOG(5, (THIS_FILE, "\nData completed: %ld bytes", resp->size));
if (resp->size > 0 && resp->data) {
#ifdef VERBOSE
printf("%.*s\n", (int)resp->size, (char *)resp->data);

2
pjlib-util/src/pjlib-util-test/resolver_test.c
View File

@ -368,7 +368,7 @@ static int server_thread(void *p)
continue;
}
PJ_LOG(5,(THIS_FILE, "Server %d processing packet", srv - &g_server[0]));
PJ_LOG(5,(THIS_FILE, "Server %ld processing packet", srv - &g_server[0]));
srv->pkt_count++;
rc = pj_dns_parse_packet(pool, pkt, (unsigned)pkt_len, &req);

10
pjlib-util/src/pjlib-util/dns_dump.c
View File

@ -147,7 +147,7 @@ PJ_DEF(void) pj_dns_dump_packet(const pj_dns_parsed_packet *res)
PJ_LOG(3,(THIS_FILE, " Nb of answer RR: %d", res->hdr.anscount));
PJ_LOG(3,(THIS_FILE, " Nb of authority RR: %d", res->hdr.nscount));
PJ_LOG(3,(THIS_FILE, " Nb of additional RR: %d", res->hdr.arcount));
PJ_LOG(3,(THIS_FILE, ""));
PJ_LOG(3,(THIS_FILE, " "));
/* Dump queries */
if (res->hdr.qdcount) {
@ -156,7 +156,7 @@ PJ_DEF(void) pj_dns_dump_packet(const pj_dns_parsed_packet *res)
for (i=0; i<res->hdr.qdcount; ++i) {
dump_query(i, &res->q[i]);
}
PJ_LOG(3,(THIS_FILE, ""));
PJ_LOG(3,(THIS_FILE, " "));
}
/* Dump answers */
@ -166,7 +166,7 @@ PJ_DEF(void) pj_dns_dump_packet(const pj_dns_parsed_packet *res)
for (i=0; i<res->hdr.anscount; ++i) {
dump_answer(i, &res->ans[i]);
}
PJ_LOG(3,(THIS_FILE, ""));
PJ_LOG(3,(THIS_FILE, " "));
}
/* Dump NS sections */
@ -176,7 +176,7 @@ PJ_DEF(void) pj_dns_dump_packet(const pj_dns_parsed_packet *res)
for (i=0; i<res->hdr.nscount; ++i) {
dump_answer(i, &res->ns[i]);
}
PJ_LOG(3,(THIS_FILE, ""));
PJ_LOG(3,(THIS_FILE, " "));
}
/* Dump Additional info sections */
@ -186,7 +186,7 @@ PJ_DEF(void) pj_dns_dump_packet(const pj_dns_parsed_packet *res)
for (i=0; i<res->hdr.arcount; ++i) {
dump_answer(i, &res->arr[i]);
}
PJ_LOG(3,(THIS_FILE, ""));
PJ_LOG(3,(THIS_FILE, " "));
}
}

2
pjlib/src/pjlib-test/test.c
View File

@ -212,7 +212,7 @@ on_return:
pj_caching_pool_destroy( &caching_pool );
PJ_LOG(3,("test", ""));
PJ_LOG(3,("test", " "));
pj_thread_get_stack_info(pj_thread_this(), &filename, &line);
PJ_LOG(3,("test", "Stack max usage: %u, deepest: %s:%u",

4
pjmedia/src/pjmedia-audiodev/alsa_dev.c
View File

@ -753,7 +753,7 @@ static pj_status_t open_playback (struct alsa_stream* stream,
}
PJ_LOG (5,(THIS_FILE, "Opened device alsa(%s) for playing, sample rate=%d"
", ch=%d, bits=%d, period size=%d frames, latency=%d ms",
", ch=%d, bits=%d, period size=%ld frames, latency=%d ms",
stream->af->devs[param->play_id].name,
rate, param->channel_count,
param->bits_per_sample, stream->pb_frames,
@ -891,7 +891,7 @@ static pj_status_t open_capture (struct alsa_stream* stream,
}
PJ_LOG (5,(THIS_FILE, "Opened device alsa(%s) for capture, sample rate=%d"
", ch=%d, bits=%d, period size=%d frames, latency=%d ms",
", ch=%d, bits=%d, period size=%ld frames, latency=%d ms",
stream->af->devs[param->rec_id].name,
rate, param->channel_count,
param->bits_per_sample, stream->ca_frames,

2
pjmedia/src/pjmedia-codec/opus.c
View File

@ -909,7 +909,7 @@ static pj_status_t codec_parse( pjmedia_codec *codec,
((unsigned char*)pkt) + out_pos,
sizeof(tmp_buf));
if (size < 0) {
PJ_LOG(5, (THIS_FILE, "Parse failed! (pkt_size=%d, err=%d)",
PJ_LOG(5, (THIS_FILE, "Parse failed! (pkt_size=%lu, err=%d)",
pkt_size, size));
pj_mutex_unlock (opus_data->mutex);
return PJMEDIA_CODEC_EFAILED;

2
pjmedia/src/pjmedia/rtcp.c
View File

@ -787,7 +787,7 @@ static void parse_rtcp_bye(pjmedia_rtcp_session *sess,
/* Just print RTCP BYE log */
PJ_LOG(5, (sess->name, "Received RTCP BYE, reason: %.*s",
reason.slen, reason.ptr));
(int)reason.slen, reason.ptr));
}

4
pjmedia/src/pjmedia/transport_srtp.c
View File

@ -1580,7 +1580,7 @@ static void srtp_rtp_cb(pjmedia_tp_cb_param *param)
if (err != srtp_err_status_ok) {
PJ_LOG(5,(srtp->pool->obj_name,
"Failed to unprotect SRTP, pkt size=%d, err=%s",
"Failed to unprotect SRTP, pkt size=%ld, err=%s",
size, get_libsrtp_errstr(err)));
} else {
cb = srtp->rtp_cb;
@ -1637,7 +1637,7 @@ static void srtp_rtcp_cb( void *user_data, void *pkt, pj_ssize_t size)
err = srtp_unprotect_rtcp(srtp->srtp_rx_ctx, (pj_uint8_t*)pkt, &len);
if (err != srtp_err_status_ok) {
PJ_LOG(5,(srtp->pool->obj_name,
"Failed to unprotect SRTCP, pkt size=%d, err=%s",
"Failed to unprotect SRTCP, pkt size=%ld, err=%s",
size, get_libsrtp_errstr(err)));
} else {
cb = srtp->rtcp_cb;

2
pjmedia/src/pjmedia/transport_srtp_sdes.c
View File

@ -240,7 +240,7 @@ static pj_status_t parse_attr_crypto(pj_pool_t *pool,
}
if (pj_stricmp2(&token, "inline")) {
PJ_LOG(4,(THIS_FILE, "Attribute crypto key method '%.*s' "
"not supported!", token.slen, token.ptr));
"not supported!", (int)token.slen, token.ptr));
return PJMEDIA_SDP_EINATTR;
}

2
pjmedia/src/pjmedia/wav_writer.c
View File

@ -215,7 +215,7 @@ PJ_DEF(pj_status_t) pjmedia_wav_writer_port_create( pj_pool_t *pool,
*p_port = &fport->base;
PJ_LOG(4,(THIS_FILE,
"File writer '%.*s' created: samp.rate=%d, bufsize=%uKB",
"File writer '%.*s' created: samp.rate=%d, bufsize=%luKB",
(int)fport->base.info.name.slen,
fport->base.info.name.ptr,
PJMEDIA_PIA_SRATE(&fport->base.info),

2
pjmedia/src/test/codec_vectors.c
View File

@ -178,7 +178,7 @@ static int codec_test_encode(pjmedia_codec_mgr *mgr,
break;
}
PJ_LOG(1,(THIS_FILE," failed: mismatch at pos %d", pos+i));
PJ_LOG(1,(THIS_FILE," failed: mismatch at pos %ld", pos+i));
rc = -200;
break;
}

4
pjnath/src/pjnath-test/server.c
View File

@ -1047,7 +1047,7 @@ static pj_bool_t alloc_on_data_recvfrom(pj_activesock_t *asock,
}
}
if (i==alloc->perm_cnt) {
PJ_LOG(5,("", "Client %s received %d bytes unauthorized data from peer %s",
PJ_LOG(5,("", "Client %s received %ld bytes unauthorized data from peer %s",
client_info, size, peer_info));
if (alloc->perm_cnt == 0)
PJ_LOG(5,("", "Client %s has no permission", client_info));
@ -1073,7 +1073,7 @@ static pj_bool_t alloc_on_data_recvfrom(pj_activesock_t *asock,
/* Send */
sent = size;
PJ_LOG(5,("", "Forwarding %d bytes data from peer %s to client %s",
PJ_LOG(5,("", "Forwarding %ld bytes data from peer %s to client %s",
sent, peer_info, client_info));
pj_activesock_sendto(alloc->test_srv->turn_sock, &alloc->send_key, buffer,

2
pjnath/src/pjnath-test/stun.c
View File

@ -615,7 +615,7 @@ static int fingerprint_test_vector()
char print[1500];
pj_str_t key;
PJ_LOG(3,(THIS_FILE, " Running test %d/%d", i,
PJ_LOG(3,(THIS_FILE, " Running test %d/%lu", i,
PJ_ARRAY_SIZE(test_vectors)));
v = &test_vectors[i];

2
pjnath/src/pjnath/ice_session.c
View File

@ -1675,7 +1675,7 @@ static pj_bool_t on_check_complete(pj_ice_sess *ice,
}
}
LOG5((ice->obj_name, "Check %d is successful%s",
LOG5((ice->obj_name, "Check %ld is successful%s",
GET_CHECK_ID(&ice->clist, check),
(check->nominated ? " and nominated" : "")));

2
pjnath/src/pjnath/stun_msg.c
View File

@ -2547,7 +2547,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool,
if (pdu_len > 0) {
/* Stray trailing bytes */
PJ_LOG(4,(THIS_FILE,
"Error decoding STUN message: unparsed trailing %d bytes",
"Error decoding STUN message: unparsed trailing %ld bytes",
pdu_len));
return PJNATH_EINSTUNMSGLEN;
}

2
pjnath/src/pjturn-client/client_main.c
View File

@ -325,7 +325,7 @@ static void turn_on_rx_data(pj_turn_sock *relay,
pj_sockaddr_print(peer_addr, addrinfo, sizeof(addrinfo), 3);
PJ_LOG(3,(THIS_FILE, "Client received %d bytes data from %s: %.*s",
pkt_len, addrinfo, pkt_len, pkt));
pkt_len, addrinfo, pkt_len, (char*)pkt));
}

2
pjnath/src/pjturn-srv/allocation.c
View File

@ -1026,7 +1026,7 @@ static void handle_peer_pkt(pj_turn_allocation *alloc,
char peer_addr[80];
pj_sockaddr_print(src_addr, peer_addr, sizeof(peer_addr), 3);
PJ_LOG(4,(alloc->obj_name, "Client %s: discarded data from %s "
"because it's too long (%d bytes)",
"because it's too long (%ld bytes)",
alloc->info, peer_addr, len));
return;
}

4
pjsip-apps/src/pjsua/pjsua_app_cli.c
View File

@ -2542,9 +2542,9 @@ static pj_status_t cmd_vid_conf_list()
(int)info.name.slen, info.name.ptr,
22-(int)info.name.slen, " ",
s,
20-pj_ansi_strlen(s), " ",
20-(int)pj_ansi_strlen(s), " ",
tr_list,
12-pj_ansi_strlen(tr_list), " ",
12-(int)pj_ansi_strlen(tr_list), " ",
li_list));
}
return PJ_SUCCESS;

2
pjsip-apps/src/samples/httpdemo.c
View File

@ -94,7 +94,7 @@ static void on_complete(pj_http_req *hreq, pj_status_t status,
PJ_PERROR(1, (THIS_FILE, status, "HTTP request completed with error"));
return;
}
PJ_LOG(3, (THIS_FILE, "Data completed: %d bytes", resp->size));
PJ_LOG(3, (THIS_FILE, "Data completed: %ld bytes", resp->size));
if (resp->size > 0 && resp->data) {
#ifdef VERBOSE
printf("%.*s\n", (int)resp->size, (char *)resp->data);

2
pjsip-apps/src/samples/icedemo.c
View File

@ -226,7 +226,7 @@ static void cb_on_rx_data(pj_ice_strans *ice_st,
// Don't do this! It will ruin the packet buffer in case TCP is used!
//((char*)pkt)[size] = '\0';
PJ_LOG(3,(THIS_FILE, "Component %d: received %d bytes data from %s: \"%.*s\"",
PJ_LOG(3,(THIS_FILE, "Component %d: received %ld bytes data from %s: \"%.*s\"",
comp_id, size,
pj_sockaddr_print(src_addr, ipstr, sizeof(ipstr), 3),
(unsigned)size,

2
pjsip-apps/src/samples/mix.c
View File

@ -213,7 +213,7 @@ int main(int argc, char *argv[])
processed += frame.size;
}
PJ_LOG(3,(THIS_FILE, "Done. Output duration: %d.%03d",
PJ_LOG(3,(THIS_FILE, "Done. Output duration: %ld.%03ld",
(processed >> 2)/clock_rate,
((processed >> 2)*1000/clock_rate) % 1000));

4
pjsip-apps/src/samples/pjsip-perf.c
View File

@ -625,7 +625,7 @@ static pj_status_t logger_on_tx_msg(pjsip_tx_data *tdata)
* has lower priority than transport layer.
*/
PJ_LOG(3,(THIS_FILE, "TX %d bytes %s to %s %s:%d:\n"
PJ_LOG(3,(THIS_FILE, "TX %ld bytes %s to %s %s:%d:\n"
"%.*s\n"
"--end msg--",
(tdata->buf.cur - tdata->buf.start),
@ -900,7 +900,7 @@ static void destroy_app()
if (app.pool) {
pj_pool_release(app.pool);
app.pool = NULL;
PJ_LOG(3,(THIS_FILE, "Peak memory size: %uMB",
PJ_LOG(3,(THIS_FILE, "Peak memory size: %luMB",
app.cp.peak_used_size / 1000000));
pj_caching_pool_destroy(&app.cp);
}

2
pjsip-apps/src/samples/proxy.h
View File

@ -146,7 +146,7 @@ static pj_status_t logging_on_tx_msg(pjsip_tx_data *tdata)
* has lower priority than transport layer.
*/
PJ_LOG(5,(THIS_FILE, "TX %d bytes %s to %s %s:%d:\n"
PJ_LOG(5,(THIS_FILE, "TX %ld bytes %s to %s %s:%d:\n"
"%.*s\n"
"--end msg--",
(tdata->buf.cur - tdata->buf.start),

2
pjsip-apps/src/samples/simpleua.c
View File

@ -180,7 +180,7 @@ static pj_status_t logging_on_tx_msg(pjsip_tx_data *tdata)
* has lower priority than transport layer.
*/
PJ_LOG(4,(THIS_FILE, "TX %d bytes %s to %s %s:%d:\n"
PJ_LOG(4,(THIS_FILE, "TX %ld bytes %s to %s %s:%d:\n"
"%.*s\n"
"--end msg--",
(tdata->buf.cur - tdata->buf.start),

6
pjsip-apps/src/samples/sipecho.c
View File

@ -125,7 +125,7 @@ static pj_status_t logging_on_tx_msg(pjsip_tx_data *tdata)
if (!app.enable_msg_logging)
return PJ_SUCCESS;
PJ_LOG(3,(THIS_FILE, "TX %d bytes %s to %s %s:%d:\n"
PJ_LOG(3,(THIS_FILE, "TX %ld bytes %s to %s %s:%d:\n"
"%.*s\n"
"--end msg--",
(tdata->buf.cur - tdata->buf.start),
@ -388,12 +388,12 @@ static void call_on_state_changed( pjsip_inv_session *inv,
PJ_UNUSED_ARG(e);
if (inv->state == PJSIP_INV_STATE_DISCONNECTED) {
PJ_LOG(3,(THIS_FILE, "Call %d: DISCONNECTED [reason=%d (%s)]",
PJ_LOG(3,(THIS_FILE, "Call %ld: DISCONNECTED [reason=%d (%s)]",
call - app.call, inv->cause,
pjsip_get_status_text(inv->cause)->ptr));
destroy_call(call);
} else {
PJ_LOG(3,(THIS_FILE, "Call %d: state changed to %s",
PJ_LOG(3,(THIS_FILE, "Call %ld: state changed to %s",
call - app.call, pjsip_inv_state_name(inv->state)));
}
}

4
pjsip-apps/src/samples/siprtp.c
View File

@ -795,7 +795,7 @@ static void call_on_state_changed( pjsip_inv_session *inv,
t = call->connect_time;
PJ_TIME_VAL_SUB(t, call->start_time);
PJ_LOG(3,(THIS_FILE, "Call #%d connected in %d ms", call->index,
PJ_LOG(3,(THIS_FILE, "Call #%d connected in %ld ms", call->index,
PJ_TIME_VAL_MSEC(t)));
if (app.duration != 0) {
@ -1977,7 +1977,7 @@ static pj_status_t logger_on_tx_msg(pjsip_tx_data *tdata)
* has lower priority than transport layer.
*/
PJ_LOG(4,(THIS_FILE, "TX %d bytes %s to %s:%d:\n"
PJ_LOG(4,(THIS_FILE, "TX %ld bytes %s to %s:%d:\n"
"%s\n"
"--end msg--",
(tdata->buf.cur - tdata->buf.start),

2
pjsip-apps/src/samples/util.h
View File

@ -174,7 +174,7 @@ void dump_pool_usage( const char *app_name, pj_caching_pool *cp )
p = p->next;
}
PJ_LOG(3, (app_name, "Total pool memory allocated=%d KB, used=%d KB",
PJ_LOG(3, (app_name, "Total pool memory allocated=%lu KB, used=%lu KB",
total_alloc / 1000,
total_used / 1000));
#endif

2
pjsip-apps/src/samples/vid_streamutil.c
View File

@ -905,7 +905,7 @@ static int main_func(int argc, char *argv[])
PJ_LOG(2, (THIS_FILE, "Sending %dx%d %.*s @%.2ffps",
codec_param.enc_fmt.det.vid.size.w,
codec_param.enc_fmt.det.vid.size.h,
codec_info->encoding_name.slen,
(int)codec_info->encoding_name.slen,
codec_info->encoding_name.ptr,
(1.0*codec_param.enc_fmt.det.vid.fps.num/
codec_param.enc_fmt.det.vid.fps.denum)));

2
pjsip/src/pjsip-simple/evsub.c
View File

@ -529,7 +529,7 @@ static void set_timer( pjsip_evsub *sub, int timer_id,
pjsip_endpt_get_timer_heap(sub->endpt),
&sub->timer, &timeout, timer_id, sub->grp_lock);
PJ_LOG(5,(sub->obj_name, "Timer %s scheduled in %d seconds",
PJ_LOG(5,(sub->obj_name, "Timer %s scheduled in %ld seconds",
timer_names[sub->timer.id], timeout.sec));
}
}

2
pjsip/src/pjsip-ua/sip_100rel.c
View File

@ -856,7 +856,7 @@ PJ_DEF(pj_status_t) pjsip_100rel_tx_response(pjsip_inv_session *inv,
status = PJ_SUCCESS;
PJ_LOG(4,(dd->inv->dlg->obj_name,
"Reliable %d response enqueued (%d pending)",
"Reliable %d response enqueued (%ld pending)",
code, pj_list_size(&dd->uas_state->tx_data_list)));
} else {

10
pjsip/src/pjsip-ua/sip_timer.c
View File

@ -386,7 +386,7 @@ static void timer_cb(pj_timer_heap_t *timer_heap, struct pj_timer_entry *entry)
pjsip_dlg_dec_lock(inv->dlg);
PJ_LOG(3, (obj_name,
"Reschedule refresh request after %d seconds as "
"Reschedule refresh request after %ld seconds as "
"there is another SDP negotiation in progress",
delay.sec));
return;
@ -423,7 +423,7 @@ static void timer_cb(pj_timer_heap_t *timer_heap, struct pj_timer_entry *entry)
pj_gettimeofday(&now);
PJ_LOG(4, (obj_name,
"Refreshing session after %ds (expiration period=%ds)",
"Refreshing session after %lds (expiration period=%ds)",
(now.sec-inv->timer->last_refresh.sec),
inv->timer->setting.sess_expires));
} else {
@ -441,7 +441,7 @@ static void timer_cb(pj_timer_heap_t *timer_heap, struct pj_timer_entry *entry)
pj_gettimeofday(&now);
PJ_LOG(3, (obj_name,
"No session %s received after %ds "
"No session %s received after %lds "
"(expiration period=%ds), stopping session now!",
(as_refresher?"refresh response":"refresh"),
(now.sec-inv->timer->last_refresh.sec),
@ -1005,7 +1005,7 @@ PJ_DEF(pj_status_t) pjsip_timer_handle_refresh_error(
PJ_LOG(3, (inv->pool->obj_name,
"Receive error %d for refresh request %.*s/cseq=%d",
st_code, event->body.tsx_state.tsx->method.name.slen,
st_code, (int)event->body.tsx_state.tsx->method.name.slen,
event->body.tsx_state.tsx->method.name.ptr,
event->body.tsx_state.tsx->cseq));
@ -1014,7 +1014,7 @@ PJ_DEF(pj_status_t) pjsip_timer_handle_refresh_error(
pj_time_val delay = {PJSIP_SESS_TIMER_RETRY_DELAY, 0};
PJ_LOG(3, (inv->pool->obj_name, "Scheduling to retry refresh "
"request after %d second(s)", delay.sec));
"request after %ld second(s)", delay.sec));
inv->timer->timer.id = 1;
pjsip_endpt_schedule_timer(inv->dlg->endpt,

2
pjsip/src/pjsip/sip_auth_client.c
View File

@ -1375,7 +1375,7 @@ static pj_status_t process_auth( pj_pool_t *req_pool,
"%.*s/%.*s",
tdata->obj_name,
(int)realm->slen, realm->ptr,
hchal->scheme.slen, hchal->scheme.ptr));
(int)hchal->scheme.slen, hchal->scheme.ptr));
return PJSIP_ENOCREDENTIAL;
}

4
pjsip/src/pjsip/sip_config.c
View File

@ -250,9 +250,9 @@ PJ_DEF(void) pjsip_dump_config(void)
pjsip_cfg()->regc.check_contact));
PJ_LOG(3, (id, " pjsip_cfg()->regc.add_xuid_param : %d",
pjsip_cfg()->regc.add_xuid_param));
PJ_LOG(3, (id, " pjsip_cfg()->tcp.keep_alive_interval : %d",
PJ_LOG(3, (id, " pjsip_cfg()->tcp.keep_alive_interval : %ld",
pjsip_cfg()->tcp.keep_alive_interval));
PJ_LOG(3, (id, " pjsip_cfg()->tls.keep_alive_interval : %d",
PJ_LOG(3, (id, " pjsip_cfg()->tls.keep_alive_interval : %ld",
pjsip_cfg()->tls.keep_alive_interval));
}

2
pjsip/src/pjsip/sip_endpoint.c
View File

@ -1312,7 +1312,7 @@ PJ_DEF(void) pjsip_endpt_dump( pjsip_endpoint *endpt, pj_bool_t detail )
pj_pool_factory_dump(endpt->pf, detail);
/* Pool health. */
PJ_LOG(3, (THIS_FILE," Endpoint pool capacity=%u, used_size=%u",
PJ_LOG(3, (THIS_FILE," Endpoint pool capacity=%lu, used_size=%lu",
pj_pool_get_capacity(endpt->pool),
pj_pool_get_used_size(endpt->pool)));

2
pjsip/src/pjsip/sip_resolve.c
View File

@ -316,7 +316,7 @@ PJ_DEF(void) pjsip_resolve( pjsip_resolver_t *resolver,
PJ_LOG(5,(THIS_FILE,
"DNS resolver not available, target '%.*s:%d' type=%s "
"will be resolved with getaddrinfo()",
target->addr.host.slen,
(int)target->addr.host.slen,
target->addr.host.ptr,
target->addr.port,
pjsip_transport_get_type_name(target->type)));

2
pjsip/src/pjsip/sip_transaction.c
View File

@ -2020,7 +2020,7 @@ static void send_msg_callback( pjsip_send_state *send_state,
err =pj_strerror((pj_status_t)-sent, errmsg, sizeof(errmsg));
PJ_LOG(3,(tsx->obj_name,
"Failed to send %s! err=%d (%s)",
"Failed to send %s! err=%ld (%s)",
pjsip_tx_data_get_info(send_state->tdata), -sent,
errmsg));

8
pjsip/src/pjsip/sip_transport.c
View File

@ -1899,7 +1899,7 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_destroy( pjsip_tpmgr *mgr )
*/
//pj_assert(pj_atomic_get(mgr->tdata_counter) == 0);
if (pj_atomic_get(mgr->tdata_counter) != 0) {
PJ_LOG(3,(THIS_FILE, "Warning: %d transmit buffer(s) not freed!",
PJ_LOG(3,(THIS_FILE, "Warning: %ld transmit buffer(s) not freed!",
pj_atomic_get(mgr->tdata_counter)));
}
#endif
@ -2089,7 +2089,7 @@ PJ_DEF(pj_ssize_t) pjsip_tpmgr_receive_packet( pjsip_tpmgr *mgr,
*/
if (tmp.slen) {
PJ_LOG(1, (THIS_FILE,
"Error processing %d bytes packet from %s %s:%d %.*s:\n"
"Error processing %ld bytes packet from %s %s:%d %.*s:\n"
"%.*s\n"
"-- end of packet.",
msg_fragment_size,
@ -2523,7 +2523,7 @@ PJ_DEF(void) pjsip_tpmgr_dump_transports(pjsip_tpmgr *mgr)
pj_lock_acquire(mgr->lock);
#if defined(PJ_DEBUG) && PJ_DEBUG!=0
PJ_LOG(3,(THIS_FILE, " Outstanding transmit buffers: %d",
PJ_LOG(3,(THIS_FILE, " Outstanding transmit buffers: %ld",
pj_atomic_get(mgr->tdata_counter)));
#endif
@ -2551,7 +2551,7 @@ PJ_DEF(void) pjsip_tpmgr_dump_transports(pjsip_tpmgr *mgr)
do {
pjsip_transport *tp_ref = tp_iter->tp;
PJ_LOG(3, (THIS_FILE, " %s %s%s%s%s(refcnt=%d%s)",
PJ_LOG(3, (THIS_FILE, " %s %s%s%s%s(refcnt=%ld%s)",
tp_ref->obj_name,
tp_ref->info,
(tp_ref->factory)?" listener[":"",

6
pjsip/src/pjsip/sip_transport_tcp.c
View File

@ -1133,7 +1133,7 @@ static pj_bool_t on_accept_complete(pj_activesock_t *asock,
PJ_LOG(4,(listener->factory.obj_name,
"TCP listener %s: got incoming TCP connection "
"from %s, sock=%d",
"from %s, sock=%ld",
pj_addr_str_print(&listener->factory.addr_name.host,
listener->factory.addr_name.port, addr_buf,
sizeof(addr_buf), 1),
@ -1238,7 +1238,7 @@ static pj_bool_t on_data_sent(pj_activesock_t *asock,
if (bytes_sent <= 0) {
pj_status_t status;
PJ_LOG(5,(tcp->base.obj_name, "TCP send() error, sent=%d",
PJ_LOG(5,(tcp->base.obj_name, "TCP send() error, sent=%ld",
bytes_sent));
status = (bytes_sent == 0) ? PJ_RETURN_OS_ERROR(OSERR_ENOTCONN) :
@ -1343,7 +1343,7 @@ static pj_status_t tcp_send_msg(pjsip_transport *transport,
/* Shutdown transport on closure/errors */
if (size <= 0) {
PJ_LOG(5,(tcp->base.obj_name, "TCP send() error, sent=%d",
PJ_LOG(5,(tcp->base.obj_name, "TCP send() error, sent=%ld",
size));
if (status == PJ_SUCCESS)

10
pjsip/src/pjsip/sip_transport_tls.c
View File

@ -180,7 +180,7 @@ static void tls_perror(const char *sender, const char *title,
pj_status_t status, pj_str_t *remote_name)
{
PJ_PERROR(3,(sender, status, "%s: [code=%d]%s%.*s", title, status,
remote_name ? " peer: " : "", remote_name ? remote_name->slen : 0,
remote_name ? " peer: " : "", remote_name ? (int)remote_name->slen : 0,
remote_name ? remote_name->ptr : ""));
}
@ -1350,7 +1350,7 @@ static pj_bool_t on_accept_complete2(pj_ssl_sock_t *ssock,
if (new_ssock && accept_status == PJ_SUCCESS) {
/* Close the SSL socket if the accept op is successful */
PJ_LOG(4,(THIS_FILE,
"Incoming TLS connection from %s (sock=%d) is discarded "
"Incoming TLS connection from %s (sock=%p) is discarded "
"because listener is already destroyed",
pj_sockaddr_print(src_addr, addr, sizeof(addr), 3),
new_ssock));
@ -1400,7 +1400,7 @@ static pj_bool_t on_accept_complete2(pj_ssl_sock_t *ssock,
PJ_LOG(4,(listener->factory.obj_name,
"TLS listener %s: got incoming TLS connection "
"from %s, sock=%d",
"from %s, sock=%p",
pj_addr_str_print(&listener->factory.addr_name.host,
listener->factory.addr_name.port, addr_buf,
sizeof(addr_buf), 1),
@ -1571,7 +1571,7 @@ static pj_bool_t on_data_sent(pj_ssl_sock_t *ssock,
if (bytes_sent <= 0) {
pj_status_t status;
PJ_LOG(5,(tls->base.obj_name, "TLS send() error, sent=%d",
PJ_LOG(5,(tls->base.obj_name, "TLS send() error, sent=%ld",
bytes_sent));
status = (bytes_sent == 0) ? PJ_RETURN_OS_ERROR(OSERR_ENOTCONN) :
@ -1710,7 +1710,7 @@ static pj_status_t tls_send_msg(pjsip_transport *transport,
/* Shutdown transport on closure/errors */
if (size <= 0) {
PJ_LOG(5,(tls->base.obj_name, "TLS send() error, sent=%d",
PJ_LOG(5,(tls->base.obj_name, "TLS send() error, sent=%ld",
size));
if (status == PJ_SUCCESS)

12
pjsip/src/pjsua-lib/pjsua_acc.c
View File

@ -2112,7 +2112,7 @@ static void keep_alive_timer_cb(pj_timer_heap_t *th, pj_timer_entry *te)
tp_sel.u.transport = acc->ka_transport;
PJ_LOG(5,(THIS_FILE,
"Sending %d bytes keep-alive packet for acc %d to %s",
"Sending %ld bytes keep-alive packet for acc %d to %s",
acc->cfg.ka_data.slen, acc->index,
pj_sockaddr_print(&acc->ka_target, addrtxt, sizeof(addrtxt),3)));
@ -2257,7 +2257,7 @@ static void update_keep_alive(pjsua_acc *acc, pj_bool_t start,
pj_addr_str_print(&input_str, param->rdata->pkt_info.src_port,
addr, sizeof(addr), 1);
PJ_LOG(4,(THIS_FILE, "Keep-alive timer started for acc %d, "
"destination:%s, interval:%ds",
"destination:%s, interval:%lds",
acc->index, addr, delay.sec));
} else {
acc->ka_timer.id = PJ_FALSE;
@ -2564,7 +2564,7 @@ static void regc_cb(struct pjsip_regc_cbparam *param)
pj_status_t status;
/* Send re-register. */
PJ_LOG(3, (THIS_FILE, "%.*s: send registration triggered by IP"
" change", pjsua_var.acc[acc->index].cfg.id.slen,
" change", (int)pjsua_var.acc[acc->index].cfg.id.slen,
pjsua_var.acc[acc->index].cfg.id.ptr));
status = pjsua_acc_set_registration(acc->index, PJ_TRUE);
@ -4097,7 +4097,7 @@ static void schedule_reregistration(pjsua_acc *acc)
pj_time_val_normalize(&delay);
PJ_LOG(4,(THIS_FILE,
"Scheduling re-registration retry for acc %d in %u seconds..",
"Scheduling re-registration retry for acc %d in %lu seconds..",
acc->index, delay.sec));
acc->auto_rereg.timer.id = PJ_TRUE;
@ -4209,7 +4209,7 @@ pj_status_t pjsua_acc_update_contact_on_ip_change(pjsua_acc *acc)
acc->ip_change_op = PJSUA_IP_CHANGE_OP_ACC_UPDATE_CONTACT;
PJ_LOG(3, (THIS_FILE, "%.*s: send %sregistration triggered "
"by IP change", acc->cfg.id.slen,
"by IP change", (int)acc->cfg.id.slen,
acc->cfg.id.ptr, (need_unreg ? "un-" : "")));
status = pjsua_acc_set_registration(acc->index, !need_unreg);
@ -4353,7 +4353,7 @@ pj_status_t pjsua_acc_handle_call_on_ip_change(pjsua_acc *acc)
"with flags 0x%x triggered "
"by IP change (IP change flag: 0x%x)",
i,
call_info.remote_info.slen,
(int)call_info.remote_info.slen,
call_info.remote_info.ptr,
(use_update? "UPDATE" : "re-INVITE"),
call_info.setting.flag,

2
pjsip/src/pjsua-lib/pjsua_call.c
View File

@ -1088,7 +1088,7 @@ static pj_status_t process_incoming_call_replace(pjsua_call *call,
pj_str_t *text = &replaced_call->last_text;
PJ_LOG(4,(THIS_FILE, "Answering replacement call %d with %d/%.*s",
call->index, code, text->slen, text->ptr));
call->index, code, (int)text->slen, text->ptr));
/* Answer the new call with last response in the replaced call */
status = pjsip_inv_answer(call->inv, code, text, NULL, &tdata);

6
pjsip/src/pjsua-lib/pjsua_core.c
View File

@ -480,7 +480,7 @@ static pj_status_t logging_on_tx_msg(pjsip_tx_data *tdata)
* transport layer. So don't try to access tp_info when the module
* has lower priority than transport layer.
*/
PJ_LOG(4,(THIS_FILE, "TX %d bytes %s to %s %s:\n"
PJ_LOG(4,(THIS_FILE, "TX %ld bytes %s to %s %s:\n"
"%.*s\n"
"--end msg--",
(tdata->buf.cur - tdata->buf.start),
@ -3858,7 +3858,7 @@ static pj_status_t restart_listener(pjsua_transport_id id,
}
PJ_PERROR(3,(THIS_FILE, status, "Listener %.*s restart",
tp_info.info.slen, tp_info.info.ptr));
(int)tp_info.info.slen, tp_info.info.ptr));
if (status != PJ_SUCCESS && (restart_lis_delay > 0)) {
/* Try restarting again, with delay. */
@ -3867,7 +3867,7 @@ static pj_status_t restart_listener(pjsua_transport_id id,
restart_lis_delay);
PJ_LOG(3,(THIS_FILE, "Retry listener %.*s restart in %d ms",
tp_info.info.slen, tp_info.info.ptr, restart_lis_delay));
(int)tp_info.info.slen, tp_info.info.ptr, restart_lis_delay));
status = PJ_SUCCESS;
} else {

2
pjsip/src/pjsua-lib/pjsua_pres.c
View File

@ -1085,7 +1085,7 @@ PJ_DEF(pj_status_t) pjsua_pres_notify( pjsua_acc_id acc_id,
PJ_ASSERT_RETURN(pjsua_var.acc[acc_id].valid, PJ_EINVALIDOP);
PJ_LOG(4,(THIS_FILE, "Acc %d: sending NOTIFY for srv_pres=0x%p..",
acc_id, (int)(pj_ssize_t)srv_pres));
acc_id, srv_pres));
pj_log_push_indent();
PJSUA_LOCK();

4
pjsip/src/test/msg_logger.c
View File

@ -45,7 +45,7 @@ static pj_bool_t on_rx_msg(pjsip_rx_data *rdata)
static pj_status_t on_tx_msg(pjsip_tx_data *tdata)
{
if (msg_log_enabled) {
PJ_LOG(4,(THIS_FILE, "TX %d bytes %s to %s:%s:%d:\n"
PJ_LOG(4,(THIS_FILE, "TX %ld bytes %s to %s:%s:%d:\n"
"%.*s\n"
"--end msg--",
(tdata->buf.cur - tdata->buf.start),
@ -53,7 +53,7 @@ static pj_status_t on_tx_msg(pjsip_tx_data *tdata)
tdata->tp_info.transport->type_name,
tdata->tp_info.dst_name,
tdata->tp_info.dst_port,
(tdata->buf.cur - tdata->buf.start),
(int)(tdata->buf.cur - tdata->buf.start),
tdata->buf.start));
}
return PJ_SUCCESS;

6
pjsip/src/test/msg_test.c
View File

@ -878,7 +878,7 @@ static int msg_benchmark(unsigned *p_detect, unsigned *p_parse,
avg_detect = 1000000 / avg_detect;
PJ_LOG(3,(THIS_FILE,
" %u.%u MB detected in %d.%03ds (avg=%d msg detection/sec)",
" %u.%u MB detected in %ld.%03lds (avg=%d msg detection/sec)",
(unsigned)(var.detect_len/1000000), (unsigned)kbytes,
elapsed.sec, elapsed.msec,
(unsigned)avg_detect));
@ -894,7 +894,7 @@ static int msg_benchmark(unsigned *p_detect, unsigned *p_parse,
avg_parse = 1000000 / avg_parse;
PJ_LOG(3,(THIS_FILE,
" %u.%u MB parsed in %d.%03ds (avg=%d msg parsing/sec)",
" %u.%u MB parsed in %ld.%03lds (avg=%d msg parsing/sec)",
(unsigned)(var.parse_len/1000000), (unsigned)kbytes,
elapsed.sec, elapsed.msec,
(unsigned)avg_parse));
@ -910,7 +910,7 @@ static int msg_benchmark(unsigned *p_detect, unsigned *p_parse,
avg_print = 1000000 / avg_print;
PJ_LOG(3,(THIS_FILE,
" %u.%u MB printed in %d.%03ds (avg=%d msg print/sec)",
" %u.%u MB printed in %ld.%03lds (avg=%d msg print/sec)",
(unsigned)(var.print_len/1000000), (unsigned)kbytes,
elapsed.sec, elapsed.msec,
(unsigned)avg_print));

6
pjsip/src/test/test.c
View File

@ -353,7 +353,7 @@ int test_main(char *testlist)
return rc;
}
PJ_LOG(3,(THIS_FILE,""));
PJ_LOG(3,(THIS_FILE," "));
/* Init logger module. */
init_msg_logger();
@ -495,13 +495,13 @@ on_return:
pj_log_set_level(4);
/* Dumping memory pool usage */
PJ_LOG(3,(THIS_FILE, "Peak memory size=%u MB",
PJ_LOG(3,(THIS_FILE, "Peak memory size=%lu MB",
caching_pool.peak_used_size / 1000000));
pjsip_endpt_destroy(endpt);
pj_caching_pool_destroy(&caching_pool);
PJ_LOG(3,(THIS_FILE, ""));
PJ_LOG(3,(THIS_FILE, " "));
pj_thread_get_stack_info(pj_thread_this(), &filename, &line);
PJ_LOG(3,(THIS_FILE, "Stack max usage: %u, deepest: %s:%u",

2
pjsip/src/test/transport_loop_test.c
View File

@ -104,7 +104,7 @@ static int datagram_loop_test()
/* Check reference counter. */
if (pj_atomic_get(loop->ref_cnt) != ref_cnt) {
PJ_LOG(3,(THIS_FILE, " error: ref counter is not %d (%d)",
PJ_LOG(3,(THIS_FILE, " error: ref counter is not %ld (%ld)",
ref_cnt, pj_atomic_get(loop->ref_cnt)));
return -51;
}

4
pjsip/src/test/tsx_uac_test.c
View File

@ -609,7 +609,7 @@ static pj_bool_t msg_receiver_on_rx_request(pjsip_rx_data *rdata)
msg->line.req.method.id != PJSIP_OPTIONS_METHOD)
{
PJ_LOG(3,(THIS_FILE, " error: received unexpected method %.*s",
msg->line.req.method.name.slen,
(int)msg->line.req.method.name.slen,
msg->line.req.method.name.ptr));
test_complete = -600;
return PJ_TRUE;
@ -1069,7 +1069,7 @@ static int perform_tsx_test(int dummy, char *target_uri, char *from_uri,
/* Check tdata reference counter. */
if (pj_atomic_get(tdata->ref_cnt) != 1) {
PJ_LOG(3,(THIS_FILE, " Error: tdata reference counter is %d",
PJ_LOG(3,(THIS_FILE, " Error: tdata reference counter is %ld",
pj_atomic_get(tdata->ref_cnt)));
pjsip_tx_data_dec_ref(tdata);
return -150;

2
pjsip/src/test/tsx_uas_test.c
View File

@ -1300,7 +1300,7 @@ static int perform_test( char *target_uri, char *from_uri,
/* Check tdata reference counter. */
if (pj_atomic_get(tdata->ref_cnt) != 1) {
PJ_LOG(3,(THIS_FILE, " Error: tdata reference counter is %d",
PJ_LOG(3,(THIS_FILE, " Error: tdata reference counter is %ld",
pj_atomic_get(tdata->ref_cnt)));
pjsip_tx_data_dec_ref(tdata);
return -50;

2
pjsip/src/test/txdata_test.c
View File

@ -468,7 +468,7 @@ static int txdata_test_uri_params(void)
}
msgbuf[len] = '\0';
PJ_LOG(5,(THIS_FILE, "%d bytes request created:--begin-msg--\n"
PJ_LOG(5,(THIS_FILE, "%ld bytes request created:--begin-msg--\n"
"%s\n"
"--end-msg--", len, msgbuf));

6
pjsip/src/test/uri_test.c
View File

@ -998,7 +998,7 @@ static int uri_benchmark(unsigned *p_parse, unsigned *p_print, unsigned *p_cmp)
avg_parse = 1000000 / avg_parse;
PJ_LOG(3,(THIS_FILE,
" %u.%u MB of urls parsed in %d.%03ds (avg=%d urls/sec)",
" %u.%u MB of urls parsed in %ld.%03lds (avg=%d urls/sec)",
(unsigned)(var.parse_len/1000000), (unsigned)kbytes,
elapsed.sec, elapsed.msec,
(unsigned)avg_parse));
@ -1017,7 +1017,7 @@ static int uri_benchmark(unsigned *p_parse, unsigned *p_print, unsigned *p_cmp)
avg_print = 1000000 / avg_print;
PJ_LOG(3,(THIS_FILE,
" %u.%u MB of urls printed in %d.%03ds (avg=%d urls/sec)",
" %u.%u MB of urls printed in %ld.%03lds (avg=%d urls/sec)",
(unsigned)(var.print_len/1000000), (unsigned)kbytes,
elapsed.sec, elapsed.msec,
(unsigned)avg_print));
@ -1036,7 +1036,7 @@ static int uri_benchmark(unsigned *p_parse, unsigned *p_print, unsigned *p_cmp)
avg_cmp = 1000000 / avg_cmp;
PJ_LOG(3,(THIS_FILE,
" %u.%u MB of urls compared in %d.%03ds (avg=%d urls/sec)",
" %u.%u MB of urls compared in %ld.%03lds (avg=%d urls/sec)",
(unsigned)(var.cmp_len/1000000), (unsigned)kbytes,
elapsed.sec, elapsed.msec,
(unsigned)avg_cmp));