- MFH WS

4 files changed, 31 insertions, 31 deletions

diff --git a/main/snprintf.c b/main/snprintf.c
index d42722c79b..1117bef268 100644
--- a/main/snprintf.c
+++ b/main/snprintf.c
@@ -156,7 +156,7 @@ PHPAPI char *php_gcvt(double value, int ndigit, char dec_point, char exponent, c
 	}
 
 	for (i = 0; i < ndigit && digits[i] != '\0'; i++);
-	
+
 	if ((decpt >= 0 && decpt - i > 4)
 			|| (decpt < 0 && decpt < -3)) {     /* use E-style */
 		/* exponential format (e.g. 1.2345e+13) */
@@ -241,7 +241,7 @@ PHPAPI char *php_gcvt(double value, int ndigit, char dec_point, char exponent, c
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -327,7 +327,7 @@ char * ap_php_conv_10(register wide_int num, register bool_int is_unsigned,
 		*is_negative = (num < 0);
 
 		/*
-		 * On a 2's complement machine, negating the most negative integer 
+		 * On a 2's complement machine, negating the most negative integer
 		 * results in a number that cannot be represented as a signed integer.
 		 * Here is what we do to obtain the number's magnitude:
 		 *      a. add 1 to the number
@@ -344,7 +344,7 @@ char * ap_php_conv_10(register wide_int num, register bool_int is_unsigned,
 	}
 
 	/*
-	 * We use a do-while loop so that we write at least 1 digit 
+	 * We use a do-while loop so that we write at least 1 digit
 	 */
 	do {
 		register u_wide_int new_magnitude = magnitude / 10;
@@ -763,7 +763,7 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) /
 						fmt++;
 					}
 					/* these are promoted to int, so no break */
-				default:				
+				default:
 					modifier = LM_STD;
 					break;
 			}
@@ -961,7 +961,7 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) /
 					pad_char = ' ';
 					break;
 
-				
+
 				case 'f':
 				case 'F':
 				case 'e':
@@ -1084,17 +1084,17 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) /
 					goto skip_output;
 
 					/*
-					 * Always extract the argument as a "char *" pointer. We 
-					 * should be using "void *" but there are still machines 
+					 * Always extract the argument as a "char *" pointer. We
+					 * should be using "void *" but there are still machines
 					 * that don't understand it.
 					 * If the pointer size is equal to the size of an unsigned
-					 * integer we convert the pointer to a hex number, otherwise 
+					 * integer we convert the pointer to a hex number, otherwise
 					 * we print "%p" to indicate that we don't handle "%p".
 					 */
 				case 'p':
 					if (sizeof(char *) <= sizeof(u_wide_int)) {
 						ui_num = (u_wide_int)((size_t) va_arg(ap, char *));
-						s = ap_php_conv_p2(ui_num, 4, 'x', 
+						s = ap_php_conv_p2(ui_num, 4, 'x',
 								&num_buf[NUM_BUF_SIZE], &s_len);
 						if (ui_num != 0) {
 							*--s = 'x';
@@ -1152,7 +1152,7 @@ fmt_error:
 				PAD(min_width, s_len, pad_char);
 			}
 			/*
-			 * Print the string s. 
+			 * Print the string s.
 			 */
 			for (i = s_len; i != 0; i--) {
 				INS_CHAR(*s, sp, bep, cc);
diff --git a/main/snprintf.h b/main/snprintf.h
index b3ea02ee82..3ba50259ff 100644
--- a/main/snprintf.h
+++ b/main/snprintf.h
@@ -21,7 +21,7 @@
 
 /*
 
-Comparing: sprintf, snprintf, slprintf, spprintf 
+Comparing: sprintf, snprintf, slprintf, spprintf
 
 sprintf  offers the ability to make a lot of failures since it does not know
          the size of the buffer it uses. Therefore usage of sprintf often
@@ -34,19 +34,19 @@ snprintf knows the buffers size and will not write behind it. But you will
          before beeing able to call the function. In other words you must
          be sure that you really know the maximum size of the buffer required.
          A bad thing is having a big maximum while in most cases you would
-         only need a small buffer. If the size of the resulting string is 
+         only need a small buffer. If the size of the resulting string is
          longer or equal to the buffer size than the buffer is not terminated.
-         The function also returns the number of chars not including the 
+         The function also returns the number of chars not including the
          terminating \0 that were needed to fully comply to the print request.
 
-slprintf same as snprintf with the difference that it actually returns the 
+slprintf same as snprintf with the difference that it actually returns the
          length printed not including the terminating \0.
 
 spprintf is the dynamical version of snprintf. It allocates the buffer in size
          as needed and allows a maximum setting as snprintf (turn this feature
          off by setting max_len to 0). spprintf is a little bit slower than
-         snprintf and offers possible memory leakes if you miss freeing the 
-         buffer allocated by the function. Therfore this function should be 
+         snprintf and offers possible memory leakes if you miss freeing the
+         buffer allocated by the function. Therfore this function should be
          used where either no maximum is known or the maximum is much bigger
          than normal size required. spprintf allways terminates the buffer.
 
@@ -61,8 +61,8 @@ Example:
                                |                                | if (!buffer)
                                |                                |   return OUT_OF_MEMORY
  // sprintf allways terminates | // manual termination of       | // spprintf allays terminates buffer
- // buffer                     | // buffer *IS* required        |   
-                               | buffer[MAX-1] = 0;             | 
+ // buffer                     | // buffer *IS* required        |
+                               | buffer[MAX-1] = 0;             |
  action_with_buffer(buffer);   | action_with_buffer(buffer);    | action_with_buffer(buffer);
                                |                                | efree(buffer);
 */
diff --git a/main/spprintf.c b/main/spprintf.c
index 24a214734c..4e056f14f5 100644
--- a/main/spprintf.c
+++ b/main/spprintf.c
@@ -30,7 +30,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -133,7 +133,7 @@
 #define INS_STRING(xbuf, s, slen) do { 	\
 	smart_str_appendl(xbuf, s, slen);	\
 } while (0)
-	
+
 #define INS_CHAR(xbuf, ch)          \
 	INS_CHAR_NR(xbuf, ch)
 
@@ -359,7 +359,7 @@ static void xbuf_format_converter(smart_str *xbuf, const char *fmt, va_list ap)
 						fmt++;
 					}
 					/* these are promoted to int, so no break */
-				default:				
+				default:
 					modifier = LM_STD;
 					break;
 			}
@@ -677,17 +677,17 @@ static void xbuf_format_converter(smart_str *xbuf, const char *fmt, va_list ap)
 					goto skip_output;
 
 					/*
-					 * Always extract the argument as a "char *" pointer. We 
-					 * should be using "void *" but there are still machines 
+					 * Always extract the argument as a "char *" pointer. We
+					 * should be using "void *" but there are still machines
 					 * that don't understand it.
 					 * If the pointer size is equal to the size of an unsigned
-					 * integer we convert the pointer to a hex number, otherwise 
+					 * integer we convert the pointer to a hex number, otherwise
 					 * we print "%p" to indicate that we don't handle "%p".
 					 */
 				case 'p':
 					if (sizeof(char *) <= sizeof(u_wide_int)) {
 						ui_num = (u_wide_int)((size_t) va_arg(ap, char *));
-						s = ap_php_conv_p2(ui_num, 4, 'x', 
+						s = ap_php_conv_p2(ui_num, 4, 'x',
 								&num_buf[NUM_BUF_SIZE], &s_len);
 						if (ui_num != 0) {
 							*--s = 'x';
@@ -745,7 +745,7 @@ fmt_error:
 				PAD(xbuf, min_width - s_len, pad_char);
 			}
 			/*
-			 * Print the string s. 
+			 * Print the string s.
 			 */
 			INS_STRING(xbuf, s, s_len);
 
@@ -767,14 +767,14 @@ PHPAPI int vspprintf(char **pbuf, size_t max_len, const char *format, va_list ap
 	smart_str xbuf = {0};
 
 	xbuf_format_converter(&xbuf, format, ap);
-	
+
 	if (max_len && xbuf.len > max_len) {
 		xbuf.len = max_len;
 	}
 	smart_str_0(&xbuf);
-		
+
 	*pbuf = xbuf.c;
-	
+
 	return xbuf.len;
 }
 /* }}} */
diff --git a/main/spprintf.h b/main/spprintf.h
index b3a0481a8d..f296eacf5e 100644
--- a/main/spprintf.h
+++ b/main/spprintf.h
@@ -18,7 +18,7 @@
 
 /* $Id$ */
 
-/* 
+/*
 
 The pbuf parameter of all spprintf version receives a pointer to the allocated
 buffer. This buffer must be freed manually after usage using efree() function.