harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arc...@apache.org
Subject svn commit: r370841 - /incubator/harmony/enhanced/jchevm/libjc/zip.c
Date Fri, 20 Jan 2006 15:03:54 GMT
Author: archie
Date: Fri Jan 20 07:03:52 2006
New Revision: 370841

URL: http://svn.apache.org/viewcvs?rev=370841&view=rev
Log:
Fix some glitches and normalize ZIP error strings.

Modified:
    incubator/harmony/enhanced/jchevm/libjc/zip.c

Modified: incubator/harmony/enhanced/jchevm/libjc/zip.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/jchevm/libjc/zip.c?rev=370841&r1=370840&r2=370841&view=diff
==============================================================================
--- incubator/harmony/enhanced/jchevm/libjc/zip.c (original)
+++ incubator/harmony/enhanced/jchevm/libjc/zip.c Fri Jan 20 07:03:52 2006
@@ -110,8 +110,8 @@
 		    -4, &zent->comp_len, -4, &zent->uncomp_len,
 		    -2, &name_len, -2, &extra_len, -2, &comment_len,
 		    8, NULL, -4, &offset, 0) != JNI_OK) {
-			_JC_EX_STORE(env, IOException, "can't read entry"
-			    " directory #%d in ZIP file `%s': %s", i + 1,
+			_JC_EX_STORE(env, IOException, "can't read directory"
+			    " entry #%d in ZIP file `%s': %s", i + 1,
 			    zip->path, strerror(errno));
 			goto fail;
 		}
@@ -352,7 +352,7 @@
 	case Z_MEM_ERROR:
 		return JNI_ERR;
 	case Z_VERSION_ERROR:
-		_JC_EX_STORE(env, IOException, "error reading entry `%s' in"
+		_JC_EX_STORE(env, IOException, "can't read entry `%s' in"
 		    " ZIP file `%s': %s", zent->name, zip->path,
 		    "incompatible zlib version");
 		return JNI_ERR;
@@ -378,7 +378,7 @@
 			goto fail;
 		}
 		if (r == 0) {
-			_JC_EX_STORE(env, IOException, "error reading entry"
+			_JC_EX_STORE(env, IOException, "can't read entry"
 			    " `%s' in ZIP file `%s': %s", zent->name,
 			    zip->path, "premature EOF");
 			goto fail;
@@ -410,12 +410,12 @@
 			_JC_ASSERT(r == Z_OK);
 			return JNI_OK;
 		case Z_NEED_DICT:
-			_JC_EX_STORE(env, IOException, "error reading entry'"
-			    " `%s in ZIP file `%s': %s", zent->name, zip->path,
+			_JC_EX_STORE(env, IOException, "can't read entry"
+			    " `%s' in ZIP file `%s': %s", zent->name, zip->path,
 			    "dictionary required");
 			goto fail;
 		case Z_DATA_ERROR:
-			_JC_EX_STORE(env, IOException, "error reading entry"
+			_JC_EX_STORE(env, IOException, "can't read entry"
 			    " `%s' in ZIP file `%s': %s", zent->name,
 			    zip->path, "corrupted entry");
 			goto fail;
@@ -428,7 +428,7 @@
 
 bad_length:
 	/* Uncompressed data had the wrong length */
-	_JC_EX_STORE(env, IOException, "error reading entry `%s' in ZIP file"
+	_JC_EX_STORE(env, IOException, "can't read entry `%s' in ZIP file"
 	    " `%s': %s", zent->name, zip->path, "incorrect length");
 
 fail:



Mime
View raw message