cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

final round:

Browse Source 
cast NULL sentinel to void * so it is 64bit on alpha & sparc64, use
NULL instead of '0' where appropriate.
This commit is contained in:
pvalchev 2002-12-30 09:15:26 +00:00
parent 33697948d0
commit 4d9627f908
9 changed files with 177 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devel/soup/patches/patch-src_libsoup_soup-ssl_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_libsoup_soup-ssl_c,v 1.1 2002/12/30 09:15:26 pvalchev Exp $
--- src/libsoup/soup-ssl.c.orig Mon Dec 30 00:32:53 2002
+++ src/libsoup/soup-ssl.c Mon Dec 30 00:33:16 2002
@@ -103,9 +103,9 @@ soup_ssl_get_iochannel (GIOChannel *sock
execl (BINDIR G_DIR_SEPARATOR_S SSL_PROXY_NAME,
BINDIR G_DIR_SEPARATOR_S SSL_PROXY_NAME,
- NULL);
+ (void *)NULL);
- execlp (SSL_PROXY_NAME, SSL_PROXY_NAME, NULL);
+ execlp (SSL_PROXY_NAME, SSL_PROXY_NAME, (void *)NULL);
g_error ("Error executing SSL Proxy\n");
}

12
graphics/s10sh/patches/patch-common_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-common_c,v 1.1 2002/12/30 09:15:26 pvalchev Exp $
--- common.c.orig Mon Dec 30 00:30:09 2002
+++ common.c Mon Dec 30 00:30:19 2002
@@ -589,7 +589,7 @@ int view_thumb(char *pathname)
}
if (childpid == 0) { /* child */
- execlp("xv", "xv", TEMP_FILE_NAME, "-geometry", "+200+100", NULL);
+ execlp("xv", "xv", TEMP_FILE_NAME, "-geometry", "+200+100", (void *)NULL);
perror("exec");
} else { /* parent */
printf("(d)elete (o)old (n)ew (g)et (q)uit (enter)nothing\n");

75
misc/rpm/patches/patch-lib_signature_c Normal file
View File

@ -0,0 +1,75 @@
$OpenBSD: patch-lib_signature_c,v 1.1 2002/12/30 09:15:26 pvalchev Exp $
--- lib/signature.c.orig Mon Dec 30 00:27:20 2002
+++ lib/signature.c Mon Dec 30 00:28:17 2002
@@ -253,11 +253,11 @@ static int makePGPSignature(const char *
switch(pgpVer) {
case PGP_2:
execlp(path, "pgp", "+batchmode=on", "+verbose=0", "+armor=off",
- name, "-sb", file, sigfile, NULL);
+ name, "-sb", file, sigfile, (void *)NULL);
break;
case PGP_5:
execlp(path,"pgps", "+batchmode=on", "+verbose=0", "+armor=off",
- name, "-b", file, "-o", sigfile, NULL);
+ name, "-b", file, "-o", sigfile, (void *)NULL);
break;
case PGP_UNKNOWN:
case PGP_NOTDETECTED:
@@ -340,7 +340,7 @@ static int makeGPGSignature(const char *
execlp("gpg", "gpg",
"--batch", "--no-verbose", "--no-armor", "--passphrase-fd", "3",
"-u", name, "-sbo", sigfile, file,
- NULL);
+ (void *)NULL);
rpmError(RPMERR_EXEC, _("Couldn't exec gpg"));
_exit(RPMERR_EXEC);
}
@@ -536,14 +536,14 @@ static int verifyPGPSignature(const char
"+OutputInformationFD=1",
/* Write "WARNING: ... is not trusted to... to stdout: */
"+OutputWarningFD=1",
- sigfile, "-o", datafile, NULL);
+ sigfile, "-o", datafile, (void *)NULL);
/* Restore stderr so we can print the error message below. */
dup2(save_stderr, 2);
close(save_stderr);
} break;
case PGP_2:
execlp(path, "pgp", "+batchmode=on", "+verbose=0",
- sigfile, datafile, NULL);
+ sigfile, datafile, (void *)NULL);
break;
case PGP_UNKNOWN:
case PGP_NOTDETECTED:
@@ -622,7 +622,7 @@ static int verifyGPGSignature(const char
execlp("gpg", "gpg",
"--batch", "--no-verbose",
"--verify", sigfile, datafile,
- NULL);
+ (void *)NULL);
fprintf(stderr, _("exec failed!\n"));
rpmError(RPMERR_EXEC,
_("Could not run gpg. Use --nogpg to skip GPG checks."));
@@ -683,7 +683,7 @@ static int checkPassPhrase(const char *p
execlp("gpg", "gpg",
"--batch", "--no-verbose", "--passphrase-fd", "3",
"-u", name, "-so", "-",
- NULL);
+ (void *)NULL);
rpmError(RPMERR_EXEC, _("Couldn't exec gpg"));
_exit(RPMERR_EXEC);
} /*@notreached@*/ break;
@@ -702,11 +702,11 @@ static int checkPassPhrase(const char *p
switch(pgpVer) {
case PGP_2:
execlp(path, "pgp", "+batchmode=on", "+verbose=0",
- name, "-sf", NULL);
+ name, "-sf", (void *)NULL);
break;
case PGP_5: /* XXX legacy */
execlp(path,"pgps", "+batchmode=on", "+verbose=0",
- name, "-f", NULL);
+ name, "-f", (void *)NULL);
break;
case PGP_UNKNOWN:
case PGP_NOTDETECTED:

12
misc/rpm/patches/patch-rpm_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-rpm_c,v 1.1 2002/12/30 09:15:26 pvalchev Exp $
--- rpm.c.orig Mon Dec 30 00:28:26 2002
+++ rpm.c Mon Dec 30 00:28:31 2002
@@ -1191,7 +1191,7 @@ int main(int argc, const char ** argv)
close(p[1]);
dup2(p[0], STDIN_FILENO);
close(p[0]);
- execl("/bin/sh", "/bin/sh", "-c", pipeOutput, NULL);
+ execl("/bin/sh", "/bin/sh", "-c", pipeOutput, (void *)NULL);
fprintf(stderr, _("exec failed\n"));
}

15
net/wmnet/patches/patch-wmnet_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-wmnet_c,v 1.1 2002/10/01 06:18:24 pvalchev Exp $
--- wmnet.c.orig Fri May 5 07:01:14 2000
+++ wmnet.c Thu Sep 12 03:42:25 2002
$OpenBSD: patch-wmnet_c,v 1.2 2002/12/30 09:15:26 pvalchev Exp $
--- wmnet.c.orig Thu May 4 19:01:14 2000
+++ wmnet.c Mon Dec 30 00:51:50 2002
@@ -76,6 +76,24 @@
#include "XPM/arrow.xbm"
#include "wmnet.h"
@ -126,6 +126,15 @@ $OpenBSD: patch-wmnet_c,v 1.1 2002/10/01 06:18:24 pvalchev Exp $
XSetForeground(dpy, graphics_context, rx_pixel[HIGH_INTENSITY]);
XCopyPlane(dpy, arrow, *visible_window, graphics_context, 0, 0, 7, 9, 46, 5, 1);
/* XFillRectangle(dpy, *visible_window, graphics_context, 55, 12, 4, 4); */
@@ -732,7 +747,7 @@ int main(int argc, char ** argv) {
case ButtonPress:
if(event.xbutton.button == Button1 && click_command != NULL) {
if (fork() == 0) {
- execl("/bin/sh", "sh", "-c", click_command, NULL);
+ execl("/bin/sh", "sh", "-c", click_command, (void *)NULL);
perror("wmnet: execl()");
exit(15);
}
@@ -747,4 +762,3 @@ int main(int argc, char ** argv) {
}
return 0;

12
net/xchat/patches/patch-src_common_outbound_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_common_outbound_c,v 1.1 2002/12/30 09:15:26 pvalchev Exp $
--- src/common/outbound.c.orig Mon Dec 30 00:53:29 2002
+++ src/common/outbound.c Mon Dec 30 00:53:37 2002
@@ -1879,7 +1879,7 @@ cmd_exec (struct session *sess, char *tb
/* Now we call /bin/sh to run our cmd ; made it more friendly -DC1 */
if (shell)
{
- execl ("/bin/sh", "sh", "-c", cmd, 0);
+ execl ("/bin/sh", "sh", "-c", cmd, (void *)NULL);
} else
{
char **argv;

12
sysutils/syslog-ng/development/patches/patch-src_afprogram_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_afprogram_c,v 1.1 2002/12/30 09:15:26 pvalchev Exp $
--- src/afprogram.c.orig Mon Dec 30 00:34:29 2002
+++ src/afprogram.c Mon Dec 30 00:34:47 2002
@@ -89,7 +89,7 @@ do_init_afprogram_dest(struct log_handle
dup2(fd, 2);
close(fd);
close(msgpipe[1]);
- execl("/bin/sh", "/bin/sh", "-c", self->progname->data, NULL);
+ execl("/bin/sh", "/bin/sh", "-c", self->progname->data, (void *)NULL);
_exit(127);
}
else {

15
x11/xfm/patches/patch-src_FmFw_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_FmFw_c,v 1.1 2002/12/30 09:15:26 pvalchev Exp $
--- src/FmFw.c.orig Mon Dec 30 00:55:35 2002
+++ src/FmFw.c Mon Dec 30 00:56:08 2002
@@ -754,9 +754,9 @@ static int devAction(int d, char *action
fprintf(stderr, "%s\n", action);
freopen("/dev/null", "r", stdin);
if (user.arg0flag)
- execlp(user.shell, user.shell, "-c", action, user.shell, NULL);
+ execlp(user.shell, user.shell, "-c", action, user.shell, (void *)NULL);
else
- execlp(user.shell, user.shell, "-c", action, NULL);
+ execlp(user.shell, user.shell, "-c", action, (void *)NULL);
perror("Exec failed");
exit(1);
} else if (waitpid(pid, &status, 0) == -1 || !WIFEXITED(status) ||

12
x11/xfm/patches/patch-src_FmMain_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_FmMain_c,v 1.1 2002/12/30 09:15:26 pvalchev Exp $
--- src/FmMain.c.orig Mon Dec 30 00:55:17 2002
+++ src/FmMain.c Mon Dec 30 00:55:29 2002
@@ -353,7 +353,7 @@ int shell_test(UserInfo *ui)
perror("(child) Can't close pipe");
exit(1);
}
- execlp(ui->shell, ui->shell, "-c", "echo $*", "1", NULL);
+ execlp(ui->shell, ui->shell, "-c", "echo $*", "1", (void *)NULL);
perror("Exec failed");
exit(1);
} else { /* parent; read and check the child's output */