Remove some ifdef 0'd code and fix an XXX.

--HG--
branch : HEAD

lib/zip_name_locate.c

diff --git a/lib/zip_name_locate.c b/lib/zip_name_locate.c
index 1a5d4e1..44e3c85 100644
--- a/lib/zip_name_locate.c
+++ b/lib/zip_name_locate.c
@@ -72,12 +72,7 @@
 
     n = (flags & ZIP_FL_UNCHANGED) ? za->cdir->nentry : za->nentry;
     for (i=0; i<n; i++) {
-#if 0
-	if (flags & ZIP_FL_UNCHANGED)
-	    fn = za->cdir->entry[i].settable.filename;
-	else
-#endif
-	    fn = _zip_get_name(za, i, flags, error);
+	fn = _zip_get_name(za, i, flags, error);
 
 	/* newly added (partially filled) entry or error */
 	if (fn == NULL)
@@ -89,8 +84,10 @@
 		fn = p+1;
 	}
 
-	if (cmp(fname, fn) == 0)
-	    return i; /* XXX: clear error before returning? */
+	if (cmp(fname, fn) == 0) {
+	    _zip_error_clear(error);
+	    return i;
+	}
     }
 
     _zip_error_set(error, ZIP_ER_NOENT, 0);