[Asterisk-cvs] asterisk/formats format_g729.c, 1.14, 1.15 format_gsm.c, 1.19, 1.20 format_ilbc.c, 1.7, 1.8 format_sln.c, 1.3, 1.4 format_wav_gsm.c, 1.27, 1.28

[markster at lists.digium.com]

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

Modified Files:
	format_g729.c format_gsm.c format_ilbc.c format_sln.c 
	format_wav_gsm.c 
Log Message:
Merge Olle's comment patch (bug #3097)


Index: format_g729.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_g729.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- format_g729.c	14 Dec 2004 23:36:30 -0000	1.14
+++ format_g729.c	19 Dec 2004 21:13:41 -0000	1.15
@@ -187,7 +187,7 @@
 	if (whence != SEEK_FORCECUR) {
 		offset = (offset > max)?max:offset;
 	}
-	// protect against seeking beyond begining.
+	/* protect against seeking beyond begining. */
 	offset = (offset < min)?min:offset;
 	if (lseek(fs->fd, offset, SEEK_SET) < 0)
 		return -1;

Index: format_gsm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_gsm.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- format_gsm.c	14 Dec 2004 23:36:30 -0000	1.19
+++ format_gsm.c	19 Dec 2004 21:13:41 -0000	1.20
@@ -3,9 +3,9 @@
  *
  * Save to raw, headerless GSM data.
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999-2004, Digium, inc
  *
- * Mark Spencer <markster at linux-support.net>
+ * Mark Spencer <markster at digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
@@ -200,7 +200,7 @@
 		offset = distance + cur;
 	else if(whence == SEEK_END)
 		offset = max - distance;
-	// Always protect against seeking past the begining.
+	/* Always protect against seeking past the begining. */
 	offset = (offset < min)?min:offset;
 	if (whence != SEEK_FORCECUR) {
 		offset = (offset > max)?max:offset;

Index: format_ilbc.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_ilbc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- format_ilbc.c	14 Dec 2004 23:36:30 -0000	1.7
+++ format_ilbc.c	19 Dec 2004 21:13:41 -0000	1.8
@@ -5,9 +5,9 @@
  *
  * Brian K. West <brian at bkw.org>
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999-2004, Digium, inc
  *
- * Mark Spencer <markster at linux-support.net>
+ * Mark Spencer <markster at digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
@@ -189,7 +189,7 @@
 	if (whence != SEEK_FORCECUR) {
 		offset = (offset > max)?max:offset;
 	}
-	// protect against seeking beyond begining.
+	/* protect against seeking beyond begining. */
 	offset = (offset < min)?min:offset;
 	if (lseek(fs->fd, offset, SEEK_SET) < 0)
 		return -1;

Index: format_sln.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_sln.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- format_sln.c	14 Dec 2004 23:36:30 -0000	1.3
+++ format_sln.c	19 Dec 2004 21:13:41 -0000	1.4
@@ -175,7 +175,7 @@
 	if (whence != SEEK_FORCECUR) {
 		offset = (offset > max)?max:offset;
 	}
-	// always protect against seeking past begining.
+	/* always protect against seeking past begining. */
 	offset = (offset < min)?min:offset;
 	return lseek(fs->fd, offset, SEEK_SET);
 }

Index: format_wav_gsm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_wav_gsm.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- format_wav_gsm.c	14 Dec 2004 23:36:30 -0000	1.27
+++ format_wav_gsm.c	19 Dec 2004 21:13:41 -0000	1.28
@@ -501,7 +501,7 @@
 		offset = distance + cur;
 	else if(whence == SEEK_END)
 		offset = max - distance;
-	// always protect against seeking past end of header
+	/* always protect against seeking past end of header */
 	offset = (offset < min)?min:offset;
 	if (whence != SEEK_FORCECUR) {
 		offset = (offset > max)?max:offset;