diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-03-28 10:11:06 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-03-28 10:11:06 +0000 |
commit | fabb807a8ff9d472619bd2ae244ae983ff35b9cc (patch) | |
tree | a0e277e45a5ed1051413eae99dc66700aef38642 | |
parent | 4e7f1a8e0898bd9c282a677df901c92ef01808bb (diff) |
Revert the introduction of zzip_dir_refcount() from r36651
git-svn-id: svn://tug.org/texlive/trunk@36657 c570f23f-e606-0410-a88d-b1316a301751
4 files changed, 5 insertions, 48 deletions
diff --git a/Build/source/libs/zziplib/zziplib-0.13.62-PATCHES/ChangeLog b/Build/source/libs/zziplib/zziplib-0.13.62-PATCHES/ChangeLog index 3a5008b500c..934f50c32e6 100644 --- a/Build/source/libs/zziplib/zziplib-0.13.62-PATCHES/ChangeLog +++ b/Build/source/libs/zziplib/zziplib-0.13.62-PATCHES/ChangeLog @@ -1,7 +1,3 @@ -2015-03-27 Luigi Scarso <luigi.scarso@gmail.com> - - * patch-04-refcount: Add zzip_dir_refcount - 2014-07-15 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-03-w64-ptr: Avoid WIN64 warning due to different size. diff --git a/Build/source/libs/zziplib/zziplib-0.13.62-PATCHES/patch-04-refcount b/Build/source/libs/zziplib/zziplib-0.13.62-PATCHES/patch-04-refcount deleted file mode 100644 index 732c27e07c0..00000000000 --- a/Build/source/libs/zziplib/zziplib-0.13.62-PATCHES/patch-04-refcount +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur zziplib-0.13.62.orig/zzip/zip.c zziplib-0.13.62/zzip/zip.c ---- zziplib-0.13.62.orig/zzip/zip.c 2015-03-27 21:16:01.101333013 +0100 -+++ zziplib-0.13.62/zzip/zip.c 2015-03-27 21:19:06.037340680 +0100 -@@ -628,6 +628,17 @@ - return zzip_dir_alloc_ext_io(fileext, 0); - } - -+ -+ -+/** -+ * returns the refcount -+ */ -+int -+zzip_dir_refcount(ZZIP_DIR * dir) -+{ -+ return dir->refcount; -+} -+ - /** - * will free the zzip_dir handle unless there are still - * zzip_files attached (that may use its cache buffer). diff --git a/Build/source/libs/zziplib/zziplib-0.13.62/zzip/zip.c b/Build/source/libs/zziplib/zziplib-0.13.62/zzip/zip.c index dac9aba4f90..a4b06b47189 100644 --- a/Build/source/libs/zziplib/zziplib-0.13.62/zzip/zip.c +++ b/Build/source/libs/zziplib/zziplib-0.13.62/zzip/zip.c @@ -628,17 +628,6 @@ zzip_dir_alloc(zzip_strings_t * fileext) return zzip_dir_alloc_ext_io(fileext, 0); } - - -/** - * returns the refcount - */ -int -zzip_dir_refcount(ZZIP_DIR * dir) -{ - return dir->refcount; -} - /** * will free the zzip_dir handle unless there are still * zzip_files attached (that may use its cache buffer). diff --git a/Build/source/texk/web2c/luatexdir/luazip/src/luazip.c b/Build/source/texk/web2c/luatexdir/luazip/src/luazip.c index a7248ae4759..eb731349f0d 100644 --- a/Build/source/texk/web2c/luatexdir/luazip/src/luazip.c +++ b/Build/source/texk/web2c/luatexdir/luazip/src/luazip.c @@ -97,22 +97,15 @@ static int zip_open (lua_State *L) { return 1; } - static int zip_close (lua_State *L) { ZZIP_DIR* f = tofile(L, 1); - if (zzip_dir_refcount(f) != 0) + if (zzip_dir_close(f) == 0) { - lua_pushboolean(L, 0); - } else { - if (zzip_dir_close(f) == 0) - { - *(ZZIP_DIR**)lua_touserdata(L, 1) = NULL; /* mark file as close */ - lua_pushboolean(L, 1); - } - else { - lua_pushboolean(L, 0); - } + *(ZZIP_DIR**)lua_touserdata(L, 1) = NULL; /* mark file as close */ + lua_pushboolean(L, 1); } + else + lua_pushboolean(L, 0); return 1; } |