compile warning-free on SUNpro (regression test suite pass) for MirBSD

This commit is contained in:
tg 2007-06-04 21:33:28 +00:00
parent 6e1bfd6e4b
commit 1e93f97b8c
4 changed files with 9 additions and 9 deletions

View File

@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/check.t,v 1.108 2007/05/24 19:50:38 tg Exp $ # $MirOS: src/bin/mksh/check.t,v 1.109 2007/06/04 21:33:27 tg Exp $
# $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $
# $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $
# $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $ # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
@ -7,7 +7,7 @@
# http://www.research.att.com/~gsf/public/ifs.sh # http://www.research.att.com/~gsf/public/ifs.sh
expected-stdout: expected-stdout:
@(#)MIRBSD KSH R29 2007/05/24 @(#)MIRBSD KSH R29 2007/06/04
description: description:
Check version of shell. Check version of shell.
category: pdksh category: pdksh

View File

@ -5,7 +5,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.53 2007/05/13 18:49:00 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.54 2007/06/04 21:33:27 tg Exp $");
int int
c_cd(const char **wp) c_cd(const char **wp)
@ -1373,7 +1373,7 @@ const struct builtin kshbuiltins [] = {
{"+bg", c_fgbg}, {"+bg", c_fgbg},
{"+fg", c_fgbg}, {"+fg", c_fgbg},
{"bind", c_bind}, {"bind", c_bind},
{NULL, NULL} {NULL, (int (*)(const char **))NULL}
}; };
static void p_time(struct shf *, int, struct timeval *, int, static void p_time(struct shf *, int, struct timeval *, int,
@ -2331,7 +2331,7 @@ const struct builtin shbuiltins [] = {
#if !defined(MKSH_SMALL) || defined(MKSH_NEED_MKNOD) #if !defined(MKSH_SMALL) || defined(MKSH_NEED_MKNOD)
{"mknod", c_mknod}, {"mknod", c_mknod},
#endif #endif
{NULL, NULL} {NULL, (int (*)(const char **))NULL}
}; };
/* test(1) accepts the following grammar: /* test(1) accepts the following grammar:

View File

@ -3,7 +3,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.46 2007/05/13 17:51:22 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.47 2007/06/04 21:33:28 tg Exp $");
Trap sigtraps[NSIG + 1]; Trap sigtraps[NSIG + 1];
static struct sigaction Sigact_ign, Sigact_trap; static struct sigaction Sigact_ign, Sigact_trap;
@ -1336,7 +1336,7 @@ setsig(Trap *p, sig_t f, int flags)
* all users of shtrap are lifetime users (SIGCHLD, SIGALRM, SIGWINCH). * all users of shtrap are lifetime users (SIGCHLD, SIGALRM, SIGWINCH).
*/ */
if (!(flags & SS_USER)) if (!(flags & SS_USER))
p->shtrap = NULL; p->shtrap = (sig_t)NULL;
if (flags & SS_SHTRAP) { if (flags & SS_SHTRAP) {
p->shtrap = f; p->shtrap = f;
f = trapsig; f = trapsig;

4
sh.h
View File

@ -8,8 +8,8 @@
/* $OpenBSD: c_test.h,v 1.4 2004/12/20 11:34:26 otto Exp $ */ /* $OpenBSD: c_test.h,v 1.4 2004/12/20 11:34:26 otto Exp $ */
/* $OpenBSD: tty.h,v 1.5 2004/12/20 11:34:26 otto Exp $ */ /* $OpenBSD: tty.h,v 1.5 2004/12/20 11:34:26 otto Exp $ */
#define MKSH_SH_H_ID "$MirOS: src/bin/mksh/sh.h,v 1.138 2007/06/04 21:27:53 tg Exp $" #define MKSH_SH_H_ID "$MirOS: src/bin/mksh/sh.h,v 1.139 2007/06/04 21:33:28 tg Exp $"
#define MKSH_VERSION "R29 2007/05/24" #define MKSH_VERSION "R29 2007/06/04"
#if HAVE_SYS_PARAM_H #if HAVE_SYS_PARAM_H
#include <sys/param.h> #include <sys/param.h>