summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2012-08-25 00:16:25 +0200
committerGravatar Martin Szulecki2012-08-25 00:16:25 +0200
commitaed4b55cbea1f96a999fc2879ba5dd53f05fdc85 (patch)
tree5b4bd715b1b5bbd86fa1f1095b866b65f67fbff7
parent059a5d20480333b8ea0c049559bbfddf96ab8b36 (diff)
downloadideviceinstaller-aed4b55cbea1f96a999fc2879ba5dd53f05fdc85.tar.gz
ideviceinstaller-aed4b55cbea1f96a999fc2879ba5dd53f05fdc85.tar.bz2
Rename zip_f_get_contents() to zip_get_contents()
-rw-r--r--src/ideviceinstaller.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ideviceinstaller.c b/src/ideviceinstaller.c
index cfb703e..de6cb5c 100644
--- a/src/ideviceinstaller.c
+++ b/src/ideviceinstaller.c
@@ -131,7 +131,7 @@ static void status_cb(const char *operation, plist_t status)
131 } 131 }
132} 132}
133 133
134static int zip_f_get_contents(struct zip *zf, const char *filename, int locate_flags, char **buffer, uint32_t *len) 134static int zip_get_contents(struct zip *zf, const char *filename, int locate_flags, char **buffer, uint32_t *len)
135{ 135{
136 struct zip_stat zs; 136 struct zip_stat zs;
137 struct zip_file *zfile; 137 struct zip_file *zfile;
@@ -620,7 +620,7 @@ run_again:
620 /* extract iTunesMetadata.plist from package */ 620 /* extract iTunesMetadata.plist from package */
621 char *zbuf = NULL; 621 char *zbuf = NULL;
622 uint32_t len = 0; 622 uint32_t len = 0;
623 if (zip_f_get_contents(zf, "iTunesMetadata.plist", 0, &zbuf, &len) == 0) { 623 if (zip_get_contents(zf, "iTunesMetadata.plist", 0, &zbuf, &len) == 0) {
624 meta = plist_new_data(zbuf, len); 624 meta = plist_new_data(zbuf, len);
625 } 625 }
626 if (zbuf) { 626 if (zbuf) {
@@ -631,7 +631,7 @@ run_again:
631 plist_t info = NULL; 631 plist_t info = NULL;
632 zbuf = NULL; 632 zbuf = NULL;
633 len = 0; 633 len = 0;
634 if (zip_f_get_contents(zf, "Info.plist", ZIP_FL_NODIR, &zbuf, &len) < 0) { 634 if (zip_get_contents(zf, "Info.plist", ZIP_FL_NODIR, &zbuf, &len) < 0) {
635 zip_unchange_all(zf); 635 zip_unchange_all(zf);
636 zip_close(zf); 636 zip_close(zf);
637 goto leave_cleanup; 637 goto leave_cleanup;
@@ -675,7 +675,7 @@ run_again:
675 /* extract .sinf from package */ 675 /* extract .sinf from package */
676 zbuf = NULL; 676 zbuf = NULL;
677 len = 0; 677 len = 0;
678 if (zip_f_get_contents(zf, sinfname, 0, &zbuf, &len) == 0) { 678 if (zip_get_contents(zf, sinfname, 0, &zbuf, &len) == 0) {
679 sinf = plist_new_data(zbuf, len); 679 sinf = plist_new_data(zbuf, len);
680 } 680 }
681 free(sinfname); 681 free(sinfname);