Google Git
Sign in
flutter/third_party/libzip/d97f5440d032868ed9a64a1bb1328d2465b9ca80^!/.
commit
d97f5440d032868ed9a64a1bb1328d2465b9ca80
[log]
author
Thomas Klausner <tk@giga.or.at>
Tue Sep 23 17:02:03 2014 +0200
committer
Thomas Klausner <tk@giga.or.at>
Tue Sep 23 17:02:03 2014 +0200
tree
66e23d1dad090b118ced5ffbbaec26d6562e4cd2
parent
ea8ba499615b7e8911fb6eb57894467723e6723e [diff]
Re-add prefix to private function.

diff --git a/lib/zip_close.c b/lib/zip_close.c
index 1188aa6..5047088 100644
--- a/lib/zip_close.c
+++ b/lib/zip_close.c

@@ -81,7 +81,7 @@
     if (survivors == 0) {
 	if ((za->open_flags & ZIP_TRUNCATE) || changed) {
 	    if (zip_source_remove(za->src) < 0) {
-		zip_error_set_from_source(&za->error, za->src);
+		_zip_error_set_from_source(&za->error, za->src);
 		return -1;
 	    }
 	}
@@ -135,7 +135,7 @@
     }
 
     if (zip_source_begin_write(za->src) < 0) {
-	zip_error_set_from_source(&za->error, za->src);
+	_zip_error_set_from_source(&za->error, za->src);
 	free(filelist);
 	return -1;
     }
@@ -217,7 +217,7 @@
 		break;
 	    }
 	    if (zip_source_seek(za->src, (zip_int64_t)offset, SEEK_SET) < 0) {
-		zip_error_set_from_source(&za->error, za->src);
+		_zip_error_set_from_source(&za->error, za->src);
 		error = 1;
 		break;
 	    }
@@ -237,7 +237,7 @@
 
     if (!error) {
 	if (zip_source_commit_write(za->src) != 0) {
-	    zip_error_set_from_source(&za->error, za->src);
+	    _zip_error_set_from_source(&za->error, za->src);
 	    error = 1;
 	}
     }
@@ -264,7 +264,7 @@
     zip_flags_t flags;
     
     if (zip_source_stat(src, &st) < 0) {
-	zip_error_set_from_source(&za->error, src);
+	_zip_error_set_from_source(&za->error, src);
 	return -1;
     }
 
@@ -369,7 +369,7 @@
 	zip_source_t *tmp = zip_source_pop(s2);
 
 	if (tmp == NULL) {
-	    zip_error_set_from_source(&za->error, s2);
+	    _zip_error_set_from_source(&za->error, s2);
 	    ret = -1;
 	    break;
 	}
@@ -384,7 +384,7 @@
     }
 
     if (zip_source_seek_write(za->src, offstart, SEEK_SET) < 0) {
-	zip_error_set_from_source(&za->error, za->src);
+	_zip_error_set_from_source(&za->error, za->src);
 	return -1;
     }
 
@@ -418,7 +418,7 @@
 
    
     if (zip_source_seek_write(za->src, offend, SEEK_SET) < 0) {
-	zip_error_set_from_source(&za->error, za->src);
+	_zip_error_set_from_source(&za->error, za->src);
 	return -1;
     }
 
@@ -457,7 +457,7 @@
     int ret;
 
     if (zip_source_open(src) < 0) {
-	zip_error_set_from_source(&za->error, src);
+	_zip_error_set_from_source(&za->error, src);
 	return -1;
     }
 
@@ -470,7 +470,7 @@
     }
     
     if (n < 0) {
-	zip_error_set_from_source(&za->error, src);
+	_zip_error_set_from_source(&za->error, src);
 	ret = -1;
     }
 
@@ -509,7 +509,7 @@
     snprintf((char *)buf, sizeof(buf), "%08lX", (long)crc);
 
     if (zip_source_seek_write(za->src, end-TORRENT_CRC_LEN, SEEK_SET) < 0) {
-	zip_error_set_from_source(&za->error, za->src);
+	_zip_error_set_from_source(&za->error, za->src);
 	return -1;
     }
 

diff --git a/lib/zip_dirent.c b/lib/zip_dirent.c
index c20eda2..d26d54b 100644
--- a/lib/zip_dirent.c
+++ b/lib/zip_dirent.c

@@ -134,7 +134,7 @@
     int ret;
 
     if ((off = zip_source_tell_write(za->src)) < 0) {
-        zip_error_set_from_source(&za->error, za->src);
+        _zip_error_set_from_source(&za->error, za->src);
         return -1;
     }
     offset = (zip_uint64_t)off;
@@ -151,7 +151,7 @@
     }
 
     if ((off = zip_source_tell_write(za->src)) < 0) {
-        zip_error_set_from_source(&za->error, za->src);
+        _zip_error_set_from_source(&za->error, za->src);
         return -1;
     }
     size = (zip_uint64_t)off - offset;
@@ -341,7 +341,7 @@
 	zip_int64_t n;
 
 	if ((n = zip_source_read(src, buf, size)) < 0) {
-            zip_error_set_from_source(error, src);
+            _zip_error_set_from_source(error, src);
 	    return -1;
 	}
 	if ((zip_uint64_t)n != size) {
@@ -544,7 +544,7 @@
     size = local ? LENTRYSIZE : CDENTRYSIZE;
 
     if (zip_source_seek(src, local ? 26 : 28, SEEK_CUR) < 0) {
-        zip_error_set_from_source(error, src);
+        _zip_error_set_from_source(error, src);
 	return -1;
     }
 

diff --git a/lib/zip_error.c b/lib/zip_error.c
index 6ccf397..90c24a8 100644
--- a/lib/zip_error.c
+++ b/lib/zip_error.c

@@ -119,7 +119,7 @@
 
 
 void
-zip_error_set_from_source(zip_error_t *err, struct zip_source *src)
+_zip_error_set_from_source(zip_error_t *err, struct zip_source *src)
 {
     _zip_error_copy(err, zip_source_error(src));
 }

diff --git a/lib/zip_extra_field.c b/lib/zip_extra_field.c
index 4095613..85cab50 100644
--- a/lib/zip_extra_field.c
+++ b/lib/zip_extra_field.c

@@ -342,7 +342,7 @@
     }	
 
     if (zip_source_seek(za->src, (zip_int64_t)(e->orig->offset + 26), SEEK_SET) < 0) {
-	zip_error_set_from_source(&za->error, za->src);
+	_zip_error_set_from_source(&za->error, za->src);
 	return -1;
     }
 

diff --git a/lib/zip_file_get_offset.c b/lib/zip_file_get_offset.c
index feb5c6e..28e3ad9 100644
--- a/lib/zip_file_get_offset.c
+++ b/lib/zip_file_get_offset.c

@@ -57,7 +57,7 @@
     offset = za->entry[idx].orig->offset;
 
     if (zip_source_seek(za->src, (zip_int64_t)offset, SEEK_SET) < 0) {
-	zip_error_set_from_source(error, za->src);
+	_zip_error_set_from_source(error, za->src);
 	return 0;
     }
 

diff --git a/lib/zip_filerange_crc.c b/lib/zip_filerange_crc.c
index 5702aa8..8e06e8f 100644
--- a/lib/zip_filerange_crc.c
+++ b/lib/zip_filerange_crc.c

@@ -53,14 +53,14 @@
     }
 
     if (zip_source_seek(src, (zip_int64_t)start, SEEK_SET) != 0) {
-	zip_error_set_from_source(error, src);
+	_zip_error_set_from_source(error, src);
 	return -1;
     }
     
     while (len > 0) {
 	n = (zip_int64_t)(len > BUFSIZE ? BUFSIZE : len);
 	if ((n = zip_source_read(src, buf, (zip_uint64_t)n)) < 0) {
-	    zip_error_set_from_source(error, src);
+	    _zip_error_set_from_source(error, src);
 	    return -1;
 	}
 	if (n == 0) {

diff --git a/lib/zip_fopen_index_encrypted.c b/lib/zip_fopen_index_encrypted.c
index 70b035f..fe407cb 100644
--- a/lib/zip_fopen_index_encrypted.c
+++ b/lib/zip_fopen_index_encrypted.c

@@ -52,7 +52,7 @@
 	return NULL;
 
     if (zip_source_open(src) < 0) {
-	zip_error_set_from_source(&za->error, src);
+	_zip_error_set_from_source(&za->error, src);
 	zip_source_free(src);
 	return NULL;
     }

diff --git a/lib/zip_fread.c b/lib/zip_fread.c
index 88af7f3..32fe00f 100644
--- a/lib/zip_fread.c
+++ b/lib/zip_fread.c

@@ -55,7 +55,7 @@
 	return 0;
 
     if ((n=zip_source_read(zf->src, outbuf, toread)) < 0) {
-	zip_error_set_from_source(&zf->error, zf->src);
+	_zip_error_set_from_source(&zf->error, zf->src);
 	return -1;
     }
 

diff --git a/lib/zip_io_util.c b/lib/zip_io_util.c
index 3f4970c..08d498e 100644
--- a/lib/zip_io_util.c
+++ b/lib/zip_io_util.c

@@ -85,7 +85,7 @@
     }
 
     if ((n = zip_source_read(src, b, length)) < 0) {
-	zip_error_set_from_source(error, src);
+	_zip_error_set_from_source(error, src);
 	return -1;
     }
 
@@ -199,7 +199,7 @@
     zip_int64_t n;
     
     if ((n = zip_source_write(za->src, data, length)) < 0) {
-        zip_error_set_from_source(&za->error, za->src);
+        _zip_error_set_from_source(&za->error, za->src);
         return -1;
     }
     if ((zip_uint64_t)n != length) {

diff --git a/lib/zip_open.c b/lib/zip_open.c
index 553a37e..0b4ec4d 100644
--- a/lib/zip_open.c
+++ b/lib/zip_open.c

@@ -140,7 +140,7 @@
 	    return NULL;
 	}
 	if (zip_source_open(src) < 0) {
-	    zip_error_set_from_source(error, src);
+	    _zip_error_set_from_source(error, src);
 	    return NULL;
 	}
 
@@ -191,7 +191,7 @@
 
     zip_stat_init(&st);
     if (zip_source_stat(src, &st) < 0) {
-	zip_error_set_from_source(error, src);
+	_zip_error_set_from_source(error, src);
 	return NULL;
     }
     if ((st.valid & ZIP_STAT_SIZE) == 0) {
@@ -323,7 +323,7 @@
 	bufp = NULL;
         
         if (zip_source_seek(za->src, (zip_int64_t)cd->offset, SEEK_SET) < 0) {
-            zip_error_set_from_source(error, za->src);
+            _zip_error_set_from_source(error, za->src);
             _zip_cdir_free(cd);
             return NULL;
         }
@@ -394,7 +394,7 @@
 	}
 	
         if (zip_source_seek(za->src, (zip_int64_t)cd->entry[i].orig->offset, SEEK_SET) < 0) {
-            zip_error_set_from_source(error, za->src);
+            _zip_error_set_from_source(error, za->src);
             return -1;
 	}
 	
@@ -550,7 +550,7 @@
 	}
     }
     if ((buf_offset = zip_source_tell(za->src)) < 0) {
-        zip_error_set_from_source(&za->error, za->src);
+        _zip_error_set_from_source(&za->error, za->src);
         return NULL;
     }
     
@@ -713,12 +713,12 @@
 	zip_int64_t n;
 
 	if (zip_source_seek(src, (zip_int64_t)eocd_offset, SEEK_SET) < 0) {
-	    zip_error_set_from_source(error, src);
+	    _zip_error_set_from_source(error, src);
 	    return NULL;
 	}
 
 	if ((n = zip_source_read(src, eocd, EOCD64LEN)) < 0) {
-	    zip_error_set_from_source(error, src);
+	    _zip_error_set_from_source(error, src);
 	    return NULL;
 	}
 	if (n < EOCD64LEN) {

diff --git a/lib/zip_source_crc.c b/lib/zip_source_crc.c
index f3d5048..f96cb3e 100644
--- a/lib/zip_source_crc.c
+++ b/lib/zip_source_crc.c

@@ -95,7 +95,7 @@
                 return 0;
             
             if ((n=zip_source_read(src, data, len)) < 0) {
-                zip_error_set_from_source(&ctx->error, src);
+                _zip_error_set_from_source(&ctx->error, src);
                 return -1;
             }
             
@@ -105,7 +105,7 @@
                     struct zip_stat st;
                     
                     if (zip_source_stat(src, &st) < 0) {
-                        zip_error_set_from_source(&ctx->error, src);
+                        _zip_error_set_from_source(&ctx->error, src);
                         return -1;
                     }
                     

diff --git a/lib/zip_source_deflate.c b/lib/zip_source_deflate.c
index 344ccd9..a3a9cef 100644
--- a/lib/zip_source_deflate.c
+++ b/lib/zip_source_deflate.c

@@ -143,7 +143,7 @@
 		}
 
 		if ((n=zip_source_read(src, ctx->buffer, sizeof(ctx->buffer))) < 0) {
-                    zip_error_set_from_source(&ctx->error, src);
+                    _zip_error_set_from_source(&ctx->error, src);
 		    end = 1;
 		    break;
 		}
@@ -228,7 +228,7 @@
 		}
 
 		if ((n=zip_source_read(src, ctx->buffer, sizeof(ctx->buffer))) < 0) {
-                    zip_error_set_from_source(&ctx->error, src);
+                    _zip_error_set_from_source(&ctx->error, src);
 		    end = 1;
 		    break;
 		}
@@ -335,7 +335,7 @@
     switch (cmd) {
         case ZIP_SOURCE_OPEN:
             if ((n=zip_source_read(src, ctx->buffer, sizeof(ctx->buffer))) < 0) {
-                zip_error_set_from_source(&ctx->error, src);
+                _zip_error_set_from_source(&ctx->error, src);
                 return -1;
             }
 

diff --git a/lib/zip_source_open.c b/lib/zip_source_open.c
index 46bf491..1fb3c33 100644
--- a/lib/zip_source_open.c
+++ b/lib/zip_source_open.c

@@ -56,7 +56,7 @@
         }
         else {
             if (zip_source_open(src->src) < 0) {
-                zip_error_set_from_source(&src->error, src->src);
+                _zip_error_set_from_source(&src->error, src->src);
                 return -1;
             }
         }

diff --git a/lib/zip_source_pkware.c b/lib/zip_source_pkware.c
index 5e550e3..c88ae02 100644
--- a/lib/zip_source_pkware.c
+++ b/lib/zip_source_pkware.c

@@ -133,7 +133,7 @@
     unsigned short dostime, dosdate;
 
     if ((n=zip_source_read(src, header, HEADERLEN)) < 0) {
-        zip_error_set_from_source(&ctx->error, src);
+        _zip_error_set_from_source(&ctx->error, src);
 	return -1;
     }
     
@@ -177,7 +177,7 @@
 
         case ZIP_SOURCE_READ:
             if ((n=zip_source_read(src, data, len)) < 0) {
-                zip_error_set_from_source(&ctx->error, src);
+                _zip_error_set_from_source(&ctx->error, src);
                 return -1;
             }
 

diff --git a/lib/zip_source_stat.c b/lib/zip_source_stat.c
index f70e8e9..5a53fa4 100644
--- a/lib/zip_source_stat.c
+++ b/lib/zip_source_stat.c

@@ -50,7 +50,7 @@
     
     if (ZIP_SOURCE_IS_LAYERED(src)) {
         if (zip_source_stat(src->src, st) < 0) {
-            zip_error_set_from_source(&src->error, src->src);
+            _zip_error_set_from_source(&src->error, src->src);
             return -1;
         }
     }

diff --git a/lib/zip_source_window.c b/lib/zip_source_window.c
index 56dc256..5bbfdfe 100644
--- a/lib/zip_source_window.c
+++ b/lib/zip_source_window.c

@@ -136,7 +136,7 @@
                 for (n=0; n<ctx->start; n+=(zip_uint64_t)ret) {
                     i = (ctx->start-n > sizeof(b) ? sizeof(b) : ctx->start-n);
                     if ((ret=zip_source_read(src, b, i)) < 0) {
-                        zip_error_set_from_source(&ctx->error, src);
+                        _zip_error_set_from_source(&ctx->error, src);
                         return -1;
                     }
                     if (ret==0) {
@@ -158,7 +158,7 @@
             
             if (ctx->needs_seek) {
                 if (zip_source_seek(src, (zip_int64_t)ctx->offset, SEEK_SET) < 0) {
-                    zip_error_set_from_source(&ctx->error, src);
+                    _zip_error_set_from_source(&ctx->error, src);
                     return -1;
                 }
             }

diff --git a/lib/zipint.h b/lib/zipint.h
index ace8a0b..e6240ca 100644
--- a/lib/zipint.h
+++ b/lib/zipint.h

@@ -457,7 +457,7 @@
 void _zip_error_get(const struct zip_error *, int *, int *);
 
 void _zip_error_copy(zip_error_t *dst, const struct zip_error *src);
-void _zip_error_set_from_source(zip_error_t *, zip_source_t *);
+void __zip_error_set_from_source(zip_error_t *, zip_source_t *);
 
 const zip_uint8_t *_zip_extract_extra_field_by_id(struct zip_error *, zip_uint16_t, int, const zip_uint8_t *, zip_uint16_t, zip_uint16_t *);