Module Name: src
Committed By: rillig
Date: Thu Oct 22 05:50:03 UTC 2020
Modified Files:
src/usr.bin/make: arch.c cond.c dir.c job.c main.c make.c parse.c str.c
suff.c targ.c var.c
Log Message:
make(1): remove redundant type casts
This mainly affects the void pointers in callback functions for lists.
These had been necessary once when the parameter type was still
ClientData instead of void pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/usr.bin/make/arch.c
cvs rdiff -u -r1.164 -r1.165 src/usr.bin/make/cond.c
cvs rdiff -u -r1.171 -r1.172 src/usr.bin/make/dir.c
cvs rdiff -u -r1.267 -r1.268 src/usr.bin/make/job.c
cvs rdiff -u -r1.379 -r1.380 src/usr.bin/make/main.c
cvs rdiff -u -r1.166 -r1.167 src/usr.bin/make/make.c
cvs rdiff -u -r1.395 -r1.396 src/usr.bin/make/parse.c
cvs rdiff -u -r1.68 -r1.69 src/usr.bin/make/str.c
cvs rdiff -u -r1.212 -r1.213 src/usr.bin/make/suff.c
cvs rdiff -u -r1.119 -r1.120 src/usr.bin/make/targ.c
cvs rdiff -u -r1.580 -r1.581 src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/arch.c
diff -u src/usr.bin/make/arch.c:1.137 src/usr.bin/make/arch.c:1.138
--- src/usr.bin/make/arch.c:1.137 Mon Oct 19 21:57:37 2020
+++ src/usr.bin/make/arch.c Thu Oct 22 05:50:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.137 2020/10/19 21:57:37 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.138 2020/10/22 05:50:02 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "config.h"
/* "@(#)arch.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: arch.c,v 1.137 2020/10/19 21:57:37 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.138 2020/10/22 05:50:02 rillig Exp $");
#ifdef TARGET_MACHINE
#undef MAKE_MACHINE
@@ -165,7 +165,7 @@ static int ArchSVR4Entry(Arch *, char *,
static void
ArchFree(void *ap)
{
- Arch *a = (Arch *)ap;
+ Arch *a = ap;
HashIter hi;
HashEntry *he;
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.164 src/usr.bin/make/cond.c:1.165
--- src/usr.bin/make/cond.c:1.164 Sun Oct 18 17:19:54 2020
+++ src/usr.bin/make/cond.c Thu Oct 22 05:50:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.164 2020/10/18 17:19:54 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.165 2020/10/22 05:50:02 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -93,7 +93,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.164 2020/10/18 17:19:54 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.165 2020/10/22 05:50:02 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -355,7 +355,7 @@ TryParseNumber(const char *str, double *
errno = 0;
if (!*str) {
- *value = (double)0;
+ *value = 0.0;
return TRUE;
}
l_val = strtoul(str, &eptr, str[1] == 'x' ? 16 : 10);
Index: src/usr.bin/make/dir.c
diff -u src/usr.bin/make/dir.c:1.171 src/usr.bin/make/dir.c:1.172
--- src/usr.bin/make/dir.c:1.171 Mon Oct 19 21:57:37 2020
+++ src/usr.bin/make/dir.c Thu Oct 22 05:50:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.171 2020/10/19 21:57:37 rillig Exp $ */
+/* $NetBSD: dir.c,v 1.172 2020/10/22 05:50:02 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -135,7 +135,7 @@
#include "job.h"
/* "@(#)dir.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: dir.c,v 1.171 2020/10/19 21:57:37 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.172 2020/10/22 05:50:02 rillig Exp $");
#define DIR_DEBUG0(text) DEBUG0(DIR, text)
#define DIR_DEBUG1(fmt, arg1) DEBUG1(DIR, fmt, arg1)
@@ -1570,10 +1570,9 @@ Dir_AddDir(SearchPath *path, const char
void *
Dir_CopyDir(void *p)
{
- CachedDir *dir = (CachedDir *)p;
+ CachedDir *dir = p;
dir->refCount++;
-
- return p;
+ return dir;
}
/*-
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.267 src/usr.bin/make/job.c:1.268
--- src/usr.bin/make/job.c:1.267 Mon Oct 19 23:43:55 2020
+++ src/usr.bin/make/job.c Thu Oct 22 05:50:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.267 2020/10/19 23:43:55 rillig Exp $ */
+/* $NetBSD: job.c,v 1.268 2020/10/22 05:50:02 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.267 2020/10/19 23:43:55 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.268 2020/10/22 05:50:02 rillig Exp $");
# define STATIC static
@@ -651,8 +651,8 @@ JobPrintCommand(void *cmdp, void *jobp)
* command */
char *cmdStart; /* Start of expanded command */
char *escCmd = NULL; /* Command with quotes/backticks escaped */
- char *cmd = (char *)cmdp;
- Job *job = (Job *)jobp;
+ char *cmd = cmdp;
+ Job *job = jobp;
noSpecials = NoExecute(job->node);
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.379 src/usr.bin/make/main.c:1.380
--- src/usr.bin/make/main.c:1.379 Mon Oct 19 21:57:37 2020
+++ src/usr.bin/make/main.c Thu Oct 22 05:50:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.379 2020/10/19 21:57:37 rillig Exp $ */
+/* $NetBSD: main.c,v 1.380 2020/10/22 05:50:02 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.379 2020/10/19 21:57:37 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.380 2020/10/22 05:50:02 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -2023,7 +2023,7 @@ dieQuietly(GNode *gn, int bf)
else if (bf >= 0)
quietly = bf;
else
- quietly = (gn) ? ((gn->type & (OP_MAKE)) != 0) : 0;
+ quietly = gn != NULL ? ((gn->type & (OP_MAKE)) != 0) : 0;
}
return quietly;
}
Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.166 src/usr.bin/make/make.c:1.167
--- src/usr.bin/make/make.c:1.166 Mon Oct 19 23:43:55 2020
+++ src/usr.bin/make/make.c Thu Oct 22 05:50:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.166 2020/10/19 23:43:55 rillig Exp $ */
+/* $NetBSD: make.c,v 1.167 2020/10/22 05:50:02 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -107,7 +107,7 @@
#include "job.h"
/* "@(#)make.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: make.c,v 1.166 2020/10/19 23:43:55 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.167 2020/10/22 05:50:02 rillig Exp $");
/* Sequence # to detect recursion. */
static unsigned int checked = 1;
@@ -363,8 +363,8 @@ MakeAddChild(void *gnp, void *lp)
static int
MakeFindChild(void *gnp, void *pgnp)
{
- GNode *gn = (GNode *)gnp;
- GNode *pgn = (GNode *)pgnp;
+ GNode *gn = gnp;
+ GNode *pgn = pgnp;
(void)Dir_MTime(gn, 0);
Make_TimeStamp(pgn, gn);
@@ -1027,7 +1027,7 @@ MakePrintStatusOrder(void *ognp, void *g
static int
MakePrintStatus(void *gnp, void *v_errors)
{
- GNode *gn = (GNode *)gnp;
+ GNode *gn = gnp;
int *errors = v_errors;
if (gn->flags & DONECYCLE)
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.395 src/usr.bin/make/parse.c:1.396
--- src/usr.bin/make/parse.c:1.395 Tue Oct 20 22:50:55 2020
+++ src/usr.bin/make/parse.c Thu Oct 22 05:50:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.395 2020/10/20 22:50:55 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.396 2020/10/22 05:50:02 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -131,7 +131,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.395 2020/10/20 22:50:55 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.396 2020/10/22 05:50:02 rillig Exp $");
/* types and constants */
@@ -431,7 +431,7 @@ load_getsize(int fd, size_t *ret)
return FALSE;
}
- *ret = (size_t) st.st_size;
+ *ret = (size_t)st.st_size;
return TRUE;
}
Index: src/usr.bin/make/str.c
diff -u src/usr.bin/make/str.c:1.68 src/usr.bin/make/str.c:1.69
--- src/usr.bin/make/str.c:1.68 Mon Oct 5 19:27:47 2020
+++ src/usr.bin/make/str.c Thu Oct 22 05:50:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: str.c,v 1.68 2020/10/05 19:27:47 rillig Exp $ */
+/* $NetBSD: str.c,v 1.69 2020/10/22 05:50:02 rillig Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
@@ -71,7 +71,7 @@
#include "make.h"
/* "@(#)str.c 5.8 (Berkeley) 6/1/90" */
-MAKE_RCSID("$NetBSD: str.c,v 1.68 2020/10/05 19:27:47 rillig Exp $");
+MAKE_RCSID("$NetBSD: str.c,v 1.69 2020/10/22 05:50:02 rillig Exp $");
/* Return the concatenation of s1 and s2, freshly allocated. */
char *
@@ -169,7 +169,7 @@ Str_Words(const char *str, Boolean expan
else
break;
} else {
- inquote = (char)ch;
+ inquote = ch;
/* Don't miss "" or '' */
if (word_start == NULL && str_p[1] == inquote) {
if (!expand) {
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.212 src/usr.bin/make/suff.c:1.213
--- src/usr.bin/make/suff.c:1.212 Wed Oct 21 08:20:13 2020
+++ src/usr.bin/make/suff.c Thu Oct 22 05:50:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.212 2020/10/21 08:20:13 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.213 2020/10/22 05:50:02 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -129,7 +129,7 @@
#include "dir.h"
/* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.212 2020/10/21 08:20:13 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.213 2020/10/22 05:50:02 rillig Exp $");
#define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
#define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
@@ -313,7 +313,7 @@ SuffUnRef(SuffList *list, Suff *suff)
static void
SuffFree(void *sp)
{
- Suff *s = (Suff *)sp;
+ Suff *s = sp;
if (s == suffNull)
suffNull = NULL;
Index: src/usr.bin/make/targ.c
diff -u src/usr.bin/make/targ.c:1.119 src/usr.bin/make/targ.c:1.120
--- src/usr.bin/make/targ.c:1.119 Mon Oct 19 23:43:55 2020
+++ src/usr.bin/make/targ.c Thu Oct 22 05:50:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: targ.c,v 1.119 2020/10/19 23:43:55 rillig Exp $ */
+/* $NetBSD: targ.c,v 1.120 2020/10/22 05:50:02 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -121,7 +121,7 @@
#include "dir.h"
/* "@(#)targ.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: targ.c,v 1.119 2020/10/19 23:43:55 rillig Exp $");
+MAKE_RCSID("$NetBSD: targ.c,v 1.120 2020/10/22 05:50:02 rillig Exp $");
static GNodeList *allTargets; /* the list of all targets found so far */
#ifdef CLEANUP
@@ -215,7 +215,7 @@ Targ_NewGN(const char *name)
static void
TargFreeGN(void *gnp)
{
- GNode *gn = (GNode *)gnp;
+ GNode *gn = gnp;
free(gn->name);
free(gn->uname);
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.580 src/usr.bin/make/var.c:1.581
--- src/usr.bin/make/var.c:1.580 Thu Oct 22 05:35:21 2020
+++ src/usr.bin/make/var.c Thu Oct 22 05:50:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.580 2020/10/22 05:35:21 rillig Exp $ */
+/* $NetBSD: var.c,v 1.581 2020/10/22 05:50:02 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -121,7 +121,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.580 2020/10/22 05:35:21 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.581 2020/10/22 05:50:02 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -459,7 +459,7 @@ Var_Delete(const char *name, GNode *ctxt
free(name_freeIt);
if (he != NULL) {
- Var *v = (Var *)Hash_GetValue(he);
+ Var *v = Hash_GetValue(he);
if (v->flags & VAR_EXPORTED)
unsetenv(v->name);
if (strcmp(v->name, MAKE_EXPORTED) == 0)
