From ec46b5a4ce9e6fe5cc2e68cb5fe70dee9e039cae Mon Sep 17 00:00:00 2001
From: Luigi Rizzo <rizzo@icir.org>
Date: Sat, 3 Jun 2006 23:03:29 +0000
Subject: [PATCH] use ast_skip_blanks() where appropriate, and use standard C
 jargoon  *foo++ = '\0'; instead of two separate statements.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31861 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/chan_sip.c | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 3e97e884b1..0f4a6b83cb 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -10163,8 +10163,7 @@ static void parse_moved_contact(struct sip_pvt *p, struct sip_request *req)
 	} else {
 		e = strchr(tmp, '@');
 		if (e) {
-			*e = '\0';
-			e++;
+			*e++ = '\0';
 			domain = e;
 		} else {
 			/* No username part */
@@ -11225,8 +11224,8 @@ static int handle_request_notify(struct sip_pvt *p, struct sip_request *req, str
 	char *sep;
 
 	if( (sep = strchr(event, ';')) ) {	/* XXX bug here - overwriting string ? */
-		*sep = '\0';
-		eventid = ++sep;
+		*sep++ = '\0';
+		eventid = sep;
 	}
 	
 	if (option_debug > 1 && sipdebug)
@@ -11291,27 +11290,20 @@ static int handle_request_notify(struct sip_pvt *p, struct sip_request *req, str
 		*/
 		if (option_debug > 2)
 			ast_log(LOG_DEBUG, "* SIP Transfer NOTIFY Attachment: \n---%s\n---\n", buf);
-		cmd = buf;
-		while(*cmd && (*cmd < 33)) {	/* Skip white space */
-			cmd++;
-		}
+		cmd = ast_skip_blanks(buf);
 		code = cmd;
 		/* We are at SIP/2.0 */
 		while(*code && (*code > 32)) {	/* Search white space */
 			code++;
 		}
-		*code = '\0';
-		code++;
-		while(*code && (*code < 33)) {	/* Skip white space */
-			code++;
-		}
+		*code++ = '\0';
+		code = ast_skip_blanks(code);
 		sep = code;
 		sep++;
 		while(*sep && (*sep > 32)) {	/* Search white space */
 			sep++;
 		}
-		*sep = '\0';
-		sep++;				/* Response string */
+		*sep++ = '\0';			/* Response string */
 		respcode = atoi(code);
 		switch (respcode) {
 		case 100:	/* Trying: */