[Pkg-voip-commits] [pjproject] 03/05: svn snapshow 4723: most patches merged
tzafrir at debian.org
tzafrir at debian.org
Tue Feb 18 10:59:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
tzafrir pushed a commit to branch master
in repository pjproject.
commit 2eede97859d13594872d3521e82c5db09a1d802f
Author: Tzafrir Cohen <tzafrir at debian.org>
Date: Thu Jan 30 20:55:46 2014 +0200
svn snapshow 4723: most patches merged
A slightly newer upstream SVN snapshot. 5 of our 9 patches were merged.
---
debian/changelog | 2 +-
debian/patches/fix_gcc_warn.patch | 300 ----------------------------
debian/patches/fix_no_video.patch | 28 ---
debian/patches/milenage.patch | 49 -----
debian/patches/no_libasound.patch | 3 +
debian/patches/no_libnsl.patch | 6 +
debian/patches/reduce_pjlib_linkage.patch | 3 +
debian/patches/reduce_pjmedia_linkage.patch | 3 +
debian/patches/series | 7 +-
debian/patches/srtp_deinit.patch | 17 --
debian/patches/symbols_diet.patch | 219 --------------------
debian/patches/typos.patch | 58 ------
12 files changed, 17 insertions(+), 678 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f765174..b13ba9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pjproject (2.2~svn.4703~dfsg-1) UNRELEASED; urgency=low
+pjproject (2.2~svn.4723~dfsg-1) UNRELEASED; urgency=low
* -dev package: depend explicitly on libsrtp0-dev due to -lsrtp in
the pkg-config file.
diff --git a/debian/patches/fix_gcc_warn.patch b/debian/patches/fix_gcc_warn.patch
deleted file mode 100644
index 90c2132..0000000
--- a/debian/patches/fix_gcc_warn.patch
+++ /dev/null
@@ -1,300 +0,0 @@
-Author: Tzafrir Cohen <tzafrir at debian.org>
-Description: fix gcc build warnings. Mostly "set but not used"
-
---- a/pjlib/src/pjlib-test/activesock.c
-+++ b/pjlib/src/pjlib-test/activesock.c
-@@ -101,7 +101,6 @@ static pj_status_t udp_echo_srv_create(p
- struct udp_echo_srv *srv;
- pj_sock_t sock_fd = PJ_INVALID_SOCKET;
- pj_sockaddr addr;
-- int addr_len;
- pj_activesock_cb activesock_cb;
- pj_status_t status;
-
-@@ -109,7 +108,6 @@ static pj_status_t udp_echo_srv_create(p
- srv->echo_enabled = enable_echo;
-
- pj_sockaddr_in_init(&addr.ipv4, NULL, 0);
-- addr_len = sizeof(addr);
-
- pj_bzero(&activesock_cb, sizeof(activesock_cb));
- activesock_cb.on_data_recvfrom = &udp_echo_srv_on_data_recvfrom;
---- a/pjlib/src/pjlib-test/test.c
-+++ b/pjlib/src/pjlib-test/test.c
-@@ -215,10 +215,9 @@ on_return:
-
- int test_main(void)
- {
-- int i;
- PJ_USE_EXCEPTION;
-
-- i = pj_AF_INET();
-+ pj_AF_INET();
-
- PJ_TRY {
- return test_inner();
---- a/pjlib-util/src/pjlib-util/dns.c
-+++ b/pjlib-util/src/pjlib-util/dns.c
-@@ -59,7 +59,7 @@ PJ_DEF(pj_status_t) pj_dns_make_query( v
- int qtype,
- const pj_str_t *name)
- {
-- pj_uint8_t *query, *p = (pj_uint8_t*)packet;
-+ pj_uint8_t *p = (pj_uint8_t*)packet;
- const char *startlabel, *endlabel, *endname;
- unsigned d;
-
-@@ -80,7 +80,7 @@ PJ_DEF(pj_status_t) pj_dns_make_query( v
- write16(p+4, (pj_uint16_t)1);
-
- /* Initialize query */
-- query = p = ((pj_uint8_t*)packet)+sizeof(pj_dns_hdr);
-+ p = ((pj_uint8_t*)packet)+sizeof(pj_dns_hdr);
-
- /* Tokenize name */
- startlabel = endlabel = name->ptr;
---- a/pjnath/src/pjnath/stun_msg.c
-+++ b/pjnath/src/pjnath/stun_msg.c
-@@ -2300,7 +2300,6 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(p
- {
-
- pj_stun_msg *msg;
-- unsigned uattr_cnt;
- const pj_uint8_t *start_pdu = pdu;
- pj_bool_t has_msg_int = PJ_FALSE;
- pj_bool_t has_fingerprint = PJ_FALSE;
-@@ -2339,7 +2338,6 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(p
- p_response = NULL;
-
- /* Parse attributes */
-- uattr_cnt = 0;
- while (pdu_len >= 4) {
- unsigned attr_type, attr_val_len;
- const struct attr_desc *adesc;
---- a/pjnath/src/pjnath/stun_sock.c
-+++ b/pjnath/src/pjnath/stun_sock.c
-@@ -907,9 +907,8 @@ static pj_bool_t on_data_recvfrom(pj_act
-
- process_app_data:
- if (stun_sock->cb.on_rx_data) {
-- pj_bool_t ret;
-
-- ret = (*stun_sock->cb.on_rx_data)(stun_sock, data, size,
-+ (*stun_sock->cb.on_rx_data)(stun_sock, data, size,
- src_addr, addr_len);
- status = pj_grp_lock_release(stun_sock->grp_lock);
- return status!=PJ_EGONE ? PJ_TRUE : PJ_FALSE;
---- a/pjmedia/src/pjmedia/rtcp.c
-+++ b/pjmedia/src/pjmedia/rtcp.c
-@@ -286,7 +286,6 @@ PJ_DEF(void) pjmedia_rtcp_rx_rtp2(pjmedi
- pj_uint32_t arrival;
- pj_int32_t transit;
- pjmedia_rtp_status seq_st;
-- unsigned last_seq;
-
- #if !defined(PJMEDIA_HAS_RTCP_XR) || (PJMEDIA_HAS_RTCP_XR == 0)
- PJ_UNUSED_ARG(discarded);
-@@ -301,7 +300,6 @@ PJ_DEF(void) pjmedia_rtcp_rx_rtp2(pjmedi
- sess->stat.rx.bytes += payload;
-
- /* Process the RTP packet. */
-- last_seq = sess->seq_ctrl.max_seq;
- pjmedia_rtp_seq_update(&sess->seq_ctrl, (pj_uint16_t)seq, &seq_st);
-
- if (seq_st.status.flag.restart) {
-@@ -806,7 +804,6 @@ PJ_DEF(void) pjmedia_rtcp_build_rtcp(pjm
- void **ret_p_pkt, int *len)
- {
- pj_uint32_t expected, expected_interval, received_interval, lost_interval;
-- pjmedia_rtcp_common *common;
- pjmedia_rtcp_sr *sr;
- pjmedia_rtcp_rr *rr;
- pj_timestamp ts_now;
-@@ -827,7 +824,6 @@ PJ_DEF(void) pjmedia_rtcp_build_rtcp(pjm
- /* So we should send RTCP SR */
- *ret_p_pkt = (void*) &sess->rtcp_sr_pkt;
- *len = sizeof(pjmedia_rtcp_sr_pkt);
-- common = &sess->rtcp_sr_pkt.common;
- rr = &sess->rtcp_sr_pkt.rr;
- sr = &sess->rtcp_sr_pkt.sr;
-
-@@ -858,7 +854,6 @@ PJ_DEF(void) pjmedia_rtcp_build_rtcp(pjm
- /* We should send RTCP RR then */
- *ret_p_pkt = (void*) &sess->rtcp_rr_pkt;
- *len = sizeof(pjmedia_rtcp_rr_pkt);
-- common = &sess->rtcp_rr_pkt.common;
- rr = &sess->rtcp_rr_pkt.rr;
- sr = NULL;
- }
---- a/pjmedia/src/pjmedia/sdp_neg.c
-+++ b/pjmedia/src/pjmedia/sdp_neg.c
-@@ -1033,7 +1033,6 @@ static pj_status_t match_offer(pj_pool_t
- {
- unsigned i;
- pj_bool_t master_has_codec = 0,
-- master_has_telephone_event = 0,
- master_has_other = 0,
- found_matching_codec = 0,
- found_matching_telephone_event = 0,
-@@ -1129,7 +1128,6 @@ static pj_status_t match_offer(pj_pool_t
- pjmedia_sdp_attr_get_rtpmap(a, &or_);
-
- if (!pj_stricmp2(&or_.enc_name, "telephone-event")) {
-- master_has_telephone_event = 1;
- if (found_matching_telephone_event)
- continue;
- is_codec = 0;
---- a/pjmedia/src/test/codec_vectors.c
-+++ b/pjmedia/src/test/codec_vectors.c
-@@ -125,9 +125,7 @@ static int codec_test_encode(pjmedia_cod
- }
-
- if (out_frame.size) {
-- int cnt;
--
-- cnt = fwrite(out_frame.buf, out_frame.size, 1, output);
-+ fwrite(out_frame.buf, out_frame.size, 1, output);
-
- if (encoded_frame_len == 0)
- encoded_frame_len = out_frame.size;
---- a/pjsip/src/pjsip/sip_transport_udp.c
-+++ b/pjsip/src/pjsip/sip_transport_udp.c
-@@ -619,11 +619,10 @@ static pj_status_t register_to_ioqueue(s
- /* Start ioqueue asynchronous reading to all rdata */
- static pj_status_t start_async_read(struct udp_transport *tp)
- {
-- pj_ioqueue_t *ioqueue;
- int i;
- pj_status_t status;
-
-- ioqueue = pjsip_endpt_get_ioqueue(tp->base.endpt);
-+ pjsip_endpt_get_ioqueue(tp->base.endpt);
-
- /* Start reading the ioqueue. */
- for (i=0; i<tp->rdata_cnt; ++i) {
---- a/pjsip/src/pjsip/sip_transaction.c
-+++ b/pjsip/src/pjsip/sip_transaction.c
-@@ -270,10 +270,9 @@ static pj_status_t create_tsx_key_2543(
- const pjsip_rx_data *rdata )
- {
- #define SEPARATOR '$'
-- char *key, *p, *end;
-+ char *key, *p;
- int len;
- pj_size_t len_required;
-- pjsip_uri *req_uri;
- pj_str_t *host;
-
- PJ_ASSERT_RETURN(pool && str && method && rdata, PJ_EINVAL);
-@@ -283,7 +282,7 @@ static pj_status_t create_tsx_key_2543(
- PJ_ASSERT_RETURN(rdata->msg_info.from, PJSIP_EMISSINGHDR);
-
- host = &rdata->msg_info.via->sent_by.host;
-- req_uri = (pjsip_uri*)rdata->msg_info.msg->line.req.uri;
-+ (pjsip_uri*)rdata->msg_info.msg->line.req.uri;
-
- /* Calculate length required. */
- len_required = 9 + /* CSeq number */
-@@ -293,7 +292,6 @@ static pj_status_t create_tsx_key_2543(
- 9 + /* Via port. */
- 16; /* Separator+Allowance. */
- key = p = (char*) pj_pool_alloc(pool, len_required);
-- end = p + len_required;
-
- /* Add role. */
- *p++ = (char)(role==PJSIP_ROLE_UAC ? 'c' : 's');
-@@ -1707,7 +1705,6 @@ PJ_DEF(void) pjsip_tsx_recv_msg( pjsip_t
- {
- pjsip_event event;
- struct tsx_lock_data lck;
-- pj_status_t status;
-
- PJ_LOG(5,(tsx->obj_name, "Incoming %s in state %s",
- pjsip_rx_data_get_info(rdata), state_str[tsx->state]));
-@@ -1721,7 +1718,7 @@ PJ_DEF(void) pjsip_tsx_recv_msg( pjsip_t
-
- /* Dispatch to transaction. */
- lock_tsx(tsx, &lck);
-- status = (*tsx->state_handler)(tsx, &event);
-+ (*tsx->state_handler)(tsx, &event);
- unlock_tsx(tsx, &lck);
-
- pj_log_pop_indent();
---- a/pjsip/src/pjsua-lib/pjsua_call.c
-+++ b/pjsip/src/pjsua-lib/pjsua_call.c
-@@ -4461,12 +4461,9 @@ static void pjsua_call_on_tsx_state_chan
- * Incoming MESSAGE request!
- */
- pjsip_rx_data *rdata;
-- pjsip_msg *msg;
- pjsip_accept_hdr *accept_hdr;
-- pj_status_t status;
-
- rdata = e->body.tsx_state.src.rdata;
-- msg = rdata->msg_info.msg;
-
- /* Request MUST have message body, with Content-Type equal to
- * "text/plain".
-@@ -4486,7 +4483,7 @@ static void pjsua_call_on_tsx_state_chan
- /* Respond with 200 first, so that remote doesn't retransmit in case
- * the UI takes too long to process the message.
- */
-- status = pjsip_dlg_respond( inv->dlg, rdata, 200, NULL, NULL, NULL);
-+ pjsip_dlg_respond( inv->dlg, rdata, 200, NULL, NULL, NULL);
-
- /* Process MESSAGE request */
- pjsua_im_process_pager(call->index, &inv->dlg->remote.info_str,
---- a/pjsip/src/pjsua-lib/pjsua_im.c
-+++ b/pjsip/src/pjsua-lib/pjsua_im.c
-@@ -274,7 +274,6 @@ static pj_bool_t im_on_rx_request(pjsip_
- pj_str_t from, to;
- pjsip_accept_hdr *accept_hdr;
- pjsip_msg *msg;
-- pj_status_t status;
-
- msg = rdata->msg_info.msg;
-
-@@ -306,7 +305,7 @@ static pj_bool_t im_on_rx_request(pjsip_
- /* Respond with 200 first, so that remote doesn't retransmit in case
- * the UI takes too long to process the message.
- */
-- status = pjsip_endpt_respond( pjsua_var.endpt, NULL, rdata, 200, NULL,
-+ pjsip_endpt_respond( pjsua_var.endpt, NULL, rdata, 200, NULL,
- NULL, NULL, NULL);
-
- /* For the source URI, we use Contact header if present, since
---- a/pjsip/src/test/msg_err_test.c
-+++ b/pjsip/src/test/msg_err_test.c
-@@ -81,11 +81,10 @@ int msg_err_test(void)
-
- for (i=0; i<PJ_ARRAY_SIZE(test_entries); ++i) {
- pjsip_parser_err_report err_list, *e;
-- pjsip_msg *msg;
-
- PJ_LOG(3,(THIS_FILE, " Parsing msg %d", i));
- pj_list_init(&err_list);
-- msg = pjsip_parse_msg(pool, test_entries[i].msg,
-+ pjsip_parse_msg(pool, test_entries[i].msg,
- strlen(test_entries[i].msg), &err_list);
-
- e = err_list.next;
---- a/pjsip/src/test/regc_test.c
-+++ b/pjsip/src/test/regc_test.c
-@@ -542,7 +542,7 @@ static int update_test(const pj_str_t *r
-
- pjsip_regc *regc;
- pjsip_contact_hdr *h1, *h2;
-- pjsip_sip_uri *u1, *u2;
-+ pjsip_sip_uri *u1;
- unsigned i;
- pj_status_t status;
- pjsip_tx_data *tdata = NULL;
-@@ -599,7 +599,7 @@ static int update_test(const pj_str_t *r
- }
-
- u1 = (pjsip_sip_uri*) pjsip_uri_get_uri(h1->uri);
-- u2 = (pjsip_sip_uri*) pjsip_uri_get_uri(h2->uri);
-+ (pjsip_sip_uri*) pjsip_uri_get_uri(h2->uri);
-
- if (*u1->host.ptr == 'a') {
- if (h1->expires != 0) {
diff --git a/debian/patches/fix_no_video.patch b/debian/patches/fix_no_video.patch
deleted file mode 100644
index ba1577b..0000000
--- a/debian/patches/fix_no_video.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: some places failed to detect we build with no video
-Author: Tzafrir Cohen <tzafrir at debian.org>
-
---- a/pjmedia/src/pjmedia-videodev/sdl_dev.c
-+++ b/pjmedia/src/pjmedia-videodev/sdl_dev.c
-@@ -21,6 +21,9 @@
- #include <pj/log.h>
- #include <pj/os.h>
-
-+#if (! defined(PJMEDIA_HAS_VIDEO)) || (PJMEDIA_HAS_VIDEO == 0)
-+# undef PJMEDIA_VIDEO_DEV_HAS_SDL
-+#endif
- #if defined(PJMEDIA_VIDEO_DEV_HAS_SDL) && PJMEDIA_VIDEO_DEV_HAS_SDL != 0
- #include <SDL.h>
- #include <SDL_syswm.h>
---- a/pjmedia/src/pjmedia-videodev/v4l2_dev.c
-+++ b/pjmedia/src/pjmedia-videodev/v4l2_dev.c
-@@ -25,6 +25,10 @@
- #include <pj/os.h>
- #include <pj/rand.h>
-
-+#if (! defined(PJMEDIA_HAS_VIDEO)) || (PJMEDIA_HAS_VIDEO == 0)
-+# undef PJMEDIA_VIDEO_DEV_HAS_V4L2
-+#endif
-+#
- #if PJMEDIA_VIDEO_DEV_HAS_V4L2
-
- #include <linux/videodev2.h>
diff --git a/debian/patches/milenage.patch b/debian/patches/milenage.patch
deleted file mode 100644
index 4e4246b..0000000
--- a/debian/patches/milenage.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From e9ec7f11712aa0f8a10285722cfec2f51e05d230 Mon Sep 17 00:00:00 2001
-From: Tzafrir Cohen <tzafrir at debian.org>
-Date: Fri, 19 Apr 2013 12:58:47 +0300
-Subject: [PATCH] remove unused libmilenage
-
-Milenage is a 3GPP authentication algorithm.
-libmilenage was linked in but was not actually used. Just remove it for
-now.
----
- build.mak.in | 8 +-------
- pjsip/src/pjsip/sip_auth_aka.c | 2 --
- 2 files changed, 1 insertion(+), 9 deletions(-)
-
---- a/build.mak.in
-+++ b/build.mak.in
-@@ -26,13 +26,7 @@ endif
- # Determine which party libraries to use
- export APP_THIRD_PARTY_EXT :=
- export APP_THIRD_PARTY_LIBS :=
--export APP_THIRD_PARTY_LIB_FILES := $(PJ_DIR)/third_party/lib/libmilenage-$(LIB_SUFFIX)
--ifeq ($(PJ_SHARED_LIBRARIES),)
--APP_THIRD_PARTY_LIBS += -lmilenage-$(TARGET_NAME)
--else
--APP_THIRD_PARTY_LIBS += -lmilenage
--APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libmilenage.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libmilenage.$(SHLIB_SUFFIX)
--endif
-+export APP_THIRD_PARTY_LIB_FILES :=
-
- ifeq (@ac_external_srtp@,1)
- # External SRTP library
---- a/pjsip/src/pjsip/sip_auth_aka.c
-+++ b/pjsip/src/pjsip/sip_auth_aka.c
-@@ -29,8 +29,6 @@
-
- #if PJSIP_HAS_DIGEST_AKA_AUTH
-
--#include "../../third_party/milenage/milenage.h"
--
- /*
- * Create MD5-AKA1 digest response.
- */
---- a/third_party/build/Makefile
-+++ b/third_party/build/Makefile
-@@ -1,4 +1,4 @@
--DIRS = milenage
-+DIRS =
-
- include ../../build.mak
- include $(PJDIR)/build/common.mak
diff --git a/debian/patches/no_libasound.patch b/debian/patches/no_libasound.patch
index d605a1d..8983348 100644
--- a/debian/patches/no_libasound.patch
+++ b/debian/patches/no_libasound.patch
@@ -1,9 +1,12 @@
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Description: Remove pointless linking with libasound
+Upstream: no
All libraries and applications were being linked against libasound,
but it was not being used anywhere.
+Upstream says: this cannot be merged as-is.
+
--- a/aconfigure
+++ b/aconfigure
@@ -5994,8 +5994,6 @@ $as_echo "Checking sound device backend.
diff --git a/debian/patches/no_libnsl.patch b/debian/patches/no_libnsl.patch
index 6fe52b9..b732b01 100644
--- a/debian/patches/no_libnsl.patch
+++ b/debian/patches/no_libnsl.patch
@@ -1,6 +1,12 @@
+Author: Jeremy Lainé <jeremy.laine at m4x.org>
+Description: Remove pointless linking with libnsl
+Upstream: no
+
All libraries and applications were being linked against libnsl,
but it was not being used anywhere.
+Upstream says: this cannot be merged as-is.
+
diff --git a/aconfigure b/aconfigure
index 57eb0bc..919ea75 100755
--- a/aconfigure
diff --git a/debian/patches/reduce_pjlib_linkage.patch b/debian/patches/reduce_pjlib_linkage.patch
index 0f1c124..e2e0b47 100644
--- a/debian/patches/reduce_pjlib_linkage.patch
+++ b/debian/patches/reduce_pjlib_linkage.patch
@@ -1,3 +1,6 @@
+Author: Jeremy Lainé <jeremy.laine at m4x.org>
+Description: Reduce number of libraries linked with pjlib
+
All libraries and applications were gratuitously linked against
libcrypto, libssl and libuuid, but only libpj needs them.
diff --git a/debian/patches/reduce_pjmedia_linkage.patch b/debian/patches/reduce_pjmedia_linkage.patch
index 74f32d2..921b4cf 100644
--- a/debian/patches/reduce_pjmedia_linkage.patch
+++ b/debian/patches/reduce_pjmedia_linkage.patch
@@ -1,3 +1,6 @@
+Author: Jeremy Lainé <jeremy.laine at m4x.org>
+Description: Reduce number of libraries linked with pjmedia
+
All libraries and applications were gratuitously linked against
libgsm, libportaudio, libspeex and libspeexdsp but only pjmedia
needs them.
diff --git a/debian/patches/series b/debian/patches/series
index 79caf8e..931cbd7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,5 @@
-milenage.patch
no_libasound.patch
no_libnsl.patch
-srtp_deinit.patch
-fix_no_video.patch
+#srtp_deinit.patch
reduce_pjlib_linkage.patch
reduce_pjmedia_linkage.patch
-typos.patch
-symbols_diet.patch
-#fix_gcc_warn.patch
diff --git a/debian/patches/srtp_deinit.patch b/debian/patches/srtp_deinit.patch
deleted file mode 100644
index f1086fa..0000000
--- a/debian/patches/srtp_deinit.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: replace srtp_deinit with srtp_shutdown
-Author: Tzafrir Cohen <tzafrir at debian.org>
-
-The internal copy of srtp used in pjmedia has its own srtp_deinit()
-instead of srtp_shutdown().
-
---- a/pjmedia/src/pjmedia/transport_srtp.c
-+++ b/pjmedia/src/pjmedia/transport_srtp.c
-@@ -323,7 +323,7 @@ static void pjmedia_srtp_deinit_lib(pjme
-
- PJ_UNUSED_ARG(endpt);
-
-- err = srtp_deinit();
-+ err = srtp_shutdown();
- if (err != err_status_ok) {
- PJ_LOG(4, (THIS_FILE, "Failed to deinitialize libsrtp: %s",
- get_libsrtp_errstr(err)));
diff --git a/debian/patches/symbols_diet.patch b/debian/patches/symbols_diet.patch
deleted file mode 100644
index 69d41b1..0000000
--- a/debian/patches/symbols_diet.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-Description: Symbols that should not be exported
-Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-
---- a/pjlib-util/src/pjlib-util/getopt.c
-+++ b/pjlib-util/src/pjlib-util/getopt.c
-@@ -111,7 +111,7 @@ int pj_optind = 1;
- causes problems with re-calling pj_getopt as programs generally don't
- know that. */
-
--int __getopt_initialized = 0;
-+static int __getopt_initialized = 0;
-
- /* The next char to be scanned in the option-element
- in which the last option character we returned was found.
---- a/pjlib/src/pj/pool_buf.c
-+++ b/pjlib/src/pj/pool_buf.c
-@@ -21,7 +21,7 @@
- #include <pj/assert.h>
- #include <pj/os.h>
-
--struct pj_pool_factory stack_based_factory;
-+static struct pj_pool_factory stack_based_factory;
-
- struct creation_param
- {
---- a/pjlib-util/src/pjlib-util/base64.c
-+++ b/pjlib-util/src/pjlib-util/base64.c
-@@ -24,7 +24,7 @@
- #define INV -1
- #define PADDING '='
-
--const char base64_char[] = {
-+static const char base64_char[] = {
- 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
- 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
- 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
---- a/pjlib-util/src/pjlib-util/http_client.c
-+++ b/pjlib-util/src/pjlib-util/http_client.c
-@@ -1491,7 +1491,7 @@ on_error:
- /* snprintf() to a pj_str_t struct with an option to append the
- * result at the back of the string.
- */
--void str_snprintf(pj_str_t *s, size_t size,
-+static void str_snprintf(pj_str_t *s, size_t size,
- pj_bool_t append, const char *format, ...)
- {
- va_list arg;
---- a/pjmedia/src/pjmedia/echo_suppress.c
-+++ b/pjmedia/src/pjmedia/echo_suppress.c
-@@ -125,7 +125,7 @@ typedef enum talk_state
- ST_REM_TALK
- } talk_state_t;
-
--const char *state_names[] =
-+static const char *state_names[] =
- {
- "Null",
- "local talking",
---- a/pjmedia/src/pjmedia-codec/g722/g722_dec.c
-+++ b/pjmedia/src/pjmedia-codec/g722/g722_dec.c
-@@ -450,7 +450,7 @@ static int block5h (int dh, int sh)
- return (rh) ;
- }
-
--void rx_qmf(g722_dec_t *dec, int rl, int rh, int *xout1, int *xout2)
-+static void rx_qmf(g722_dec_t *dec, int rl, int rh, int *xout1, int *xout2)
- {
- int i;
-
---- a/pjmedia/src/pjmedia-codec/speex_codec.c
-+++ b/pjmedia/src/pjmedia-codec/speex_codec.c
-@@ -725,7 +725,7 @@ static pj_status_t spx_codec_modify(pjm
- /* This function will iterate frames & submodes in the Speex bits.
- * Returns 0 if a frame found, otherwise returns -1.
- */
--int speex_get_next_frame(SpeexBits *bits)
-+static int speex_get_next_frame(SpeexBits *bits)
- {
- static const int inband_skip_table[NB_SUBMODES] =
- {1, 1, 4, 4, 4, 4, 4, 4, 8, 8, 16, 16, 32, 32, 64, 64 };
---- a/pjnath/src/pjnath/ice_session.c
-+++ b/pjnath/src/pjnath/ice_session.c
-@@ -1989,7 +1989,7 @@ static void periodic_timer(pj_timer_heap
-
-
- /* Utility: find string in string array */
--const pj_str_t *find_str(const pj_str_t *strlist[], unsigned count,
-+static const pj_str_t *find_str(const pj_str_t *strlist[], unsigned count,
- const pj_str_t *str)
- {
- unsigned i;
---- a/pjsip/src/pjsip/sip_transport_loop.c
-+++ b/pjsip/src/pjsip/sip_transport_loop.c
-@@ -67,7 +67,7 @@ struct loop_transport
-
-
- /* Helper function to create "incoming" packet */
--struct recv_list *create_incoming_packet( struct loop_transport *loop,
-+static struct recv_list *create_incoming_packet( struct loop_transport *loop,
- pjsip_tx_data *tdata )
- {
- pj_pool_t *pool;
---- a/pjsip/src/pjsip/sip_transport.c
-+++ b/pjsip/src/pjsip/sip_transport.c
-@@ -125,7 +125,7 @@ typedef struct transport_data
- /*
- * Transport names.
- */
--struct transport_names_t
-+static struct transport_names_t
- {
- pjsip_transport_type_e type; /* Transport type */
- pj_uint16_t port; /* Default port number */
-@@ -212,7 +212,7 @@ static void tp_state_callback(pjsip_tran
- const pjsip_transport_state_info *info);
-
-
--struct transport_names_t *get_tpname(pjsip_transport_type_e type)
-+static struct transport_names_t *get_tpname(pjsip_transport_type_e type)
- {
- unsigned i;
- for (i=0; i<PJ_ARRAY_SIZE(transport_names); ++i) {
---- a/pjsip/src/pjsip-simple/presence.c
-+++ b/pjsip/src/pjsip-simple/presence.c
-@@ -130,13 +130,13 @@ static pjsip_evsub_user pres_user =
- /*
- * Some static constants.
- */
--const pj_str_t STR_EVENT = { "Event", 5 };
--const pj_str_t STR_PRESENCE = { "presence", 8 };
--const pj_str_t STR_APPLICATION = { "application", 11 };
--const pj_str_t STR_PIDF_XML = { "pidf+xml", 8};
--const pj_str_t STR_XPIDF_XML = { "xpidf+xml", 9};
--const pj_str_t STR_APP_PIDF_XML = { "application/pidf+xml", 20 };
--const pj_str_t STR_APP_XPIDF_XML = { "application/xpidf+xml", 21 };
-+static const pj_str_t STR_EVENT = { "Event", 5 };
-+static const pj_str_t STR_PRESENCE = { "presence", 8 };
-+static const pj_str_t STR_APPLICATION = { "application", 11 };
-+static const pj_str_t STR_PIDF_XML = { "pidf+xml", 8};
-+static const pj_str_t STR_XPIDF_XML = { "xpidf+xml", 9};
-+static const pj_str_t STR_APP_PIDF_XML = { "application/pidf+xml", 20 };
-+static const pj_str_t STR_APP_XPIDF_XML = { "application/xpidf+xml", 21 };
-
-
- /*
---- a/pjsip/src/pjsip-ua/sip_100rel.c
-+++ b/pjsip/src/pjsip-ua/sip_100rel.c
-@@ -50,9 +50,9 @@ static void on_retransmit(pj_timer_heap_
- struct pj_timer_entry *entry);
-
-
--const pj_str_t tag_100rel = { "100rel", 6 };
--const pj_str_t RSEQ = { "RSeq", 4 };
--const pj_str_t RACK = { "RAck", 4 };
-+static const pj_str_t tag_100rel = { "100rel", 6 };
-+static const pj_str_t RSEQ = { "RSeq", 4 };
-+static const pj_str_t RACK = { "RAck", 4 };
-
-
- /* 100rel module */
---- a/pjsip/src/pjsip-ua/sip_inv.c
-+++ b/pjsip/src/pjsip-ua/sip_inv.c
-@@ -192,7 +192,7 @@ static pj_status_t mod_inv_unload(void)
- /*
- * Set session state.
- */
--void inv_set_state(pjsip_inv_session *inv, pjsip_inv_state state,
-+static void inv_set_state(pjsip_inv_session *inv, pjsip_inv_state state,
- pjsip_event *e)
- {
- pjsip_inv_state prev_state = inv->state;
-@@ -279,7 +279,7 @@ void inv_set_state(pjsip_inv_session *in
- /*
- * Set cause code.
- */
--void inv_set_cause(pjsip_inv_session *inv, int cause_code,
-+static void inv_set_cause(pjsip_inv_session *inv, int cause_code,
- const pj_str_t *cause_text)
- {
- if (cause_code > inv->cause) {
---- a/pjsip/src/pjsip-ua/sip_xfer.c
-+++ b/pjsip/src/pjsip-ua/sip_xfer.c
-@@ -76,10 +76,10 @@ PJ_DEF(const pjsip_method*) pjsip_get_re
- /*
- * String constants
- */
--const pj_str_t STR_REFER = { "refer", 5 };
--const pj_str_t STR_MESSAGE = { "message", 7 };
--const pj_str_t STR_SIPFRAG = { "sipfrag", 7 };
--const pj_str_t STR_SIPFRAG_VERSION = {";version=2.0", 12 };
-+static const pj_str_t STR_REFER = { "refer", 5 };
-+static const pj_str_t STR_MESSAGE = { "message", 7 };
-+static const pj_str_t STR_SIPFRAG = { "sipfrag", 7 };
-+static const pj_str_t STR_SIPFRAG_VERSION = {";version=2.0", 12 };
-
-
- /*
---- a/pjsip/src/pjsua-lib/pjsua_acc.c
-+++ b/pjsip/src/pjsua-lib/pjsua_acc.c
-@@ -1662,7 +1662,7 @@ static pj_bool_t acc_check_nat_addr(pjsu
- }
-
- /* Check and update Service-Route header */
--void update_service_route(pjsua_acc *acc, pjsip_rx_data *rdata)
-+static void update_service_route(pjsua_acc *acc, pjsip_rx_data *rdata)
- {
- pjsip_generic_string_hdr *hsr = NULL;
- pjsip_route_hdr *hr, *h;
---- a/pjsip/src/pjsua-lib/pjsua_pres.c
-+++ b/pjsip/src/pjsua-lib/pjsua_pres.c
-@@ -74,7 +74,7 @@ struct buddy_lock
- };
-
- /* Acquire lock to the specified buddy_id */
--pj_status_t lock_buddy(const char *title,
-+static pj_status_t lock_buddy(const char *title,
- pjsua_buddy_id buddy_id,
- struct buddy_lock *lck,
- unsigned _unused_)
diff --git a/debian/patches/typos.patch b/debian/patches/typos.patch
deleted file mode 100644
index cfca059..0000000
--- a/debian/patches/typos.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Description: Fix some typos in the code
-
-Credit to Lintian
-
---- a/pjsip-apps/src/pjsua/pjsua_app_cli.c
-+++ b/pjsip-apps/src/pjsua/pjsua_app_cli.c
-@@ -1685,7 +1685,7 @@ static pj_status_t cmd_transfer_call(pj_
- pjsua_call_get_info(current_call, &ci);
- pj_ansi_snprintf(out_str,
- sizeof(out_str),
-- "Transfering current call [%d] %.*s\n",
-+ "Transferring current call [%d] %.*s\n",
- current_call,
- (int)ci.remote_info.slen,
- ci.remote_info.ptr);
---- a/pjsip-apps/src/pjsua/pjsua_app_legacy.c
-+++ b/pjsip-apps/src/pjsua/pjsua_app_legacy.c
-@@ -1068,7 +1068,7 @@ static void ui_call_transfer(pj_bool_t n
- pjsua_msg_data msg_data;
-
- pjsua_call_get_info(current_call, &ci);
-- printf("Transfering current call [%d] %.*s\n", current_call,
-+ printf("Transferring current call [%d] %.*s\n", current_call,
- (int)ci.remote_info.slen, ci.remote_info.ptr);
-
- ui_input_url("Transfer to URL", buf, sizeof(buf), &result);
---- a/pjsip-apps/src/py_pjsua/pjsua_app.py
-+++ b/pjsip-apps/src/py_pjsua/pjsua_app.py
-@@ -411,7 +411,7 @@ def xfer_call():
- else:
- call = g_current_call
- ci = py_pjsua.call_get_info(g_current_call)
-- print "Transfering current call ["+ `g_current_call` + "] " + ci.remote_info
-+ print "Transferring current call ["+ `g_current_call` + "] " + ci.remote_info
- print "Enter sip url : "
- url = sys.stdin.readline()
- if url == "\n":
---- a/pjsip/src/pjsua-lib/pjsua_call.c
-+++ b/pjsip/src/pjsua-lib/pjsua_call.c
-@@ -2540,7 +2540,7 @@ PJ_DEF(pj_status_t) pjsua_call_xfer( pjs
- PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls &&
- dest, PJ_EINVAL);
-
-- PJ_LOG(4,(THIS_FILE, "Transfering call %d to %.*s", call_id,
-+ PJ_LOG(4,(THIS_FILE, "Transferring call %d to %.*s", call_id,
- (int)dest->slen, dest->ptr));
- pj_log_push_indent();
-
-@@ -2621,7 +2621,7 @@ PJ_DEF(pj_status_t) pjsua_call_xfer_repl
- dest_call_id<(int)pjsua_var.ua_cfg.max_calls,
- PJ_EINVAL);
-
-- PJ_LOG(4,(THIS_FILE, "Transfering call %d replacing with call %d",
-+ PJ_LOG(4,(THIS_FILE, "Transferring call %d replacing with call %d",
- call_id, dest_call_id));
- pj_log_push_indent();
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/pjproject.git
More information about the Pkg-voip-commits
mailing list