Merge remote-tracking branch 'upstream/master'

8 files changed, 7 insertions, 10 deletions

diff --git a/src/libString/s_getline.c b/src/libString/s_getline.c
index 86c9bf0c..38252a73 100644
--- a/src/libString/s_getline.c
+++ b/src/libString/s_getline.c
@@ -9,7 +9,7 @@
  * Leading whitespace and newlines are removed.
  *
  * Empty lines and lines starting with '#' are ignored.
- */ 
+ */
 extern char *
 s_getline(Biobuf *fp, String *to)
 {
diff --git a/src/libString/s_grow.c b/src/libString/s_grow.c
index 5cf2a141..62cda996 100644
--- a/src/libString/s_grow.c
+++ b/src/libString/s_grow.c
@@ -4,7 +4,7 @@
 
 /* grow a String's allocation by at least `incr' bytes */
 extern String*
-s_grow(String *s, int incr)	
+s_grow(String *s, int incr)
 {
 	char *cp;
 	int size;
@@ -31,4 +31,3 @@ s_grow(String *s, int incr)
 
 	return s;
 }
-
diff --git a/src/libString/s_memappend.c b/src/libString/s_memappend.c
index 27b69850..8cbacd18 100644
--- a/src/libString/s_memappend.c
+++ b/src/libString/s_memappend.c
@@ -17,4 +17,3 @@ s_memappend(String *to, char *from, int n)
 	s_terminate(to);
 	return to;
 }
-
diff --git a/src/libString/s_nappend.c b/src/libString/s_nappend.c
index fb41f932..32470a9e 100644
--- a/src/libString/s_nappend.c
+++ b/src/libString/s_nappend.c
@@ -15,4 +15,3 @@ s_nappend(String *to, char *from, int n)
 	s_terminate(to);
 	return to;
 }
-
diff --git a/src/libString/s_parse.c b/src/libString/s_parse.c
index bcf2aef9..6691356f 100644
--- a/src/libString/s_parse.c
+++ b/src/libString/s_parse.c
@@ -19,13 +19,13 @@ s_parse(String *from, String *to)
 		from->ptr++;
 		for (;*from->ptr != '\'' && *from->ptr != '\0'; from->ptr++)
 			s_putc(to, *from->ptr);
-		if (*from->ptr == '\'')	
+		if (*from->ptr == '\'')
 			from->ptr++;
 	} else if (*from->ptr == '"') {
 		from->ptr++;
 		for (;*from->ptr != '"' && *from->ptr != '\0'; from->ptr++)
 			s_putc(to, *from->ptr);
-		if (*from->ptr == '"')	
+		if (*from->ptr == '"')
 			from->ptr++;
 	} else {
 		for (;!isspace(*from->ptr) && *from->ptr != '\0'; from->ptr++)
diff --git a/src/libString/s_rdinstack.c b/src/libString/s_rdinstack.c
index 520f16a6..c859b2c5 100644
--- a/src/libString/s_rdinstack.c
+++ b/src/libString/s_rdinstack.c
@@ -89,7 +89,7 @@ out:
  * Leading whitespace and newlines are removed.
  * Lines starting with #include cause us to descend into the new file.
  * Empty lines and other lines starting with '#' are ignored.
- */ 
+ */
 extern char *
 s_rdinstack(Sinstack *sp, String *to)
 {
diff --git a/src/libString/s_read.c b/src/libString/s_read.c
index 7745d677..20583ef2 100644
--- a/src/libString/s_read.c
+++ b/src/libString/s_read.c
@@ -11,7 +11,7 @@ enum
 /* Append up to 'len' input bytes to the string 'to'.
  *
  * Returns the number of characters read.
- */ 
+ */
 extern int
 s_read(Biobuf *fp, String *to, int len)
 {
diff --git a/src/libString/s_read_line.c b/src/libString/s_read_line.c
index b1de5ac4..e5e2a1d9 100644
--- a/src/libString/s_read_line.c
+++ b/src/libString/s_read_line.c
@@ -7,7 +7,7 @@
  *
  * Returns a pointer to the character string (or 0).
  * Trailing newline is left on.
- */ 
+ */
 extern char *
 s_read_line(Biobuf *fp, String *to)
 {