[Pkg-voip-commits] [belle-sip] 04/10: debian/patches/fix-spelling-errors.patch: refresh

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch-guest pushed a commit to branch master
in repository belle-sip.

commit a516ddadfd5cd24a8e7842f52c980e965942fa4b
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date:   Thu Apr 20 21:38:21 2017 +0200

    debian/patches/fix-spelling-errors.patch: refresh
---
 debian/changelog                         |  1 +
 debian/patches/fix-spelling-errors.patch | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f10c31..436d059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ belle-sip (1.6.1-1) UNRELEASED; urgency=medium
 
   [ Johannes Schauer ]
   * remove version restriction from bctoolbox-dev
+  * refreshed patch for 1.6.1
 
  -- Tzafrir Cohen <tzafrir at debian.org>  Sat, 23 May 2015 16:30:12 +0300
 
diff --git a/debian/patches/fix-spelling-errors.patch b/debian/patches/fix-spelling-errors.patch
index 74d3336..f3660a6 100644
--- a/debian/patches/fix-spelling-errors.patch
+++ b/debian/patches/fix-spelling-errors.patch
@@ -8,17 +8,17 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/belle_sip_object.c
 +++ b/src/belle_sip_object.c
 @@ -498,7 +498,7 @@
+ 		/* Case where the object aborted the marshalling because of not enough room.
+ 		 * Should this happen, it is not allowed to write past buffer end anyway */
+ 		if (written > buff_size){
+-			belle_sip_fatal("Object of type %s commited a buffer overflow by marshalling %i bytes",
++			belle_sip_fatal("Object of type %s committed a buffer overflow by marshalling %i bytes",
+ 				vptr->type_name,(int)(*offset-initial_offset));
  		}
- 		memcpy(buff+initial_offset,p+initial_offset,*offset-initial_offset);
- 	}else if (error==BELLE_SIP_BUFFER_OVERFLOW){
--		belle_sip_error("Object of type %s commited a buffer overflow by marshalling %i bytes",
-+		belle_sip_error("Object of type %s committed a buffer overflow by marshalling %i bytes",
- 			vptr->type_name,(int)(*offset-initial_offset));
  	}else{
- 		belle_sip_error("Object of type %s produced an error during marshalling: %i",
 --- a/src/belle_sip_uri_impl.c
 +++ b/src/belle_sip_uri_impl.c
-@@ -415,14 +415,14 @@
+@@ -411,14 +411,14 @@
  
  
  typedef enum {
@@ -39,9 +39,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	}
 --- a/src/bodyhandler.c
 +++ b/src/bodyhandler.c
-@@ -150,7 +150,7 @@
- 		if (obj->transfered_size==obj->expected_size)
+@@ -169,7 +169,7 @@
  			return BELLE_SIP_STOP;
+ 		}
  		if (ret==BELLE_SIP_STOP && obj->transfered_size<obj->expected_size){
 -			belle_sip_error("body handler [%p] transfered only [%i] bytes while [%i] were expected",obj,
 +			belle_sip_error("body handler [%p] transferred only [%i] bytes while [%i] were expected",obj,
@@ -50,8 +50,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	}
 --- a/src/belle_sip_utils.c
 +++ b/src/belle_sip_utils.c
-@@ -715,7 +715,7 @@
- 	int res;
+@@ -726,7 +726,7 @@
+ 	struct dirent *ent;
  
  	if ((dir = opendir(path)) == NULL) {
 -		belle_sip_error("Could't open [%s] directory.", path);
@@ -72,7 +72,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	}
 --- a/src/belle_sip_loop.c
 +++ b/src/belle_sip_loop.c
-@@ -318,7 +318,7 @@
+@@ -368,7 +368,7 @@
  }
  
  void belle_sip_main_loop_do_later(belle_sip_main_loop_t *ml, belle_sip_callback_t func, void *data){
@@ -83,10 +83,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  }
 --- a/src/channel.c
 +++ b/src/channel.c
-@@ -962,7 +962,7 @@
+@@ -1013,7 +1013,7 @@
  int belle_sip_channel_notify_timeout(belle_sip_channel_t *obj){
  	const int too_long=60;
- 	if (belle_sip_time_ms() - obj->last_recv_time>=(too_long * 1000)){
+ 	if ((int)(belle_sip_time_ms() - obj->last_recv_time) >= (too_long * 1000)){
 -		belle_sip_message("A timeout related to this channel occured and no message received during last %i seconds. This channel is suspect, moving to error state",too_long);
 +		belle_sip_message("A timeout related to this channel occurred and no message received during last %i seconds. This channel is suspect, moving to error state",too_long);
  		channel_set_state(obj,BELLE_SIP_CHANNEL_ERROR);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/belle-sip.git