From 67b7c88d19ee0cdaa11bf9043d1bd51a8be5a65d Mon Sep 17 00:00:00 2001 From: ksrini Date: Mon, 25 Oct 2010 10:34:26 -0700 Subject: [PATCH] 6989469: (launcher) compiler warnings in jli native code Reviewed-by: darcy, ohair, sherman --- src/share/bin/java.c | 1 - src/share/bin/parse_manifest.c | 11 ++++------- src/share/bin/wildcard.c | 14 +++++++------- src/share/native/java/util/zip/zlib-1.2.3/zcrc32.c | 2 +- src/solaris/bin/java_md.c | 2 +- src/solaris/bin/jexec.c | 1 + src/windows/bin/java_md.c | 5 ++--- 7 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/share/bin/java.c b/src/share/bin/java.c index 4c61fb7c8..01eeb2a05 100644 --- a/src/share/bin/java.c +++ b/src/share/bin/java.c @@ -355,7 +355,6 @@ JavaMain(void * _args) JavaVM *vm = 0; JNIEnv *env = 0; - jstring mainClassName; jclass mainClass; jmethodID mainID; jobjectArray mainArgs; diff --git a/src/share/bin/parse_manifest.c b/src/share/bin/parse_manifest.c index 2c916d87c..61b8bdb6b 100644 --- a/src/share/bin/parse_manifest.c +++ b/src/share/bin/parse_manifest.c @@ -72,7 +72,7 @@ inflate_file(int fd, zentry *entry, int *size_out) if (entry->how == STORED) { *(char *)((size_t)in + entry->csize) = '\0'; if (size_out) { - *size_out = entry->csize; + *size_out = (int)entry->csize; } return (in); } else if (entry->how == DEFLATED) { @@ -103,7 +103,7 @@ inflate_file(int fd, zentry *entry, int *size_out) return (NULL); } if (size_out) { - *size_out = entry->isize; + *size_out = (int)entry->isize; } return (out); } else @@ -317,7 +317,7 @@ find_file(int fd, zentry *entry, const char *file_name) * manifest. If so, build the entry record from the data found in * the header located and return success. */ - if (CENNAM(p) == JLI_StrLen(file_name) && + if ((size_t)CENNAM(p) == JLI_StrLen(file_name) && memcmp((p + CENHDR), file_name, JLI_StrLen(file_name)) == 0) { if (lseek(fd, base_offset + CENOFF(p), SEEK_SET) < (off_t)0) { free(buffer); @@ -606,8 +606,5 @@ JLI_ManifestIterate(const char *jarfile, attribute_closure ac, void *user_data) } free(mp); close(fd); - if (rc == 0) - return (0); - else - return (-2); + return (rc == 0) ? 0 : -2; } diff --git a/src/share/bin/wildcard.c b/src/share/bin/wildcard.c index 3abcd18a9..0d834e635 100644 --- a/src/share/bin/wildcard.c +++ b/src/share/bin/wildcard.c @@ -290,12 +290,12 @@ FileList_join(FileList fl, char sep) char *path; char *p; for (i = 0, size = 1; i < fl->size; i++) - size += JLI_StrLen(fl->files[i]) + 1; + size += (int)JLI_StrLen(fl->files[i]) + 1; path = JLI_MemAlloc(size); for (i = 0, p = path; i < fl->size; i++) { - int len = JLI_StrLen(fl->files[i]); + int len = (int)JLI_StrLen(fl->files[i]); if (i > 0) *p++ = sep; memcpy(p, fl->files[i], len); p += len; @@ -309,7 +309,7 @@ static FileList FileList_split(const char *path, char sep) { const char *p, *q; - int len = JLI_StrLen(path); + int len = (int)JLI_StrLen(path); int count; FileList fl; for (count = 1, p = path; p < path + len; p++) @@ -330,7 +330,7 @@ FileList_split(const char *path, char sep) static int isJarFileName(const char *filename) { - int len = JLI_StrLen(filename); + int len = (int)JLI_StrLen(filename); return (len >= 4) && (filename[len - 4] == '.') && (equal(filename + len - 3, "jar") || @@ -342,8 +342,8 @@ isJarFileName(const char *filename) static char * wildcardConcat(const char *wildcard, const char *basename) { - int wildlen = JLI_StrLen(wildcard); - int baselen = JLI_StrLen(basename); + int wildlen = (int)JLI_StrLen(wildcard); + int baselen = (int)JLI_StrLen(basename); char *filename = (char *) JLI_MemAlloc(wildlen + baselen); /* Replace the trailing '*' with basename */ memcpy(filename, wildcard, wildlen-1); @@ -369,7 +369,7 @@ wildcardFileList(const char *wildcard) static int isWildcard(const char *filename) { - int len = JLI_StrLen(filename); + int len = (int)JLI_StrLen(filename); return (len > 0) && (filename[len - 1] == '*') && (len == 1 || IS_FILE_SEPARATOR(filename[len - 2])) && diff --git a/src/share/native/java/util/zip/zlib-1.2.3/zcrc32.c b/src/share/native/java/util/zip/zlib-1.2.3/zcrc32.c index 580e26c83..0fd9a92c0 100644 --- a/src/share/native/java/util/zip/zlib-1.2.3/zcrc32.c +++ b/src/share/native/java/util/zip/zlib-1.2.3/zcrc32.c @@ -406,7 +406,7 @@ uLong ZEXPORT crc32_combine(crc1, crc2, len2) return crc1; /* put operator for one zero bit in odd */ - odd[0] = 0xedb88320L; /* CRC-32 polynomial */ + odd[0] = 0xedb88320UL; /* CRC-32 polynomial */ row = 1; for (n = 1; n < GF2_DIM; n++) { odd[n] = row; diff --git a/src/solaris/bin/java_md.c b/src/solaris/bin/java_md.c index ca1ce5b9f..441d41efe 100644 --- a/src/solaris/bin/java_md.c +++ b/src/solaris/bin/java_md.c @@ -868,7 +868,7 @@ LocateJRE(manifest_info* info) while (dp != NULL) { cp = JLI_StrChr(dp, (int)':'); if (cp != NULL) - *cp = (char)NULL; + *cp = '\0'; if ((target = ProcessDir(info, dp)) != NULL) break; dp = cp; diff --git a/src/solaris/bin/jexec.c b/src/solaris/bin/jexec.c index 24ba47ed9..951b42bfe 100644 --- a/src/solaris/bin/jexec.c +++ b/src/solaris/bin/jexec.c @@ -221,6 +221,7 @@ int main(int argc, const char * argv[]) { * implies an error in the exec. */ free(nargv); errorExit(errno, BAD_EXEC_MSG); + return 0; // keep the compiler happy } diff --git a/src/windows/bin/java_md.c b/src/windows/bin/java_md.c index 06824ce31..cef7db8c1 100644 --- a/src/windows/bin/java_md.c +++ b/src/windows/bin/java_md.c @@ -208,7 +208,7 @@ EnsureJreInstallation(const char* jrepath) struct stat s; /* Make sure the jrepath contains something */ - if (jrepath[0] == NULL) { + if ((void*)jrepath[0] == NULL) { return; } /* 32 bit windows only please */ @@ -540,7 +540,7 @@ JLI_ReportErrorMessageSys(const char *fmt, ...) /* get the length of the string we need */ int len = mlen = _vscprintf(fmt, vl) + 1; if (freeit) { - mlen += JLI_StrLen(errtext); + mlen += (int)JLI_StrLen(errtext); } message = (char *)JLI_MemAlloc(mlen); @@ -997,7 +997,6 @@ ExecJRE(char *jre, char **argv) { exit(exitCode); } - } /* -- GitLab