From 113bfd010cdc83fc5a07856a1df3b6aee880239a Mon Sep 17 00:00:00 2001 From: Jiri Palecek Date: Fri, 7 Nov 2008 12:24:11 +0100 Subject: [PATCH] Small code fixes - added a proper sintinel value to execlp() call in pan.c - don't use buffer address as condition in zoolib.c - fix improper parentheses in kill0{3,4}.c --- pan/pan.c | 2 +- pan/zoolib.c | 6 +++--- testcases/kernel/syscalls/kill/kill03.c | 4 ++-- testcases/kernel/syscalls/kill/kill04.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pan/pan.c b/pan/pan.c index e392c3b..7b6f5fe 100644 --- a/pan/pan.c +++ b/pan/pan.c @@ -895,7 +895,7 @@ run_child(struct coll_entry *colle, struct tag_pgrp *active, int quiet_mode) * cmd directly. */ if (strpbrk(c_cmdline, "\"';|<>$\\")) { - execlp("sh", "sh", "-c", c_cmdline, 0); + execlp("sh", "sh", "-c", c_cmdline, (char*)0); errlen = sprintf(errbuf, "pan(%s): execlp of '%s' (tag %s) failed. errno:%d %s", panname, c_cmdline, colle->name, errno, strerror(errno)); diff --git a/pan/zoolib.c b/pan/zoolib.c index ece025d..b2cbce5 100644 --- a/pan/zoolib.c +++ b/pan/zoolib.c @@ -169,7 +169,7 @@ zoo_mark(zoo_t z, char *entry) found = 1; break; } - } while (buf); + } while (1); if (!found) { if (fseek(fp, 0, SEEK_END)) { @@ -251,7 +251,7 @@ zoo_clear(zoo_t z, pid_t p) found = 1; break; } - } while (buf); + } while (1); fflush( fp ); @@ -299,7 +299,7 @@ zoo_getpid(zoo_t z, char *tag) this_pid = atoi(buf); break; - } while (buf); + } while (1); if (zoo_unlock(z)) return -1; diff --git a/testcases/kernel/syscalls/kill/kill03.c b/testcases/kernel/syscalls/kill/kill03.c index 25360f3..41ac3e6 100644 --- a/testcases/kernel/syscalls/kill/kill03.c +++ b/testcases/kernel/syscalls/kill/kill03.c @@ -122,8 +122,8 @@ int main(int ac, char **av) if (TEST_RETURN != -1) { tst_brkm(TFAIL, cleanup, "%s failed - errno = %d : %s " "Expected a return value of -1 got %d", - TCID, TEST_ERRNO, strerror(TEST_ERRNO)), - TEST_RETURN; + TCID, TEST_ERRNO, strerror(TEST_ERRNO), + TEST_RETURN); /*NOTREACHED*/ } diff --git a/testcases/kernel/syscalls/kill/kill04.c b/testcases/kernel/syscalls/kill/kill04.c index 6330c7e..dea313a 100644 --- a/testcases/kernel/syscalls/kill/kill04.c +++ b/testcases/kernel/syscalls/kill/kill04.c @@ -137,8 +137,8 @@ int main(int ac, char **av) if (TEST_RETURN != -1) { tst_brkm(TFAIL, cleanup, "%s failed - errno = %d : %s " "Expected a return value of -1 got %d", - TCID, TEST_ERRNO, strerror(TEST_ERRNO)), - TEST_RETURN; + TCID, TEST_ERRNO, strerror(TEST_ERRNO), + TEST_RETURN); /*NOTREACHED*/ } -- 1.6.0.2 Signed-off-by: Jiri Palecek