Merge branch 'master' into jsond

Conflicts:
	ext/json/JSON_parser.c
	ext/json/JSON_parser.h
	ext/json/json.c
	ext/json/utf8_decode.c

1 files changed, 28 insertions, 28 deletions

diff --git a/ext/zip/lib/zip_extra_field_api.c b/ext/zip/lib/zip_extra_field_api.c
index 1412c310a2..0f1c397420 100644
--- a/ext/zip/lib/zip_extra_field_api.c
+++ b/ext/zip/lib/zip_extra_field_api.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
@@ -31,11 +31,11 @@
   IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
+
 
 #include "zipint.h"
 
-
+
 
 ZIP_EXTERN int
 zip_file_extra_field_delete(struct zip *za, zip_uint64_t idx, zip_uint16_t ef_idx, zip_flags_t flags)
@@ -51,10 +51,10 @@ zip_file_extra_field_delete(struct zip *za, zip_uint64_t idx, zip_uint16_t ef_id
 	_zip_error_set(&za->error, ZIP_ER_INVAL, 0);
 	return -1;
     }
-    
+
     if (_zip_get_dirent(za, idx, 0, NULL) == NULL)
 	return -1;
-    
+
     if (ZIP_IS_RDONLY(za)) {
 	_zip_error_set(&za->error, ZIP_ER_RDONLY, 0);
 	return -1;
@@ -62,14 +62,14 @@ zip_file_extra_field_delete(struct zip *za, zip_uint64_t idx, zip_uint16_t ef_id
 
     if (_zip_file_extra_field_prepare_for_change(za, idx) < 0)
         return -1;
-    
+
     de = za->entry[idx].changes;
-    
+
     de->extra_fields = _zip_ef_delete_by_id(de->extra_fields, ZIP_EXTRA_FIELD_ALL, ef_idx, flags);
     return 0;
 }
 
-
+
 
 ZIP_EXTERN int
 zip_file_extra_field_delete_by_id(struct zip *za, zip_uint64_t idx, zip_uint16_t ef_id, zip_uint16_t ef_idx, zip_flags_t flags)
@@ -85,7 +85,7 @@ zip_file_extra_field_delete_by_id(struct zip *za, zip_uint64_t idx, zip_uint16_t
 	_zip_error_set(&za->error, ZIP_ER_INVAL, 0);
 	return -1;
     }
-    
+
     if (_zip_get_dirent(za, idx, 0, NULL) == NULL)
 	return -1;
 
@@ -93,17 +93,17 @@ zip_file_extra_field_delete_by_id(struct zip *za, zip_uint64_t idx, zip_uint16_t
 	_zip_error_set(&za->error, ZIP_ER_RDONLY, 0);
 	return -1;
     }
-    
+
     if (_zip_file_extra_field_prepare_for_change(za, idx) < 0)
         return -1;
-    
+
     de = za->entry[idx].changes;
 
     de->extra_fields = _zip_ef_delete_by_id(de->extra_fields, ef_id, ef_idx, flags);
     return 0;
 }
 
-
+
 
 ZIP_EXTERN const zip_uint8_t *
 zip_file_extra_field_get(struct zip *za, zip_uint64_t idx, zip_uint16_t ef_idx, zip_uint16_t *idp, zip_uint16_t *lenp, zip_flags_t flags)
@@ -150,7 +150,7 @@ zip_file_extra_field_get(struct zip *za, zip_uint64_t idx, zip_uint16_t ef_idx,
 
 }
 
-
+
 
 ZIP_EXTERN const zip_uint8_t *
 zip_file_extra_field_get_by_id(struct zip *za, zip_uint64_t idx, zip_uint16_t ef_id, zip_uint16_t ef_idx, zip_uint16_t *lenp, zip_flags_t flags)
@@ -172,7 +172,7 @@ zip_file_extra_field_get_by_id(struct zip *za, zip_uint64_t idx, zip_uint16_t ef
     return _zip_ef_get_by_id(de->extra_fields, lenp, ef_id, ef_idx, flags, &za->error);
 }
 
-
+
 
 ZIP_EXTERN zip_int16_t
 zip_file_extra_fields_count(struct zip *za, zip_uint64_t idx, zip_flags_t flags)
@@ -201,7 +201,7 @@ zip_file_extra_fields_count(struct zip *za, zip_uint64_t idx, zip_flags_t flags)
     return (zip_int16_t)n;
 }
 
-
+
 
 ZIP_EXTERN zip_int16_t
 zip_file_extra_fields_count_by_id(struct zip *za, zip_uint64_t idx, zip_uint16_t ef_id, zip_flags_t flags)
@@ -230,7 +230,7 @@ zip_file_extra_fields_count_by_id(struct zip *za, zip_uint64_t idx, zip_uint16_t
     return (zip_int16_t)n;
 }
 
-
+
 
 ZIP_EXTERN int
 zip_file_extra_field_set(struct zip *za, zip_uint64_t idx, zip_uint16_t ef_id, zip_uint16_t ef_idx, const zip_uint8_t *data, zip_uint16_t len, zip_flags_t flags)
@@ -247,12 +247,12 @@ zip_file_extra_field_set(struct zip *za, zip_uint64_t idx, zip_uint16_t ef_id, z
 
     if (_zip_get_dirent(za, idx, 0, NULL) == NULL)
 	return -1;
-    
+
     if (ZIP_IS_RDONLY(za)) {
 	_zip_error_set(&za->error, ZIP_ER_RDONLY, 0);
 	return -1;
     }
-    
+
     if (ZIP_EF_IS_INTERNAL(ef_id)) {
 	_zip_error_set(&za->error, ZIP_ER_INVAL, 0);
 	return -1;
@@ -260,7 +260,7 @@ zip_file_extra_field_set(struct zip *za, zip_uint64_t idx, zip_uint16_t ef_id, z
 
     if (_zip_file_extra_field_prepare_for_change(za, idx) < 0)
         return -1;
-    
+
     de = za->entry[idx].changes;
 
     ef = de->extra_fields;
@@ -302,7 +302,7 @@ zip_file_extra_field_set(struct zip *za, zip_uint64_t idx, zip_uint16_t ef_id, z
 	_zip_error_set(&za->error, ZIP_ER_INVAL, 0);
 	return -1;
     }
-    
+
     if ((ef_new=_zip_ef_new(ef_id, len, data, flags)) == NULL) {
 	_zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
 	return -1;
@@ -322,7 +322,7 @@ zip_file_extra_field_set(struct zip *za, zip_uint64_t idx, zip_uint16_t ef_id, z
 	    ef->flags &= ~(flags & ZIP_EF_BOTH);
 	    ef_new->next = ef->next;
 	    ef->next = ef_new;
-	}	    
+	}
     }
     else if (ef_prev) {
 	ef_new->next = ef_prev->next;
@@ -330,7 +330,7 @@ zip_file_extra_field_set(struct zip *za, zip_uint64_t idx, zip_uint16_t ef_id, z
     }
     else
 	de->extra_fields = ef_new;
-    
+
     return 0;
 }
 
@@ -340,14 +340,14 @@ int
 _zip_file_extra_field_prepare_for_change(struct zip *za, zip_uint64_t idx)
 {
     struct zip_entry *e;
-    
+
     if (idx >= za->nentry) {
         _zip_error_set(&za->error, ZIP_ER_INVAL, 0);
         return -1;
     }
-    
+
     e = za->entry+idx;
-    
+
     if (e->changes && (e->changes->changed & ZIP_DIRENT_EXTRA_FIELD))
         return 0;
 
@@ -355,20 +355,20 @@ _zip_file_extra_field_prepare_for_change(struct zip *za, zip_uint64_t idx)
 	if (_zip_read_local_ef(za, idx) < 0)
 	    return -1;
     }
-    
+
     if (e->changes == NULL) {
         if ((e->changes=_zip_dirent_clone(e->orig)) == NULL) {
             _zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
             return -1;
         }
     }
-    
+
     if (e->orig && e->orig->extra_fields) {
 	if ((e->changes->extra_fields=_zip_ef_clone(e->orig->extra_fields, &za->error)) == NULL)
 	    return -1;
     }
     e->changes->changed |= ZIP_DIRENT_EXTRA_FIELD;
-    
+
     return 0;
 }