52 lines
1.8 KiB
Plaintext
52 lines
1.8 KiB
Plaintext
$OpenBSD: patch-builtin_help_c,v 1.1 2010/06/20 11:49:41 bernd Exp $
|
|
|
|
Fix "warning: missing sentinel in function call" on 64bit archs.
|
|
|
|
--- builtin/help.c.orig Fri Feb 12 19:44:43 2010
|
|
+++ builtin/help.c Mon Mar 1 19:57:35 2010
|
|
@@ -120,7 +120,7 @@ static void exec_woman_emacs(const char *path, const c
|
|
if (!path)
|
|
path = "emacsclient";
|
|
strbuf_addf(&man_page, "(woman \"%s\")", page);
|
|
- execlp(path, "emacsclient", "-e", man_page.buf, NULL);
|
|
+ execlp(path, "emacsclient", "-e", man_page.buf, (void *)NULL);
|
|
warning("failed to exec '%s': %s", path, strerror(errno));
|
|
}
|
|
}
|
|
@@ -148,7 +148,7 @@ static void exec_man_konqueror(const char *path, const
|
|
} else
|
|
path = "kfmclient";
|
|
strbuf_addf(&man_page, "man:%s(1)", page);
|
|
- execlp(path, filename, "newTab", man_page.buf, NULL);
|
|
+ execlp(path, filename, "newTab", man_page.buf, (void *)NULL);
|
|
warning("failed to exec '%s': %s", path, strerror(errno));
|
|
}
|
|
}
|
|
@@ -157,7 +157,7 @@ static void exec_man_man(const char *path, const char
|
|
{
|
|
if (!path)
|
|
path = "man";
|
|
- execlp(path, "man", page, NULL);
|
|
+ execlp(path, "man", page, (void *)NULL);
|
|
warning("failed to exec '%s': %s", path, strerror(errno));
|
|
}
|
|
|
|
@@ -165,7 +165,7 @@ static void exec_man_cmd(const char *cmd, const char *
|
|
{
|
|
struct strbuf shell_cmd = STRBUF_INIT;
|
|
strbuf_addf(&shell_cmd, "%s %s", cmd, page);
|
|
- execl("/bin/sh", "sh", "-c", shell_cmd.buf, NULL);
|
|
+ execl("/bin/sh", "sh", "-c", shell_cmd.buf, (void *)NULL);
|
|
warning("failed to exec '%s': %s", cmd, strerror(errno));
|
|
}
|
|
|
|
@@ -372,7 +372,7 @@ static void show_info_page(const char *git_cmd)
|
|
{
|
|
const char *page = cmd_to_page(git_cmd);
|
|
setenv("INFOPATH", system_path(GIT_INFO_PATH), 1);
|
|
- execlp("info", "info", "gitman", page, NULL);
|
|
+ execlp("info", "info", "gitman", page, (void *)NULL);
|
|
die("no info viewer handled the request");
|
|
}
|
|
|