Changeset 5635
- Timestamp:
- Aug 1, 2017 7:49:34 AM (7 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/build/vs/pjproject-vs14-win32-common-defaults.props
r5539 r5635 1 1 <?xml version="1.0" encoding="utf-8"?> 2 2 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3 <ImportGroup Label="PropertySheets"> 3 <ImportGroup Label="PropertySheets"> 4 4 </ImportGroup> 5 5 <PropertyGroup Label="UserMacros"> … … 14 14 <TargetMachine>MachineX86</TargetMachine> 15 15 </Link> 16 <Lib> 17 <AdditionalOptions>/ignore:4221</AdditionalOptions> 18 </Lib> 16 19 </ItemDefinitionGroup> 17 20 <ItemGroup> -
pjproject/trunk/build/vs/pjproject-vs14-win64-common-defaults.props
r5539 r5635 1 1 <?xml version="1.0" encoding="utf-8"?> 2 2 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3 <ImportGroup Label="PropertySheets"> 3 <ImportGroup Label="PropertySheets"> 4 4 </ImportGroup> 5 5 <PropertyGroup Label="UserMacros"> … … 14 14 <TargetMachine>MachineX64</TargetMachine> 15 15 </Link> 16 <Lib> 17 <AdditionalOptions>/ignore:4221</AdditionalOptions> 18 </Lib> 16 19 </ItemDefinitionGroup> 17 20 <ItemGroup> -
pjproject/trunk/pjlib-util/src/pjlib-util/srv_resolver.c
r5559 r5635 663 663 pj_dns_addr_record rec; 664 664 665 /* Avoid warning: potentially uninitialized local variable 'rec' */ 666 rec.alias.slen = 0; 667 rec.addr_count = 0; 668 665 669 /* Clear outstanding job */ 666 670 if (common->type == PJ_DNS_TYPE_A) { … … 692 696 status, 693 697 pj_strerror(status,errmsg,sizeof(errmsg)).ptr)); 694 695 698 } 699 } 696 700 697 701 /* Check that we really have answer */ -
pjproject/trunk/pjlib/src/pj/os_info.c
r5539 r5635 100 100 static pj_uint32_t parse_version(char *str) 101 101 { 102 int i, maxtok, found_idx; 102 int i, maxtok; 103 pj_ssize_t found_idx; 103 104 pj_uint32_t version = 0; 104 105 pj_str_t in_str = pj_str(str); -
pjproject/trunk/pjlib/src/pj/sock_qos_bsd.c
r5444 r5635 104 104 { 105 105 pj_status_t last_err = PJ_ENOTSUP; 106 int val , optlen;106 int val = 0, optlen; 107 107 pj_sockaddr sa; 108 108 int salen = sizeof(salen); -
pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c
r5631 r5635 116 116 # define M_ASN1_STRING_data(x) ASN1_STRING_get0_data(x) 117 117 # define M_ASN1_STRING_length(x) ASN1_STRING_length(x) 118 # define X509_get_notBefore(x) X509_get0_notBefore(x) 119 # define X509_get_notAfter(x) X509_get0_notAfter(x) 118 # if defined(OPENSSL_API_COMPAT) && OPENSSL_API_COMPAT >= 0x10100000L 119 # define X509_get_notBefore(x) X509_get0_notBefore(x) 120 # define X509_get_notAfter(x) X509_get0_notAfter(x) 121 # endif 120 122 #else 121 123 # define SSL_CIPHER_get_id(c) (c)->id … … 133 135 # pragma comment(lib, "ssleay32") 134 136 # endif 137 # define strerror_r(errno,buf,len) strerror_s(buf,len,errno) 135 138 #endif 136 139 -
pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c
r5634 r5635 769 769 { 770 770 pj_str_t token, delim, host; 771 int af, found_idx; 771 int af; 772 pj_ssize_t found_idx; 772 773 pj_status_t status = PJNATH_EICEINCANDSDP; 773 774 -
pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c
r5621 r5635 832 832 /* TX crypto and key */ 833 833 b64_len = sizeof(b64); 834 status = pj_base64_encode((pj_uint8_t*)tx->key.ptr, tx->key.slen,834 status = pj_base64_encode((pj_uint8_t*)tx->key.ptr, (int)tx->key.slen, 835 835 b64, &b64_len); 836 836 if (status != PJ_SUCCESS) … … 849 849 /* RX crypto and key */ 850 850 b64_len = sizeof(b64); 851 status = pj_base64_encode((pj_uint8_t*)rx->key.ptr, rx->key.slen,851 status = pj_base64_encode((pj_uint8_t*)rx->key.ptr, (int)rx->key.slen, 852 852 b64, &b64_len); 853 853 if (status != PJ_SUCCESS) … … 1179 1179 { 1180 1180 transport_srtp *srtp = (transport_srtp *) user_data; 1181 int len = size;1181 int len = (int)size; 1182 1182 srtp_err_status_t err; 1183 1183 void (*cb)(void*, void*, pj_ssize_t) = NULL; … … 1273 1273 { 1274 1274 transport_srtp *srtp = (transport_srtp *) user_data; 1275 int len = size;1275 int len = (int)size; 1276 1276 srtp_err_status_t err; 1277 1277 void (*cb)(void*, void*, pj_ssize_t) = NULL; -
pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c
r5623 r5635 33 33 #include <openssl/ssl.h> 34 34 35 #if OPENSSL_VERSION_NUMBER >= 0x10100000L 35 #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ 36 defined(OPENSSL_API_COMPAT) && OPENSSL_API_COMPAT >= 0x10100000L 36 37 # define X509_get_notBefore(x) X509_getm_notBefore(x) 37 38 # define X509_get_notAfter(x) X509_getm_notAfter(x) -
pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_sdes.c
r5621 r5635 158 158 159 159 /* Key transmitted via SDP should be base64 encoded. */ 160 status = pj_base64_encode((pj_uint8_t*)crypto->key.ptr, crypto->key.slen,160 status = pj_base64_encode((pj_uint8_t*)crypto->key.ptr, (int)crypto->key.slen, 161 161 b64_key, &b64_key_len); 162 162 if (status != PJ_SUCCESS) { … … 192 192 pj_str_t token, delim; 193 193 pj_status_t status; 194 int itmp, found_idx; 194 int itmp; 195 pj_ssize_t found_idx; 195 196 196 197 pj_bzero(crypto, sizeof(*crypto)); -
pjproject/trunk/pjmedia/src/pjmedia/wav_player.c
r5170 r5635 456 456 } 457 457 458 info->size_bytes = pjmedia_wav_player_get_len(port);458 info->size_bytes = (pj_uint32_t)pjmedia_wav_player_get_len(port); 459 459 info->size_samples = info->size_bytes / 460 460 (info->payload_bits_per_sample / 8); -
pjproject/trunk/pjnath/src/pjnath/turn_session.c
r5583 r5635 1779 1779 /* Run pending allocation */ 1780 1780 if (sess->pending_alloc) { 1781 pj_status_t status ;1782 status = pj_turn_session_alloc(sess, NULL);1783 if (status != PJ_SUCCESS)1784 on_session_fail(sess, PJ_STUN_ALLOCATE_METHOD, status , NULL);1781 pj_status_t status2; 1782 status2 = pj_turn_session_alloc(sess, NULL); 1783 if (status2 != PJ_SUCCESS) 1784 on_session_fail(sess, PJ_STUN_ALLOCATE_METHOD, status2, NULL); 1785 1785 } 1786 1786 -
pjproject/trunk/pjsip-apps/src/samples/encdec.c
r5253 r5635 177 177 } 178 178 179 bitstream_size += frm_bit.size;179 bitstream_size += (unsigned)frm_bit.size; 180 180 181 181 /* Parse the bitstream (not really necessary for this case -
pjproject/trunk/pjsip/src/pjsip/sip_resolve.c
r5476 r5635 281 281 unsigned int count = 1; 282 282 pj_addrinfo ai[1]; 283 pj_status_t status ;284 285 status = pj_getaddrinfo(pj_AF_INET6(),283 pj_status_t status2; 284 285 status2 = pj_getaddrinfo(pj_AF_INET6(), 286 286 &target->addr.host, &count, ai); 287 if (status == PJ_SUCCESS && count > 0 &&287 if (status2 == PJ_SUCCESS && count > 0 && 288 288 ai[0].ai_addr.addr.sa_family == pj_AF_INET6()) 289 289 { -
pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c
r5629 r5635 2940 2940 */ 2941 2941 pconst = pjsip_parser_const(); 2942 call_id_len = pj_strncpy2_escape(call_id_dest_buf, &dest_dlg->call_id->id,2943 2944 2942 call_id_len = (int)pj_strncpy2_escape(call_id_dest_buf, &dest_dlg->call_id->id, 2943 PJ_ARRAY_SIZE(call_id_dest_buf), 2944 &pconst->pjsip_HDR_CHAR_SPEC); 2945 2945 if (call_id_len < 0) { 2946 2946 status = PJSIP_EURITOOLONG; -
pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp
r5522 r5635 85 85 verifyMsgs.push_back(verif_msgs[i]); 86 86 } 87 #else 88 PJ_UNUSED_ARG(info); 87 89 #endif 88 90 } … … 1394 1396 1395 1397 srtp_opt->use = prm.srtpUse; 1396 srtp_opt->crypto_count = prm.cryptos.size();1398 srtp_opt->crypto_count = (unsigned)prm.cryptos.size(); 1397 1399 for (unsigned i = 0; i < srtp_opt->crypto_count; i++) { 1398 1400 srtp_opt->crypto[i].key = str2Pj(prm.cryptos[i].key); -
pjproject/trunk/pjsip/src/pjsua2/media.cpp
r5581 r5635 352 352 pj_ssize_t pos = pjsua_player_get_pos(playerId); 353 353 if (pos < 0) { 354 PJSUA2_RAISE_ERROR2( -pos, "AudioMediaPlayer::getPos()");354 PJSUA2_RAISE_ERROR2((pj_status_t)-pos, "AudioMediaPlayer::getPos()"); 355 355 } 356 356 return (pj_uint32_t)pos; … … 509 509 } 510 510 511 status = pjmedia_tonegen_play(tonegen, tones.size(), &tones[0],511 status = pjmedia_tonegen_play(tonegen, (unsigned)tones.size(), &tones[0], 512 512 loop? PJMEDIA_TONEGEN_LOOP : 0); 513 513 PJSUA2_CHECK_RAISE_ERROR2(status, "ToneGenerator::play()"); … … 526 526 } 527 527 528 status = pjmedia_tonegen_play_digits(tonegen, digits.size(), &digits[0],528 status = pjmedia_tonegen_play_digits(tonegen, (unsigned)digits.size(), &digits[0], 529 529 loop? PJMEDIA_TONEGEN_LOOP : 0); 530 530 PJSUA2_CHECK_RAISE_ERROR2(status, "ToneGenerator::playDigits()"); … … 572 572 } 573 573 574 digitMap.count = digit_map.size();574 digitMap.count = (unsigned)digit_map.size(); 575 575 if (digitMap.count > PJ_ARRAY_SIZE(digitMap.digits)) 576 576 digitMap.count = PJ_ARRAY_SIZE(digitMap.digits); -
pjproject/trunk/third_party/build/speex/config.h
r5170 r5635 28 28 # pragma warning(disable: 4018) // signed/unsigned mismatch 29 29 # pragma warning(disable: 4456) // declaration of '[var]' hides previous local declaration 30 # pragma warning(disable: 4267) // conversion from 'size_t' to 'int', possible loss of data 30 31 //# pragma warning(disable: 4701) // local variable used without initialized 31 32 #endif -
pjproject/trunk/third_party/build/srtp/srtp_config.h
r5614 r5635 138 138 # endif 139 139 140 //# pragma warning(disable:4311) 140 # pragma warning(disable:4311) // 'type cast': pointer truncation from 'unsigned char *' to 'unsigned long' 141 141 //# pragma warning(disable:4761) // integral mismatch 142 //# pragma warning(disable:4018) //signed/unsigned mismatch142 # pragma warning(disable:4018) // '<' : signed/unsigned mismatch 143 143 # pragma warning(disable:4244) // conversion from int64 to int 144 144 # pragma warning(disable:4100) // unreferenced formal parameter … … 147 147 # pragma warning(disable:4701) // potentially uninitialized local variable used 148 148 # pragma warning(disable:4702) // unreachable code 149 # pragma warning(disable:4703) // potentially uninitialized local pointer variable used 149 150 #endif 150 151
Note: See TracChangeset
for help on using the changeset viewer.