summaryrefslogtreecommitdiff
path: root/timedrun.c
diff options
context:
space:
mode:
authorDustin Sallings <dustin@spy.net>2012-01-11 19:29:51 -0800
committerdormando <dormando@rydia.net>2012-01-11 21:12:46 -0800
commit016a87c593240b8d4430b3f139d90132439a5562 (patch)
tree09f1568366cefdb788017ad9699888696cc3152a /timedrun.c
parent595572c1003ae53d89d8ca4f7ccde51ea2196574 (diff)
downloadmemcached-016a87c593240b8d4430b3f139d90132439a5562.tar.gz
bug237: Don't compute incorrect argc for timedrun
Since spawn_and_wait doesn't use argc anyway, might as well just not send a value in.
Diffstat (limited to 'timedrun.c')
-rw-r--r--timedrun.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/timedrun.c b/timedrun.c
index 04f6aa2..6d7afb3 100644
--- a/timedrun.c
+++ b/timedrun.c
@@ -67,13 +67,11 @@ static int wait_for_process(pid_t pid)
return rv;
}
-static int spawn_and_wait(int argc, char **argv)
+static int spawn_and_wait(char **argv)
{
int rv = EX_SOFTWARE;
pid_t pid = fork();
- assert(argc > 1);
-
switch (pid) {
case -1:
perror("fork");
@@ -100,5 +98,5 @@ int main(int argc, char **argv)
alarm(naptime);
- return spawn_and_wait(argc+2, argv+2);
+ return spawn_and_wait(argv+2);
}