Merge from 1.2 main.

4 files changed, 6 insertions, 6 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 931c411ac..29534b948 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,5 +7,5 @@ EXTRA_DIST = Makefile.common
 noinst_LTLIBRARIES = libxineposix.la
 noinst_HEADERS = os_internal.h
 
-libxineposix_la_SOURCES = 
+libxineposix_la_SOURCES =
 libxineposix_la_LIBADD = @LTLIBOBJS@
diff --git a/lib/asprintf.c b/lib/asprintf.c
index 1027e82dd..5359e51f3 100644
--- a/lib/asprintf.c
+++ b/lib/asprintf.c
@@ -29,7 +29,7 @@ int xine_private_vasprintf (char **buffer, const char *format, va_list ap)
 {
   char *buf = NULL;
   int size = 128;
-  
+
   for (;;)
   {
     int ret;
@@ -41,11 +41,11 @@ int xine_private_vasprintf (char **buffer, const char *format, va_list ap)
       return -1;
     }
     buf = newbuf;
-    
+
     va_copy (cp, ap);
     ret = vsnprintf (buf, size, format, cp);
     va_end (cp);
-    
+
     if (ret >= 0 && ret < size)
     {
       *buffer = realloc (buf, ret + 1);
diff --git a/lib/dirent_msvc.c b/lib/dirent_msvc.c
index 19ef88a66..8a3f895ea 100644
--- a/lib/dirent_msvc.c
+++ b/lib/dirent_msvc.c
@@ -11,7 +11,7 @@
     that this copyright and permissions notice appear in all copies and
     derivatives, and that no charge may be made for the software and its
     documentation except to cover cost of distribution.
-    
+
     This software is supplied "as is" without express or implied warranty.
 
     But that said, if there are any problems please get in touch.
diff --git a/lib/strsep.c b/lib/strsep.c
index 3170e4867..fbd5c041e 100644
--- a/lib/strsep.c
+++ b/lib/strsep.c
@@ -35,7 +35,7 @@
 
 /*
  * Get next token from string *stringp, where tokens are possibly-empty
- * strings separated by characters from delim.  
+ * strings separated by characters from delim.
  *
  * Writes NULs into the string at *stringp to end tokens.
  * delim need not remain constant from call to call.