1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8287363: null pointer should use NULL instead of 0

Browse Source 
Reviewed-by: kbarrett, stuefe, alanb
This commit is contained in:
Yasumasa Suenaga 2022-05-30 07:02:07 +00:00
parent 744b822ab1
commit a27ba1a3db
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java.base/unix/native/libjli/java_md_common.c
View File

@ -133,7 +133,7 @@ Resolve(char *indir, char *cmd)
if ((snprintf_result < 0) || (snprintf_result >= (int)sizeof(name))) { if ((snprintf_result < 0) || (snprintf_result >= (int)sizeof(name))) {
return NULL; return NULL;
} }
if (!ProgramExists(name)) return 0; if (!ProgramExists(name)) return NULL;
real = JLI_MemAlloc(PATH_MAX + 2); real = JLI_MemAlloc(PATH_MAX + 2);
if (!realpath(name, real)) if (!realpath(name, real))
JLI_StrCpy(real, name); JLI_StrCpy(real, name);
@ -158,7 +158,7 @@ FindExecName(char *program)
return Resolve("", program+1); return Resolve("", program+1);
/* relative path? */ /* relative path? */
if (JLI_StrRChr(program, FILE_SEPARATOR) != 0) { if (JLI_StrRChr(program, FILE_SEPARATOR) != NULL) {
char buf[PATH_MAX+2]; char buf[PATH_MAX+2];
return Resolve(getcwd(cwdbuf, sizeof(cwdbuf)), program); return Resolve(getcwd(cwdbuf, sizeof(cwdbuf)), program);
} }
@ -169,10 +169,10 @@ FindExecName(char *program)
tmp_path = JLI_MemAlloc(JLI_StrLen(path) + 2); tmp_path = JLI_MemAlloc(JLI_StrLen(path) + 2);
JLI_StrCpy(tmp_path, path); JLI_StrCpy(tmp_path, path);
for (f=tmp_path; *f && result==0; ) { for (f = tmp_path; *f && result == NULL; ) {
char *s = f; char *s = f;
while (*f && (*f != PATH_SEPARATOR)) ++f; while (*f && (*f != PATH_SEPARATOR)) ++f;
if (*f) *f++ = 0; if (*f) *f++ = '\0';
if (*s == FILE_SEPARATOR) if (*s == FILE_SEPARATOR)
result = Resolve(s, program); result = Resolve(s, program);
else { else {
@ -182,7 +182,7 @@ FindExecName(char *program)
FILE_SEPARATOR, s); FILE_SEPARATOR, s);
result = Resolve(dir, program); result = Resolve(dir, program);
} }
if (result != 0) break; if (result != NULL) break;
} }
JLI_MemFree(tmp_path); JLI_MemFree(tmp_path);