[Asterisk-cvs] asterisk utils.c,1.48,1.49

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv31275

Modified Files:
	utils.c 
Log Message:
string/whitespace handling cleanups (bug #4449, with mods)


Index: utils.c
===================================================================
RCS file: /usr/cvsroot/asterisk/utils.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- utils.c	6 Jun 2005 22:12:18 -0000	1.48
+++ utils.c	17 Jun 2005 13:25:00 -0000	1.49
@@ -37,15 +37,36 @@
 static char base64[64];
 static char b2a[256];
 
-char *ast_strip(char *s)
+char *ast_skip_blanks(char *str)
 {
-	char *e;
+	while (*str && *str < 33)
+		str++;
+	return str;
+}
+ 
+char *ast_trim_blanks(char *str)
+{
+	if (str) {
+		str += strlen(str) - 1;
+		while (*str && *str < 33)
+			str--;
+		*(++str) = '\0'; /* terminate string */
+	}
+	return str;
+}
 
-	while (*s && (*s < 33)) s++;
-	e = s + strlen(s) - 1;
-	while ((e > s) && (*e < 33)) e--;
-	*++e = '\0';
+char *ast_skip_nonblanks(char *str)
+{
+	while (*str && *str > 32)
+		str++;
+	return str;
+}
 
+char *ast_strip(char *s)
+{
+	s = ast_skip_blanks(s);
+	if (s)
+		ast_trim_blanks(s);
 	return s;
 }