Fixed warnings (3)

This commit is contained in:
sauwming 2023-02-28 12:49:34 +08:00
parent 74c07aa476
commit ecddafbb1d
27 changed files with 105 additions and 69 deletions

View File

@ -1905,7 +1905,7 @@ PJ_DEF(void) pj_dns_resolver_dump(pj_dns_resolver *resolver,
struct nameserver *ns = &resolver->ns[i];
PJ_LOG(3,(resolver->name.ptr,
" NS %d: %s:%d (state=%s until %ds, rtt=%d ms)",
" NS %d: %s:%d (state=%s until %ds, rtt=%ld ms)",
i,
pj_sockaddr_print(&ns->addr, addr, sizeof(addr), 2),
pj_sockaddr_get_port(&ns->addr),

View File

@ -480,7 +480,7 @@ static pj_status_t get_ipv6_deprecated(unsigned *count, pj_sockaddr addr[])
} netlink_req;
long pagesize = sysconf(_SC_PAGESIZE);
if (!pagesize)
if (pagesize <= 0)
pagesize = 4096; /* Assume pagesize is 4096 if sysconf() failed */
int fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
@ -511,8 +511,10 @@ static pj_status_t get_ipv6_deprecated(unsigned *count, pj_sockaddr addr[])
struct nlmsghdr *nlmsg_ptr = (struct nlmsghdr *) read_buffer;
int nlmsg_len = read_size;
if (nlmsg_len < sizeof (struct nlmsghdr))
if (nlmsg_len < sizeof (struct nlmsghdr)) {
close(fd);
return PJ_ETOOSMALL;
}
if (nlmsg_ptr->nlmsg_type == NLMSG_DONE)
break;

View File

@ -635,8 +635,9 @@ static int udp_test(void)
}
rc = pj_sock_socket(pj_AF_INET(), pj_SOCK_DGRAM(), 0, &cs);
if (rc != 0)
return -110;
if (rc != 0) {
rc = -110; goto on_error;
}
/* Bind server socket. */
pj_bzero(&dstaddr, sizeof(dstaddr));

View File

@ -1207,8 +1207,11 @@ static int server_non_ssl(unsigned ms_timeout)
PJ_LOG(3, ("", "...Done!"));
on_return:
if (asock_serv)
if (asock_serv) {
pj_activesock_close(asock_serv);
} else if (sock != PJ_INVALID_SOCKET) {
pj_sock_close(sock);
}
if (ssock_cli && !state_cli.err && !state_cli.done)
pj_ssl_sock_close(ssock_cli);
if (timer)

View File

@ -49,8 +49,10 @@ pj_status_t app_socket(int family, int type, int proto, int port,
addr.sin_family = (pj_uint16_t)family;
addr.sin_port = (short)(port!=-1 ? pj_htons((pj_uint16_t)port) : 0);
rc = pj_sock_bind(sock, &addr, sizeof(addr));
if (rc != PJ_SUCCESS)
if (rc != PJ_SUCCESS) {
pj_sock_close(sock);
return rc;
}
#if PJ_HAS_TCP
if (type == pj_SOCK_STREAM()) {

View File

@ -985,7 +985,7 @@ PJ_DEF(pj_status_t) pjmedia_codec_ffmpeg_vid_init(pjmedia_vid_codec_mgr *mgr,
if (copied_dir != PJMEDIA_DIR_NONE) {
const char *dir_name[] = {NULL, "encoder", "decoder", "codec"};
PJ_LOG(5, (THIS_FILE, "The %.*s %s is using base codec (%.*s)",
desc->info.encoding_name.slen,
(int)desc->info.encoding_name.slen,
desc->info.encoding_name.ptr,
dir_name[copied_dir],
base_desc->info.encoding_name.slen,
@ -1004,12 +1004,12 @@ PJ_DEF(pj_status_t) pjmedia_codec_ffmpeg_vid_init(pjmedia_vid_codec_mgr *mgr,
/* Print warning about missing encoder/decoder */
if (!desc->enc) {
PJ_LOG(4, (THIS_FILE, "Cannot find %.*s encoder in ffmpeg library",
desc->info.encoding_name.slen,
(int)desc->info.encoding_name.slen,
desc->info.encoding_name.ptr));
}
if (!desc->dec) {
PJ_LOG(4, (THIS_FILE, "Cannot find %.*s decoder in ffmpeg library",
desc->info.encoding_name.slen,
(int)desc->info.encoding_name.slen,
desc->info.encoding_name.ptr));
}
}
@ -1191,6 +1191,10 @@ static pj_status_t ffmpeg_alloc_codec( pjmedia_vid_codec_factory *factory,
/* Create pool for codec instance */
pool = pj_pool_create(ffmpeg_factory.pf, "ffmpeg codec", 512, 512, NULL);
if (!pool) {
status = PJ_ENOMEM;
goto on_error;
}
codec = PJ_POOL_ZALLOC_T(pool, pjmedia_vid_codec);
if (!codec) {
status = PJ_ENOMEM;

View File

@ -391,14 +391,19 @@ PJ_DEF(pj_status_t) pjmedia_codec_g7221_set_mode(unsigned sample_rate,
if (codec_factory.modes[i].sample_rate == sample_rate &&
codec_factory.modes[i].bitrate == bitrate)
{
pj_status_t status;
codec_factory.modes[i].enabled = enabled;
/* Re-register G722.1 codec factory to update codec list */
pjmedia_codec_mgr_unregister_factory(codec_mgr,
&codec_factory.base);
pjmedia_codec_mgr_register_factory(codec_mgr,
&codec_factory.base);
return PJ_SUCCESS;
status = pjmedia_codec_mgr_unregister_factory(codec_mgr,
&codec_factory.base);
if (status != PJ_SUCCESS)
return status;
status = pjmedia_codec_mgr_register_factory(codec_mgr,
&codec_factory.base);
return status;
}
}
@ -418,19 +423,24 @@ PJ_DEF(pj_status_t) pjmedia_codec_g7221_set_mode(unsigned sample_rate,
{
if (!codec_factory.modes[i].enabled)
{
pj_status_t status;
codec_mode *mode = &codec_factory.modes[i];
mode->enabled = PJ_TRUE;
mode->sample_rate = sample_rate;
mode->bitrate = bitrate;
pj_utoa(mode->bitrate, mode->bitrate_str);
/* Re-register G722.1 codec factory to update codec list */
pjmedia_codec_mgr_unregister_factory(codec_mgr,
&codec_factory.base);
pjmedia_codec_mgr_register_factory(codec_mgr,
&codec_factory.base);
status = pjmedia_codec_mgr_unregister_factory(codec_mgr,
&codec_factory.base);
if (status != PJ_SUCCESS)
return status;
return PJ_SUCCESS;
status = pjmedia_codec_mgr_register_factory(codec_mgr,
&codec_factory.base);
return status;
}
}

View File

@ -172,7 +172,7 @@ PJ_DEF(pj_status_t) pjmedia_h264_packetize(pjmedia_h264_packetizer *pktz,
//pj_assert(!"MTU too small for H.264 single NAL packetization mode");
PJ_LOG(2,(THIS_FILE,
"MTU too small for H.264 (required=%u, MTU=%u)",
nal_end - nal_start, pktz->cfg.mtu));
(unsigned)(nal_end - nal_start), pktz->cfg.mtu));
return PJ_ETOOSMALL;
}

View File

@ -1150,7 +1150,7 @@ static pj_status_t oh264_codec_decode(pjmedia_vid_codec *codec,
output->timestamp = packets[0].timestamp;
PJ_LOG(5,(THIS_FILE, "Decode couldn't produce picture, "
"input nframes=%d, concatenated size=%d bytes, ret=%d",
"input nframes=%lu, concatenated size=%d bytes, ret=%d",
count, whole_len, ret));
}

View File

@ -829,7 +829,7 @@ on_return:
PJMEDIA_EVENT_PUBLISH_DEFAULT);
PJ_LOG(4,(THIS_FILE, "Decode couldn't produce picture, "
"input nframes=%d, concatenated size=%d bytes",
"input nframes=%lu, concatenated size=%d bytes",
count, whole_len));
output->type = PJMEDIA_FRAME_TYPE_NONE;

View File

@ -398,7 +398,10 @@ PJ_DEF(pj_status_t) pjmedia_avi_dev_alloc( pjmedia_vid_dev_factory *f,
/* Reinit */
PJ_ASSERT_RETURN(p->path.slen, PJ_EINVAL);
adi->pool = pj_pool_create(cf->pf, "avidi%p", 512, 512, NULL);
if (!adi->pool) {
status = PJ_ENOMEM;
goto on_error;
}
/* Open the AVI */
pj_strdup_with_null(adi->pool, &adi->fpath, &p->path);

View File

@ -1237,7 +1237,7 @@ static pj_status_t set_cap(void *data)
status = sdl_create_window(strm, PJ_TRUE, sdl_info->sdl_format, hwnd);
PJ_PERROR(4, (THIS_FILE, status,
"Re-initializing SDL with native window %d",
"Re-initializing SDL with native window %p",
hwnd->info.window));
return status;
} else if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_FULLSCREEN) {

View File

@ -1023,8 +1023,8 @@ PJ_DEF(void) pjmedia_rtcp_build_rtcp(pjmedia_rtcp_session *sess,
dlsr = (pj_uint32_t)(ts.u64 - lsr_time);
rr->dlsr = pj_htonl(dlsr);
TRACE_((sess->name,"Tx RTCP RR: lsr=%p, lsr_time=%p, now=%p, dlsr=%p"
"(%ds:%03dms)",
TRACE_((sess->name,"Tx RTCP RR: lsr=%u, lsr_time=%u, now=%u, dlsr=%u"
"(%us:%03ums)",
lsr,
(pj_uint32_t)lsr_time,
(pj_uint32_t)ts.u64,

View File

@ -1180,6 +1180,7 @@ static pj_status_t dtls_on_recv_rtp( pjmedia_transport *tp,
pjmedia_transport_get_info(ds->srtp->member_tp, &info);
if (pj_sockaddr_cmp(&ds->rem_addr, &info.src_rtp_name)) {
pjmedia_transport_attach_param ap;
pj_status_t status;
pj_bzero(&ap, sizeof(ap));
ap.user_data = ds->srtp;
@ -1200,7 +1201,9 @@ static pj_status_t dtls_on_recv_rtp( pjmedia_transport *tp,
pj_sockaddr_get_port(&ds->rem_addr)+1);
}
pjmedia_transport_attach2(&ds->srtp->base, &ap);
status = pjmedia_transport_attach2(&ds->srtp->base, &ap);
if (status != PJ_SUCCESS)
return status;
#if DTLS_DEBUG
{

View File

@ -277,7 +277,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_conf_create(
sizeof(vconf_port*));
if (!vid_conf->ports) {
PJ_PERROR(1, (THIS_FILE, PJ_ENOMEM, "Create failed in alloc ports"));
pjmedia_vid_conf_destroy(vid_conf);
pj_pool_safe_release(&vid_conf->pool);
return PJ_ENOMEM;
}

View File

@ -1376,8 +1376,8 @@ static pj_status_t vid_pasv_port_put_frame(struct pjmedia_port *this_port,
if (frame->size != vp->src_size) {
if (frame->size > 0) {
PJ_LOG(4, (THIS_FILE, "Unexpected frame size %d, expected %d",
frame->size, vp->src_size));
PJ_LOG(4,(THIS_FILE, "Unexpected frame size %lu, expected %lu",
frame->size, vp->src_size));
}
pj_memcpy(&frame_, frame, sizeof(pjmedia_frame));

View File

@ -1720,7 +1720,7 @@ static pj_status_t create_channel( pj_pool_t *pool,
pi->fmt.det.vid.size.w, pi->fmt.det.vid.size.h,
pjmedia_fourcc_name(pi->fmt.id, fourcc_name),
(dir==PJMEDIA_DIR_ENCODING?"->":"<-"),
info->codec_info.encoding_name.slen,
(int)info->codec_info.encoding_name.slen,
info->codec_info.encoding_name.ptr,
pi->fmt.det.vid.fps.num, pi->fmt.det.vid.fps.denum,
pi->fmt.det.vid.fps.num/pi->fmt.det.vid.fps.denum));

View File

@ -411,8 +411,7 @@ pjmedia_vid_dev_get_global_index(const pjmedia_vid_dev_factory *f,
unsigned local_idx,
pjmedia_vid_dev_index *pid)
{
PJ_ASSERT_RETURN(f->sys.drv_idx >= 0 && f->sys.drv_idx < MAX_DRIVERS,
PJ_EINVALIDOP);
PJ_ASSERT_RETURN(f->sys.drv_idx < MAX_DRIVERS, PJ_EINVALIDOP);
*pid = local_idx;
return make_global_index(f->sys.drv_idx, pid);
}

View File

@ -173,7 +173,7 @@ static int enum_codecs()
for (i = 0; i < cnt; ++i) {
PJ_LOG(3, (THIS_FILE, " %-16.*s %c%c %s",
info[i].encoding_name.slen, info[i].encoding_name.ptr,
(int)info[i].encoding_name.slen, info[i].encoding_name.ptr,
(info[i].dir & PJMEDIA_DIR_ENCODING? 'E' : ' '),
(info[i].dir & PJMEDIA_DIR_DECODING? 'D' : ' '),
dump_codec_info(&info[i])));
@ -395,7 +395,7 @@ static int encode_decode_test(pj_pool_t *pool, const char *codec_id,
PJ_LOG(3, (THIS_FILE, " starting codec test: %s<->%.*s %dx%d",
pjmedia_fourcc_name(codec_param.dec_fmt.id, codec_name),
codec_info->encoding_name.slen,
(int)codec_info->encoding_name.slen,
codec_info->encoding_name.ptr,
codec_param.dec_fmt.det.vid.size.w,
codec_param.dec_fmt.det.vid.size.h

View File

@ -148,6 +148,7 @@ static const char *action_get_external_ip(struct igd *igd)
IXML_Document *response = NULL;
const char *public_ip = NULL;
int upnp_err;
pj_status_t status;
/* Create action XML. */
action = UpnpMakeAction(action_name, igd->service_type.ptr, 0, NULL);
@ -175,8 +176,10 @@ static const char *action_get_external_ip(struct igd *igd)
goto on_error;
}
pj_strdup2_with_null(upnp_mgr.pool, &igd->public_ip, public_ip);
pj_sockaddr_parse(pj_AF_UNSPEC(), 0, &igd->public_ip,
&igd->public_ip_addr);
status = pj_sockaddr_parse(pj_AF_UNSPEC(), 0, &igd->public_ip,
&igd->public_ip_addr);
if (status != PJ_SUCCESS)
goto on_error;
public_ip = igd->public_ip.ptr;
on_error:
@ -563,6 +566,7 @@ PJ_DEF(pj_status_t) pj_upnp_init(const pj_upnp_init_param *param)
unsigned short port;
const char *ip_address6 = NULL;
unsigned short port6 = 0;
pj_status_t status;
if (upnp_mgr.initialized)
return PJ_SUCCESS;
@ -615,7 +619,11 @@ PJ_DEF(pj_status_t) pj_upnp_init(const pj_upnp_init_param *param)
pj_upnp_deinit();
return PJ_ENOMEM;
}
pj_mutex_create_recursive(upnp_mgr.pool, "upnp", &upnp_mgr.mutex);
status = pj_mutex_create_recursive(upnp_mgr.pool, "upnp", &upnp_mgr.mutex);
if (status != PJ_SUCCESS) {
pj_upnp_deinit();
return status;
}
ip_address = UpnpGetServerIpAddress();
port = UpnpGetServerPort();
@ -787,8 +795,8 @@ PJ_DECL(pj_status_t)pj_upnp_add_port_mapping(unsigned sock_cnt,
if (response) ixmlDocument_free(response);
pj_sockaddr_cp(&mapped_addr[i], &bound_addr);
pj_sockaddr_set_str_addr(bound_addr.addr.sa_family,
&mapped_addr[i], &igd->public_ip);
status = pj_sockaddr_set_str_addr(bound_addr.addr.sa_family,
&mapped_addr[i], &igd->public_ip);
pj_sockaddr_set_port(&mapped_addr[i],
(pj_uint16_t)(ext_port? ext_port[i]: int_port));

View File

@ -372,7 +372,7 @@ static pj_bool_t stun_sock_on_status(pj_stun_sock *stun_sock,
pj_sockaddr_cp(&peer->mapped_addr, &info.mapped_addr);
pj_sockaddr_print(&peer->mapped_addr, straddr, sizeof(straddr), 3);
PJ_LOG(3,(THIS_FILE, "peer%d: STUN mapped address is %s",
PJ_LOG(3,(THIS_FILE, "peer%ld: STUN mapped address is %s",
peer-g.peer, straddr));
}
}

View File

@ -2614,7 +2614,7 @@ public:
/**
* Default constructor
*/
MediaEvent() : type(PJMEDIA_EVENT_NONE)
MediaEvent() : type(PJMEDIA_EVENT_NONE), pjMediaEvent(NULL)
{}
/**

View File

@ -594,7 +594,7 @@ struct TsxStateEventSrc
pj_status_t status; /**< Transport error status. */
GenericData data; /**< Generic data. */
TsxStateEventSrc() : status() {}
TsxStateEventSrc() : status(), data(NULL) {}
};
/**

View File

@ -372,7 +372,7 @@ PJ_DEF(pj_status_t) pjsip_regc_init( pjsip_regc *regc,
PJSIP_PARSE_URI_AS_NAMEADDR);
if (!regc->from_hdr->uri) {
PJ_LOG(4,(THIS_FILE, "regc: invalid source URI %.*s",
from_url->slen, from_url->ptr));
(int)from_url->slen, from_url->ptr));
return PJSIP_EINVALIDURI;
}
@ -382,7 +382,8 @@ PJ_DEF(pj_status_t) pjsip_regc_init( pjsip_regc *regc,
regc->to_hdr->uri = pjsip_parse_uri(regc->pool, tmp.ptr, tmp.slen,
PJSIP_PARSE_URI_AS_NAMEADDR);
if (!regc->to_hdr->uri) {
PJ_LOG(4,(THIS_FILE, "regc: invalid target URI %.*s", to_url->slen, to_url->ptr));
PJ_LOG(4,(THIS_FILE, "regc: invalid target URI %.*s",
(int)to_url->slen, to_url->ptr));
return PJSIP_EINVALIDURI;
}

View File

@ -498,11 +498,11 @@ static pj_status_t respond_digest( pj_pool_t *pool,
pj_stricmp(&chal->algorithm, &pjsip_AKAv1_MD5_STR)==0))
{
PJ_LOG(4,(THIS_FILE, "Digest algorithm is \"%.*s\"",
chal->algorithm.slen, chal->algorithm.ptr));
(int)chal->algorithm.slen, chal->algorithm.ptr));
}
else {
PJ_LOG(4,(THIS_FILE, "Unsupported digest algorithm \"%.*s\"",
chal->algorithm.slen, chal->algorithm.ptr));
(int)chal->algorithm.slen, chal->algorithm.ptr));
return PJSIP_EINVALIDALGORITHM;
}
@ -581,7 +581,7 @@ static pj_status_t respond_digest( pj_pool_t *pool,
} else {
/* Server requires quality protection that we don't support. */
PJ_LOG(4,(THIS_FILE, "Unsupported qop offer %.*s",
chal->qop.slen, chal->qop.ptr));
(int)chal->qop.slen, chal->qop.ptr));
return PJSIP_EINVALIDQOP;
}
@ -1338,9 +1338,9 @@ static pj_status_t process_auth( pj_pool_t *req_pool,
*/
PJ_LOG(4, (THIS_FILE, "Authorization failed for %.*s@%.*s: "
"server rejected with stale=false",
sent_auth->credential.digest.username.slen,
(int)sent_auth->credential.digest.username.slen,
sent_auth->credential.digest.username.ptr,
sent_auth->credential.digest.realm.slen,
(int)sent_auth->credential.digest.realm.slen,
sent_auth->credential.digest.realm.ptr));
return PJSIP_EFAILEDCREDENTIAL;
}
@ -1352,9 +1352,9 @@ static pj_status_t process_auth( pj_pool_t *req_pool,
*/
PJ_LOG(4, (THIS_FILE, "Authorization failed for %.*s@%.*s: "
"maximum number of stale retries exceeded",
sent_auth->credential.digest.username.slen,
(int)sent_auth->credential.digest.username.slen,
sent_auth->credential.digest.username.ptr,
sent_auth->credential.digest.realm.slen,
(int)sent_auth->credential.digest.realm.slen,
sent_auth->credential.digest.realm.ptr));
return PJSIP_EAUTHSTALECOUNT;
}
@ -1371,9 +1371,10 @@ static pj_status_t process_auth( pj_pool_t *req_pool,
if (!cred) {
const pj_str_t *realm = &hchal->challenge.common.realm;
PJ_LOG(4,(THIS_FILE,
"Unable to set auth for %s: can not find credential for %.*s/%.*s",
"Unable to set auth for %s: can not find credential for "
"%.*s/%.*s",
tdata->obj_name,
realm->slen, realm->ptr,
(int)realm->slen, realm->ptr,
hchal->scheme.slen, hchal->scheme.ptr));
return PJSIP_ENOCREDENTIAL;
}

View File

@ -1642,7 +1642,7 @@ pj_status_t call_media_on_event(pjmedia_event *event,
void *user_data)
{
pjsua_call_media *call_med = (pjsua_call_media*)user_data;
pjsua_call *call = call_med? call_med->call : NULL;
pjsua_call *call = call_med->call;
char ev_name[5];
pj_status_t status = PJ_SUCCESS;
@ -1751,18 +1751,12 @@ pj_status_t call_media_on_event(pjmedia_event *event,
}
pj_mutex_unlock(pjsua_var.timer_mutex);
if (call) {
if (call->hanging_up)
return status;
eve->call_id = call->index;
eve->med_idx = call_med->idx;
} else {
/* Also deliver non call events such as audio device error */
eve->call_id = PJSUA_INVALID_ID;
eve->med_idx = 0;
}
if (call->hanging_up)
return status;
eve->call_id = call->index;
eve->med_idx = call_med->idx;
pj_memcpy(&eve->event, event, sizeof(pjmedia_event));
pjsua_schedule_timer2(&call_med_event_cb, eve, 1);
}

View File

@ -556,7 +556,10 @@ static pjsua_vid_win_id vid_preview_get_win(pjmedia_vid_dev_index id,
/* Get real capture ID, if set to PJMEDIA_VID_DEFAULT_CAPTURE_DEV */
if (id == PJMEDIA_VID_DEFAULT_CAPTURE_DEV) {
pjmedia_vid_dev_info info;
pjmedia_vid_dev_get_info(id, &info);
if (pjmedia_vid_dev_get_info(id, &info) != PJ_SUCCESS) {
PJSUA_UNLOCK();
return wid;
}
id = info.id;
}
@ -2661,7 +2664,9 @@ PJ_DEF(pj_status_t) pjsua_call_set_vid_strm (
*/
if (param_.cap_dev == PJMEDIA_VID_DEFAULT_CAPTURE_DEV) {
pjmedia_vid_dev_info info;
pjmedia_vid_dev_get_info(param_.cap_dev, &info);
status = pjmedia_vid_dev_get_info(param_.cap_dev, &info);
if (status != PJ_SUCCESS)
goto on_return;
pj_assert(info.dir == PJMEDIA_DIR_CAPTURE);
param_.cap_dev = info.id;
}