Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Happy new year (Update copyright to 2018)
  Happy new year (Update copyright to 2018)
  Revert "Enable ODBC tests on AppVeyor"
  Enable ODBC tests on AppVeyor
  Skip on Travis-CI
  Extend skip section
  2018
  missing changelog entries + fix version and date
  missing changelog entries
  2018
  Trailing whitespaces

1 files changed, 10 insertions, 10 deletions

diff --git a/ext/zip/lib/zip_source_seek.c b/ext/zip/lib/zip_source_seek.c
index c3f47036ad..92299b8ab2 100644
--- a/ext/zip/lib/zip_source_seek.c
+++ b/ext/zip/lib/zip_source_seek.c
@@ -17,7 +17,7 @@
   3. The names of the authors may not be used to endorse or promote
      products derived from this software without specific prior
      written permission.
- 
+
   THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
   OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -39,7 +39,7 @@ ZIP_EXTERN int
 zip_source_seek(zip_source_t *src, zip_int64_t offset, int whence)
 {
     zip_source_args_seek_t args;
-    
+
     if (src->source_closed) {
         return -1;
     }
@@ -50,7 +50,7 @@ zip_source_seek(zip_source_t *src, zip_int64_t offset, int whence)
 
     args.offset = offset;
     args.whence = whence;
-    
+
     return (_zip_source_call(src, &args, sizeof(args), ZIP_SOURCE_SEEK) < 0 ? -1 : 0);
 }
 
@@ -60,33 +60,33 @@ zip_source_seek_compute_offset(zip_uint64_t offset, zip_uint64_t length, void *d
 {
     zip_int64_t new_offset;
     zip_source_args_seek_t *args = ZIP_SOURCE_GET_ARGS(zip_source_args_seek_t, data, data_length, error);
-    
+
     if (args == NULL) {
         return -1;
     }
-    
+
     switch (args->whence) {
         case SEEK_CUR:
             new_offset = (zip_int64_t)offset + args->offset;
             break;
-            
+
         case SEEK_END:
             new_offset = (zip_int64_t)length + args->offset;
             break;
-            
+
         case SEEK_SET:
             new_offset = args->offset;
             break;
-            
+
         default:
             zip_error_set(error, ZIP_ER_INVAL, 0);
             return -1;
     }
-    
+
     if (new_offset < 0 || (zip_uint64_t)new_offset > length) {
         zip_error_set(error, ZIP_ER_INVAL, 0);
         return -1;
     }
-    
+
     return new_offset;
 }