Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make(1): remove redundant null check from s2Boolean

This commit is contained in:
rillig 2020-10-31 09:27:19 +00:00
parent 269a504494
commit 1260fc7594
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
usr.bin/make/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.415 2020/10/31 09:23:38 rillig Exp $ */
/* $NetBSD: main.c,v 1.416 2020/10/31 09:27:19 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@ -118,7 +118,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
MAKE_RCSID("$NetBSD: main.c,v 1.415 2020/10/31 09:23:38 rillig Exp $");
MAKE_RCSID("$NetBSD: main.c,v 1.416 2020/10/31 09:27:19 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@ -2206,22 +2206,20 @@ mkTempFile(const char *pattern, char **out_fname)
Boolean
s2Boolean(const char *s, Boolean bf)
{
if (s) {
switch(*s) {
case '\0': /* not set - the default wins */
break;
case '0':
case 'F':
case 'f':
case 'N':
case 'n':
return FALSE;
case 'O':
case 'o':
return s[1] != 'F' && s[1] != 'f';
default:
return TRUE;
}
switch(s[0]) {
case '\0': /* not set - the default wins */
break;
case '0':
case 'F':
case 'f':
case 'N':
case 'n':
return FALSE;
case 'O':
case 'o':
return s[1] != 'F' && s[1] != 'f';
default:
return TRUE;
}
return bf;
}

6
usr.bin/make/var.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: var.c,v 1.612 2020/10/31 09:03:36 rillig Exp $ */
/* $NetBSD: var.c,v 1.613 2020/10/31 09:27:19 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@ -129,7 +129,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
MAKE_RCSID("$NetBSD: var.c,v 1.612 2020/10/31 09:03:36 rillig Exp $");
MAKE_RCSID("$NetBSD: var.c,v 1.613 2020/10/31 09:27:19 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@ -853,7 +853,7 @@ Var_Set_with_flags(const char *name, const char *val, GNode *ctxt,
* Makefile settings.
*/
if (!opts.varNoExportEnv)
setenv(name, val ? val : "", 1);
setenv(name, val, 1);
Var_Append(MAKEOVERRIDES, name, VAR_GLOBAL);
}