Module Name: src
Committed By: christos
Date: Sat Jan 5 16:54:00 UTC 2019
Modified Files:
src/bin/csh: alloc.c csh.c csh.h dir.c dol.c err.c exec.c exp.c
extern.h file.c func.c glob.c hist.c lex.c misc.c parse.c proc.c
sem.c set.c str.c
Log Message:
Welcome to the 21th century csh: retire "ptr_t" now that we have "void *"
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/bin/csh/alloc.c
cvs rdiff -u -r1.47 -r1.48 src/bin/csh/csh.c
cvs rdiff -u -r1.27 -r1.28 src/bin/csh/csh.h
cvs rdiff -u -r1.31 -r1.32 src/bin/csh/dir.c src/bin/csh/file.c
cvs rdiff -u -r1.30 -r1.31 src/bin/csh/dol.c src/bin/csh/extern.h \
src/bin/csh/sem.c
cvs rdiff -u -r1.22 -r1.23 src/bin/csh/err.c
cvs rdiff -u -r1.32 -r1.33 src/bin/csh/exec.c src/bin/csh/lex.c
cvs rdiff -u -r1.21 -r1.22 src/bin/csh/exp.c src/bin/csh/hist.c \
src/bin/csh/misc.c
cvs rdiff -u -r1.41 -r1.42 src/bin/csh/func.c
cvs rdiff -u -r1.29 -r1.30 src/bin/csh/glob.c
cvs rdiff -u -r1.18 -r1.19 src/bin/csh/parse.c
cvs rdiff -u -r1.37 -r1.38 src/bin/csh/proc.c
cvs rdiff -u -r1.34 -r1.35 src/bin/csh/set.c
cvs rdiff -u -r1.15 -r1.16 src/bin/csh/str.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/csh/alloc.c
diff -u src/bin/csh/alloc.c:1.14 src/bin/csh/alloc.c:1.15
--- src/bin/csh/alloc.c:1.14 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/alloc.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: alloc.c,v 1.14 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: alloc.c,v 1.15 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1983, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)alloc.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: alloc.c,v 1.14 2019/01/05 10:51:06 maya Exp $");
+__RCSID("$NetBSD: alloc.c,v 1.15 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -47,36 +47,36 @@ __RCSID("$NetBSD: alloc.c,v 1.14 2019/01
#include "csh.h"
#include "extern.h"
-ptr_t
+void *
Malloc(size_t n)
{
- ptr_t ptr;
+ void *ptr;
- if ((ptr = malloc(n)) == (ptr_t) 0) {
+ if ((ptr = malloc(n)) == NULL) {
child++;
stderror(ERR_NOMEM);
}
return (ptr);
}
-ptr_t
-Realloc(ptr_t p, size_t n)
+void *
+Realloc(void *p, size_t n)
{
- ptr_t ptr;
+ void *ptr;
- if ((ptr = realloc(p, n)) == (ptr_t) 0) {
+ if ((ptr = realloc(p, n)) == NULL) {
child++;
stderror(ERR_NOMEM);
}
return (ptr);
}
-ptr_t
+void *
Calloc(size_t s, size_t n)
{
- ptr_t ptr;
+ void *ptr;
- if ((ptr = calloc(s, n)) == (ptr_t) 0) {
+ if ((ptr = calloc(s, n)) == NULL) {
child++;
stderror(ERR_NOMEM);
}
Index: src/bin/csh/csh.c
diff -u src/bin/csh/csh.c:1.47 src/bin/csh/csh.c:1.48
--- src/bin/csh/csh.c:1.47 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/csh.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: csh.c,v 1.47 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: csh.c,v 1.48 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93";
#else
-__RCSID("$NetBSD: csh.c,v 1.47 2019/01/05 10:51:06 maya Exp $");
+__RCSID("$NetBSD: csh.c,v 1.48 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -641,7 +641,7 @@ srccat(Char *cp, Char *dp)
ep = Strspl(cp, dp);
ptr = short2str(ep);
- free((ptr_t) ep);
+ free(ep);
return srcfile(ptr, mflag ? 0 : 1, 0);
}
@@ -760,8 +760,8 @@ srcunit(int unit, int onlyown, int hflg)
/* This code could get run twice but free doesn't care */
/* XXX yes it does */
for (i = 0; i < fblocks; i++)
- free((ptr_t) fbuf[i]);
- free((ptr_t) fbuf);
+ free(fbuf[i]);
+ free(fbuf);
/* Reset input arena */
(void)memcpy(&B, &saveB, sizeof(B));
@@ -1062,7 +1062,7 @@ process(int catch)
(void)fflush(cshout);
}
if (seterr) {
- free((ptr_t) seterr);
+ free(seterr);
seterr = NULL;
}
@@ -1146,7 +1146,7 @@ dosource(Char **v, struct command *t)
(void)Strcpy(buf, *v);
f = globone(buf, G_ERROR);
(void)strcpy((char *)buf, short2str(f));
- free((ptr_t) f);
+ free(f);
if (!srcfile((char *)buf, 0, hflg) && !hflg)
stderror(ERR_SYSTEM, (char *)buf, strerror(errno));
}
Index: src/bin/csh/csh.h
diff -u src/bin/csh/csh.h:1.27 src/bin/csh/csh.h:1.28
--- src/bin/csh/csh.h:1.27 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/csh.h Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: csh.h,v 1.27 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: csh.h,v 1.28 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -80,8 +80,6 @@ typedef char Char;
typedef void *ioctl_t; /* Third arg of ioctl */
-typedef void *ptr_t;
-
#include "const.h"
#include "char.h"
#include "errnum.h"
Index: src/bin/csh/dir.c
diff -u src/bin/csh/dir.c:1.31 src/bin/csh/dir.c:1.32
--- src/bin/csh/dir.c:1.31 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/dir.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.31 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: dir.c,v 1.32 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dir.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: dir.c,v 1.31 2019/01/05 10:51:06 maya Exp $");
+__RCSID("$NetBSD: dir.c,v 1.32 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -312,7 +312,7 @@ dnormalize(Char *cp)
cwd[dotdot = Strlen(cwd)] = '/';
cwd[dotdot + 1] = '\0';
dp = Strspl(cwd, cp);
- free((ptr_t) cwd);
+ free(cwd);
return dp;
}
else {
@@ -396,7 +396,7 @@ dgoto(Char *cp)
p--; /* don't add a / after root */
for (q = cp; (*p++ = *q++) != '\0';)
continue;
- free((ptr_t) cp);
+ free(cp);
cp = dp;
dp += cwdlen;
}
@@ -424,11 +424,11 @@ dfollow(Char *cp)
*/
dp = dnormalize(cp);
if (chdir(short2str(dp)) >= 0) {
- free((ptr_t) cp);
+ free(cp);
return dgoto(dp);
}
else {
- free((ptr_t) dp);
+ free(dp);
if (chdir(short2str(cp)) >= 0)
return dgoto(cp);
serrno = errno;
@@ -448,7 +448,7 @@ dfollow(Char *cp)
continue;
if (chdir(short2str(buf)) >= 0) {
printd = 1;
- free((ptr_t) cp);
+ free(cp);
cp = Strsave(buf);
return dgoto(cp);
}
@@ -456,13 +456,13 @@ dfollow(Char *cp)
}
dp = value(cp);
if ((dp[0] == '/' || dp[0] == '.') && chdir(short2str(dp)) >= 0) {
- free((ptr_t) cp);
+ free(cp);
cp = Strsave(dp);
printd = 1;
return dgoto(cp);
}
(void)strcpy(ebuf, short2str(cp));
- free((ptr_t) cp);
+ free(cp);
stderror(ERR_SYSTEM, ebuf, strerror(serrno));
/* NOTREACHED */
}
@@ -596,8 +596,8 @@ dfree(struct directory *dp)
dp->di_next = dp->di_prev = 0;
}
else {
- free((char *) dp->di_name);
- free((ptr_t) dp);
+ free(dp->di_name);
+ free(dp);
}
}
@@ -632,7 +632,7 @@ dcanon(Char *cp, Char *p)
(void)Strcpy(tmpdir, p1);
(void)Strcat(tmpdir, STRslash);
(void)Strcat(tmpdir, cp);
- free((ptr_t) cp);
+ free(cp);
cp = p = Strsave(tmpdir);
}
@@ -737,7 +737,7 @@ dcanon(Char *cp, Char *p)
*/
p = newcp;
}
- free((ptr_t) cp);
+ free(cp);
cp = newcp;
continue; /* canonicalize the link */
}
@@ -826,7 +826,7 @@ dcanon(Char *cp, Char *p)
*/
p = newcp;
}
- free((ptr_t) cp);
+ free(cp);
cp = newcp;
continue; /* canonicalize the link */
}
@@ -880,7 +880,7 @@ dcanon(Char *cp, Char *p)
* Use STRhome to make '~' work
*/
newcp = Strspl(p1, cp + Strlen(p2));
- free((ptr_t) cp);
+ free(cp);
cp = newcp;
}
}
Index: src/bin/csh/file.c
diff -u src/bin/csh/file.c:1.31 src/bin/csh/file.c:1.32
--- src/bin/csh/file.c:1.31 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/file.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: file.c,v 1.31 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: file.c,v 1.32 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)file.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: file.c,v 1.31 2019/01/05 10:51:06 maya Exp $");
+__RCSID("$NetBSD: file.c,v 1.32 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -459,8 +459,8 @@ free_items(Char **items, size_t numitems
size_t i;
for (i = 0; i < numitems; i++)
- free((ptr_t) items[i]);
- free((ptr_t) items);
+ free(items[i]);
+ free(items);
}
#define FREE_ITEMS(items, numitems) { \
@@ -522,8 +522,7 @@ again: /* search for matches */
if (items == NULL)
items = xmalloc(sizeof(*items) * maxitems);
else
- items = xrealloc((ptr_t) items,
- sizeof(*items) * maxitems);
+ items = xrealloc(items, sizeof(*items) * maxitems);
}
items[numitems] = xmalloc((size_t) (Strlen(entry) + 1) *
sizeof(Char));
@@ -565,7 +564,7 @@ again: /* search for matches */
return (numitems);
}
else { /* LIST */
- qsort((ptr_t) items, numitems, sizeof(items[0]),
+ qsort(items, numitems, sizeof(items[0]),
(int (*) (const void *, const void *)) sortscmp);
print_by_column(looking_for_lognames ? NULL : tilded_dir,
items, numitems);
Index: src/bin/csh/dol.c
diff -u src/bin/csh/dol.c:1.30 src/bin/csh/dol.c:1.31
--- src/bin/csh/dol.c:1.30 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/dol.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dol.c,v 1.30 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: dol.c,v 1.31 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dol.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: dol.c,v 1.30 2019/01/05 10:51:06 maya Exp $");
+__RCSID("$NetBSD: dol.c,v 1.31 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -416,7 +416,7 @@ Dgetdol(void)
stderror(ERR_SYNTAX);
if (backpid != 0) {
if (dolbang)
- free((ptr_t)dolbang);
+ free(dolbang);
setDolp(dolbang = putn(backpid));
}
goto eatbrac;
@@ -595,7 +595,7 @@ Dgetdol(void)
Char *cp = putn(upb - lwb + 1);
addla(cp);
- free((ptr_t) cp);
+ free(cp);
}
else {
eatmod:
@@ -717,7 +717,7 @@ setDolp(Char *cp)
(void)Strcpy(np + (dp - cp), rhsub);
(void)Strcpy(np + (dp - cp) + rhlen, dp + lhlen);
- free((ptr_t) cp);
+ free(cp);
dp = cp = np;
didmod = 1;
} else {
@@ -741,12 +741,12 @@ setDolp(Char *cp)
if ((dp = domod(cp, dolmod[i]))) {
didmod = 1;
if (Strcmp(cp, dp) == 0) {
- free((ptr_t) cp);
+ free(cp);
cp = dp;
break;
}
else {
- free((ptr_t) cp);
+ free(cp);
cp = dp;
}
}
@@ -764,11 +764,11 @@ setDolp(Char *cp)
if (dp) {
addla(dp);
- free((ptr_t) dp);
+ free(dp);
}
else {
addla(cp);
- free((ptr_t) cp);
+ free(cp);
}
dolp = STRNULL;
@@ -833,7 +833,7 @@ again:
mbp = putn((((int)tv.tv_sec) ^
((int)tv.tv_nsec) ^ ((int)getpid())) & 0x00ffffff);
shtemp = Strspl(STRtmpsh, mbp);
- free((ptr_t)mbp);
+ free(mbp);
}
goto again;
}
Index: src/bin/csh/extern.h
diff -u src/bin/csh/extern.h:1.30 src/bin/csh/extern.h:1.31
--- src/bin/csh/extern.h:1.30 Sat Jul 15 10:35:55 2017
+++ src/bin/csh/extern.h Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.30 2017/07/15 14:35:55 christos Exp $ */
+/* $NetBSD: extern.h,v 1.31 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -167,7 +167,7 @@ void rscan(Char **, void (*)(int));
void tglob(Char **);
void trim(Char **);
#ifdef FILEC
-int sortscmp(const ptr_t, const ptr_t);
+int sortscmp(const void *, const void *);
#endif /* FILEC */
/*
@@ -308,10 +308,10 @@ void psecs(long);
/*
* alloc.c
*/
-void Free(ptr_t);
-ptr_t Malloc(size_t);
-ptr_t Realloc(ptr_t, size_t);
-ptr_t Calloc(size_t, size_t);
+void Free(void *);
+void * Malloc(size_t);
+void *Realloc(void *, size_t);
+void *Calloc(size_t, size_t);
/*
* str.c:
Index: src/bin/csh/sem.c
diff -u src/bin/csh/sem.c:1.30 src/bin/csh/sem.c:1.31
--- src/bin/csh/sem.c:1.30 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/sem.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sem.c,v 1.30 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: sem.c,v 1.31 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)sem.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: sem.c,v 1.30 2019/01/05 10:51:06 maya Exp $");
+__RCSID("$NetBSD: sem.c,v 1.31 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -276,13 +276,13 @@ execute(struct command *t, int wtty, int
csigset = ocsigset;
nosigchld = onosigchld;
- free((ptr_t) Vsav);
+ free(Vsav);
Vsav = 0;
- free((ptr_t) Vdp);
+ free(Vdp);
Vdp = 0;
- free((ptr_t) Vexpath);
+ free(Vexpath);
Vexpath = 0;
- blkfree((Char **) Vt);
+ blkfree((Char **)Vt);
Vt = 0;
/* this is from pfork() */
palloc(pid, t);
@@ -453,11 +453,11 @@ vffree(int i)
if ((v = gargv) != NULL) {
gargv = 0;
- free((ptr_t) v);
+ free(v);
}
if ((v = pargv) != NULL) {
pargv = 0;
- free((ptr_t) v);
+ free(v);
}
_exit(i);
/* NOTREACHED */
@@ -494,24 +494,24 @@ splicepipe(struct command *t, Char *cp /
pv = globall(blk);
if (pv == NULL) {
setname(vis_str(blk[0]));
- free((ptr_t) blk[0]);
+ free(blk[0]);
stderror(ERR_NAME | ERR_NOMATCH);
/* NOTREACHED */
}
gargv = NULL;
if (pv[1] != NULL) { /* we need to fix the command vector */
Char **av = blkspl(t->t_dcom, &pv[1]);
- free((ptr_t) t->t_dcom);
+ free(t->t_dcom);
t->t_dcom = av;
}
- free((ptr_t) blk[0]);
+ free(blk[0]);
blk[0] = pv[0];
- free((ptr_t) pv);
+ free(pv);
}
}
else {
blk[0] = globone(blk[1] = Dfix1(cp), G_ERROR);
- free((ptr_t) blk[1]);
+ free(blk[1]);
}
return(blk[0]);
}
@@ -541,7 +541,7 @@ doio(struct command *t, int *pipein, int
(void)dcopy(SHERR, 2);
cp = splicepipe(t, t->t_dlef);
(void)strlcpy(tmp, short2str(cp), sizeof(tmp));
- free((ptr_t) cp);
+ free(cp);
if ((fd = open(tmp, O_RDONLY)) < 0) {
stderror(ERR_SYSTEM, tmp, strerror(errno));
/* NOTREACHED */
@@ -569,7 +569,7 @@ doio(struct command *t, int *pipein, int
cp = splicepipe(t, t->t_drit);
(void)strlcpy(tmp, short2str(cp), sizeof(tmp));
- free((ptr_t) cp);
+ free(cp);
/*
* so > /dev/std{out,err} work
*/
Index: src/bin/csh/err.c
diff -u src/bin/csh/err.c:1.22 src/bin/csh/err.c:1.23
--- src/bin/csh/err.c:1.22 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/err.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.22 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: err.c,v 1.23 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: err.c,v 1.22 2019/01/05 10:51:06 maya Exp $");
+__RCSID("$NetBSD: err.c,v 1.23 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -357,7 +357,7 @@ stderror(int id, ...)
}
if (seterr) {
- free((ptr_t) seterr);
+ free(seterr);
seterr = NULL;
}
Index: src/bin/csh/exec.c
diff -u src/bin/csh/exec.c:1.32 src/bin/csh/exec.c:1.33
--- src/bin/csh/exec.c:1.32 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/exec.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.32 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: exec.c,v 1.33 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)exec.c 8.3 (Berkeley) 5/23/95";
#else
-__RCSID("$NetBSD: exec.c,v 1.32 2019/01/05 10:51:06 maya Exp $");
+__RCSID("$NetBSD: exec.c,v 1.33 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -169,8 +169,8 @@ doexec(Char **v, struct command *t)
blkfree(t->t_dcom);
t->t_dcom = blkspl(pv, av);
- free((ptr_t) pv);
- free((ptr_t) av);
+ free(pv);
+ free(av);
av = t->t_dcom;
trim(av);
@@ -226,7 +226,7 @@ doexec(Char **v, struct command *t)
Vdp = dp;
texec(dp, av);
Vdp = 0;
- free((ptr_t)dp);
+ free(dp);
}
misses++;
cont:
@@ -235,7 +235,7 @@ cont:
} while (*pv);
hits--;
Vsav = 0;
- free((ptr_t)sav);
+ free(sav);
pexerr();
/* NOTREACHED */
}
@@ -247,7 +247,7 @@ pexerr(void)
if (expath) {
setname(vis_str(expath));
Vexpath = 0;
- free((ptr_t)expath);
+ free(expath);
expath = 0;
}
else
@@ -330,11 +330,11 @@ texec(Char *sf, Char **st)
/* The order for the conversions is significant */
t = short2blk(st);
f = short2str(sf);
- free((ptr_t) st);
+ free(st);
Vt = t;
(void)execve(f, t, environ);
Vt = 0;
- blkfree((Char **) t);
+ blkfree((Char **)t);
/* FALLTHROUGH */
case ENOMEM:
@@ -348,7 +348,7 @@ texec(Char *sf, Char **st)
if (exerr == 0) {
exerr = strerror(errno);
if (expath)
- free((ptr_t) expath);
+ free(expath);
expath = Strsave(sf);
Vexpath = expath;
}
@@ -531,13 +531,13 @@ iscommand(Char *name)
}
if (pv[0][0] == 0 || eq(pv[0], STRdot)) { /* don't make ./xxx */
if (executable(NULL, name, 0)) {
- free((ptr_t) sav);
+ free(sav);
return i + 1;
}
}
else {
if (executable(*pv, sav, 0)) {
- free((ptr_t) sav);
+ free(sav);
return i + 1;
}
}
@@ -545,7 +545,7 @@ cont:
pv++;
i++;
} while (*pv);
- free((ptr_t) sav);
+ free(sav);
return 0;
}
@@ -714,7 +714,7 @@ tellmewhat(struct wordent *lexp, Char *s
if (!slash) {
sp->word = Strspl(STRdotsl, sp->word);
prlex(cshout, lexp);
- free((ptr_t) sp->word);
+ free(sp->word);
}
else
prlex(cshout, lexp);
@@ -722,12 +722,12 @@ tellmewhat(struct wordent *lexp, Char *s
else {
s1 = Strspl(*pv, STRslash);
sp->word = Strspl(s1, sp->word);
- free((ptr_t) s1);
+ free(s1);
if (str == NULL)
prlex(cshout, lexp);
else
(void)Strcpy(str, sp->word);
- free((ptr_t) sp->word);
+ free(sp->word);
}
found = 1;
}
@@ -743,6 +743,6 @@ tellmewhat(struct wordent *lexp, Char *s
found = 0;
}
sp->word = s0; /* we save and then restore this */
- free((ptr_t) cmd);
+ free(cmd);
return found;
}
Index: src/bin/csh/lex.c
diff -u src/bin/csh/lex.c:1.32 src/bin/csh/lex.c:1.33
--- src/bin/csh/lex.c:1.32 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/lex.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.c,v 1.32 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: lex.c,v 1.33 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)lex.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: lex.c,v 1.32 2019/01/05 10:51:06 maya Exp $");
+__RCSID("$NetBSD: lex.c,v 1.33 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -247,8 +247,8 @@ freelex(struct wordent *vp)
while (vp->next != vp) {
fp = vp->next;
vp->next = fp->next;
- free((ptr_t) fp->word);
- free((ptr_t) fp);
+ free(fp->word);
+ free(fp);
}
vp->prev = vp;
}
@@ -897,11 +897,11 @@ dosub(int sc, struct wordent *en, int gl
otword = tword;
tword = subword(otword, sc, &didone);
if (Strcmp(tword, otword) == 0) {
- free((ptr_t) otword);
+ free(otword);
break;
}
else
- free((ptr_t)otword);
+ free(otword);
}
}
}
@@ -1224,7 +1224,7 @@ gethent(int sc)
}
np = putn(event);
str = vis_str(np);
- free((ptr_t) np);
+ free(np);
seterror(ERR_NOEVENT, str);
return (0);
}
@@ -1456,7 +1456,7 @@ again:
nfbuf = (Char **)xcalloc((size_t) (fblocks + 2), sizeof(char **));
if (fbuf) {
(void)blkcpy(nfbuf, fbuf);
- free((ptr_t) fbuf);
+ free(fbuf);
}
fbuf = nfbuf;
fbuf[fblocks] = (Char *)xcalloc(BUFSIZE, sizeof(Char));
@@ -1550,7 +1550,7 @@ bfree(void)
sb = (int)(fseekp - 1) / BUFSIZE;
if (sb > 0) {
for (i = 0; i < sb; i++)
- free((ptr_t) fbuf[i]);
+ free(fbuf[i]);
(void)blkcpy(fbuf, &fbuf[sb]);
fseekp -= BUFSIZE * sb;
feobp -= BUFSIZE * sb;
Index: src/bin/csh/exp.c
diff -u src/bin/csh/exp.c:1.21 src/bin/csh/exp.c:1.22
--- src/bin/csh/exp.c:1.21 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/exp.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: exp.c,v 1.21 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: exp.c,v 1.22 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)exp.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: exp.c,v 1.21 2019/01/05 10:51:06 maya Exp $");
+__RCSID("$NetBSD: exp.c,v 1.22 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -237,12 +237,12 @@ exp2c(Char ***vp, int ignore)
i = !Gmatch(p1, p2);
break;
}
- free((ptr_t) p1);
- free((ptr_t) p2);
+ free(p1);
+ free(p2);
return (i);
}
i = egetn(p1);
- free((ptr_t) p1);
+ free(p1);
return (i);
}
@@ -279,8 +279,8 @@ exp3(Char ***vp, int ignore)
i = egetn(p1) <= egetn(p2);
break;
}
- free((ptr_t) p1);
- free((ptr_t) p2);
+ free(p1);
+ free(p2);
return (putn(i));
}
return (p1);
@@ -307,8 +307,8 @@ exp3a(Char ***vp, int ignore)
i = egetn(p1) << egetn(p2);
else
i = egetn(p1) >> egetn(p2);
- free((ptr_t) p1);
- free((ptr_t) p2);
+ free(p1);
+ free(p2);
return (putn(i));
}
return (p1);
@@ -342,8 +342,8 @@ exp4(Char ***vp, int ignore)
i = egetn(p1) - egetn(p2);
break;
}
- free((ptr_t) p1);
- free((ptr_t) p2);
+ free(p1);
+ free(p2);
return (putn(i));
}
return (p1);
@@ -386,8 +386,8 @@ exp5(Char ***vp, int ignore)
i = egetn(p1) % i;
break;
}
- free((ptr_t) p1);
- free((ptr_t) p2);
+ free(p1);
+ free(p2);
return (putn(i));
}
return (p1);
@@ -409,7 +409,7 @@ exp6(Char ***vp, int ignore)
etracc("exp6 ! cp", cp, vp);
#endif
i = egetn(cp);
- free((ptr_t) cp);
+ free(cp);
return (putn(!i));
}
if (eq(**vp, STRtilde)) {
@@ -419,7 +419,7 @@ exp6(Char ***vp, int ignore)
etracc("exp6 ~ cp", cp, vp);
#endif
i = egetn(cp);
- free((ptr_t) cp);
+ free(cp);
return (putn(~i));
}
if (eq(**vp, STRLparen)) {
@@ -502,7 +502,7 @@ exp6(Char ***vp, int ignore)
default:
if (cp[1] == 'l' ?
lstat(short2str(ep), &stb) : stat(short2str(ep), &stb)) {
- free((ptr_t) ep);
+ free(ep);
return (Strsave(STR0));
}
switch (cp[1]) {
@@ -547,7 +547,7 @@ exp6(Char ***vp, int ignore)
#ifdef EDEBUG
etraci("exp6 -? i", i, vp);
#endif
- free((ptr_t) ep);
+ free(ep);
return (putn(i));
}
#ifdef EDEBUG
Index: src/bin/csh/hist.c
diff -u src/bin/csh/hist.c:1.21 src/bin/csh/hist.c:1.22
--- src/bin/csh/hist.c:1.21 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/hist.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hist.c,v 1.21 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: hist.c,v 1.22 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)hist.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: hist.c,v 1.21 2019/01/05 10:51:06 maya Exp $");
+__RCSID("$NetBSD: hist.c,v 1.22 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -131,7 +131,7 @@ static void
hfree(struct Hist *hp)
{
freelex(&hp->Hlex);
- free((ptr_t) hp);
+ free(hp);
}
void
Index: src/bin/csh/misc.c
diff -u src/bin/csh/misc.c:1.21 src/bin/csh/misc.c:1.22
--- src/bin/csh/misc.c:1.21 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/misc.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.21 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: misc.c,v 1.22 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: misc.c,v 1.21 2019/01/05 10:51:06 maya Exp $");
+__RCSID("$NetBSD: misc.c,v 1.22 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -135,8 +135,8 @@ blkfree(Char **av0)
if (!av0)
return;
for (; *av; av++)
- free((ptr_t) * av);
- free((ptr_t) av0);
+ free(* av);
+ free(av0);
}
Char **
@@ -316,7 +316,7 @@ lshift(Char **v, size_t c)
Char **u;
for (u = v; *u && c-- > 0; u++)
- free((ptr_t) *u);
+ free(*u);
(void)blkcpy(v, u);
}
Index: src/bin/csh/func.c
diff -u src/bin/csh/func.c:1.41 src/bin/csh/func.c:1.42
--- src/bin/csh/func.c:1.41 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/func.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: func.c,v 1.41 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: func.c,v 1.42 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)func.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: func.c,v 1.41 2019/01/05 10:51:06 maya Exp $");
+__RCSID("$NetBSD: func.c,v 1.42 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -141,7 +141,7 @@ doonintr(Char **v, struct command *t)
stderror(ERR_NAME | ERR_TERMINAL);
cp = gointr;
gointr = 0;
- free((ptr_t) cp);
+ free(cp);
if (vv == 0) {
if (setintr) {
sigemptyset(&nsigset);
@@ -316,7 +316,7 @@ dogoto(Char **v, struct command *t)
Char *lp;
gotolab(lp = globone(v[1], G_ERROR));
- free((ptr_t) lp);
+ free(lp);
}
void
@@ -356,7 +356,7 @@ doswitch(Char **v, struct command *t)
if (*v)
stderror(ERR_SYNTAX);
search(T_SWITCH, 0, lp = globone(cp, G_ERROR));
- free((ptr_t) lp);
+ free(lp);
}
void
@@ -619,9 +619,10 @@ search(int type, int level, Char *goal)
if (lastchr(aword) == ':')
aword[Strlen(aword) - 1] = 0;
cp = strip(Dfix1(aword));
+ fprintf(cshout, "%s\n", short2str(cp));
if (Gmatch(goal, cp))
level = -1;
- free((ptr_t) cp);
+ free(cp);
break;
case T_DEFAULT:
if (type == T_SWITCH && level == 0)
@@ -695,8 +696,8 @@ wpfree(struct whyle *wp)
if (wp->w_fe0)
blkfree(wp->w_fe0);
if (wp->w_fename)
- free((ptr_t) wp->w_fename);
- free((ptr_t) wp);
+ free(wp->w_fename);
+ free(wp);
}
static int
@@ -955,7 +956,7 @@ dosetenv(Char **v, struct command *t)
AsciiOnly = 0;
#endif /* NLS */
}
- free((ptr_t) lp);
+ free(lp);
}
void
@@ -967,7 +968,7 @@ dounsetenv(Char **v, struct command *t)
int i, maxi;
if (name)
- free((ptr_t) name);
+ free(name);
/*
* Find the longest environment variable
*/
@@ -1008,7 +1009,7 @@ dounsetenv(Char **v, struct command *t)
Unsetenv(name);
break;
}
- free((ptr_t) name);
+ free(name);
name = NULL;
}
@@ -1026,21 +1027,21 @@ Setenv(Char *name, Char *val)
if (*cp != 0 || *dp != '=')
continue;
cp = Strspl(STRequal, val);
- free((ptr_t)* ep);
+ free(* ep);
*ep = strip(Strspl(name, cp));
- free((ptr_t)cp);
+ free(cp);
blkfree((Char **)environ);
environ = short2blk(STR_environ);
return;
}
cp = Strspl(name, STRequal);
blk[0] = strip(Strspl(cp, val));
- free((ptr_t)cp);
+ free(cp);
blk[1] = 0;
STR_environ = blkspl(STR_environ, blk);
blkfree((Char **)environ);
environ = short2blk(STR_environ);
- free((ptr_t) oep);
+ free(oep);
}
static void
@@ -1061,8 +1062,8 @@ Unsetenv(Char *name)
STR_environ = blkspl(STR_environ, ep + 1);
environ = short2blk(STR_environ);
*ep = cp;
- free((ptr_t) cp);
- free((ptr_t) oep);
+ free(cp);
+ free(oep);
return;
}
}
@@ -1450,7 +1451,7 @@ doprintf(Char **v, struct command *t)
(void)fflush(cshout);
(void)fflush(csherr);
- blkfree((Char **) c);
+ blkfree((Char **)c);
if (ret)
stderror(ERR_SILENT);
}
Index: src/bin/csh/glob.c
diff -u src/bin/csh/glob.c:1.29 src/bin/csh/glob.c:1.30
--- src/bin/csh/glob.c:1.29 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/glob.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: glob.c,v 1.29 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: glob.c,v 1.30 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)glob.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: glob.c,v 1.29 2019/01/05 10:51:06 maya Exp $");
+__RCSID("$NetBSD: glob.c,v 1.30 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -119,7 +119,7 @@ globtilde(Char **nv, Char *s)
*b++ = *s++;
*b = EOS;
--u;
- free((ptr_t) u);
+ free(u);
return (Strsave(gstart));
}
@@ -197,8 +197,7 @@ globbrace(Char *s, Char *p, Char ***bl)
pl = pm + 1;
if (vl == &nv[size]) {
size += GLOBSPACE;
- nv = (Char **)xrealloc((ptr_t) nv,
- (size_t)size * sizeof(Char *));
+ nv = realloc(nv, (size_t)size * sizeof(Char *));
vl = &nv[size - GLOBSPACE];
}
}
@@ -234,13 +233,13 @@ expbrace(Char ***nvp, Char ***elp, size_
int len;
if ((len = globbrace(s, b, &bl)) < 0) {
- free((ptr_t)nv);
+ free(nv);
stderror(ERR_MISSING, -len);
}
- free((ptr_t) s);
+ free(s);
if (len == 1) {
*vl-- = *bl;
- free((ptr_t) bl);
+ free(bl);
continue;
}
len = blklen(bl);
@@ -251,8 +250,7 @@ expbrace(Char ***nvp, Char ***elp, size_
size += (size_t)(GLOBSPACE > l ? GLOBSPACE : l);
l = vl - nv;
e = ex - nv;
- nv = (Char **)xrealloc((ptr_t)nv,
- (size_t)size * sizeof(Char *));
+ nv = xrealloc(nv, (size_t)size * sizeof(Char *));
vl = nv + l;
ex = nv + e;
}
@@ -265,7 +263,7 @@ expbrace(Char ***nvp, Char ***elp, size_
vp++;
for (bp = bl + 1; *bp; *vp++ = *bp++)
continue;
- free((ptr_t)bl);
+ free(bl);
}
}
@@ -296,20 +294,18 @@ globexpand(Char **v)
*vl++ = pargv[i];
if (vl == &nv[size]) {
size += GLOBSPACE;
- nv = (Char **)xrealloc((ptr_t) nv,
- (size_t)size * sizeof(Char *));
+ nv = xrealloc(nv, (size_t)size * sizeof(Char *));
vl = &nv[size - GLOBSPACE];
}
}
- free((ptr_t)pargv);
+ free(pargv);
pargv = NULL;
}
else {
*vl++ = Strsave(s);
if (vl == &nv[size]) {
size += GLOBSPACE;
- nv = (Char **)xrealloc((ptr_t)nv,
- size * sizeof(Char *));
+ nv = xrealloc(nv, size * sizeof(Char *));
vl = &nv[size - GLOBSPACE];
}
}
@@ -353,9 +349,9 @@ handleone(Char *str, Char **vl, int acti
str = Strsave(*vlp++);
do {
cp = Strspl(str, STRspace);
- free((ptr_t)str);
+ free(str);
str = Strspl(cp, *vlp);
- free((ptr_t)cp);
+ free(cp);
}
while (*++vlp);
blkfree(vl);
@@ -440,14 +436,14 @@ globone(Char *str, int action)
vo = globexpand(v);
if (noglob || (gflg & G_GLOB) == 0) {
if (vo[0] == NULL) {
- free((ptr_t)vo);
+ free(vo);
return (Strsave(STRNULL));
}
if (vo[1] != NULL)
return (handleone(str, vo, action));
else {
str = strip(vo[0]);
- free((ptr_t) vo);
+ free(vo);
return (str);
}
}
@@ -465,14 +461,14 @@ globone(Char *str, int action)
stderror(ERR_NAME | ERR_NOMATCH);
}
if (vl[0] == NULL) {
- free((ptr_t)vl);
+ free(vl);
return (Strsave(STRNULL));
}
if (vl[1] != NULL)
return (handleone(str, vl, action));
else {
str = strip(*vl);
- free((ptr_t)vl);
+ free(vl);
return (str);
}
}
@@ -709,7 +705,7 @@ backeval(Char *cp, int literal)
execute(t, -1, NULL, NULL);
exitstat();
}
- free((ptr_t)cp);
+ free(cp);
(void)close(pvec[1]);
c = 0;
ip = NULL;
@@ -781,8 +777,7 @@ pword(void)
psave(0);
if (pargc == pargsiz - 1) {
pargsiz += GLOBSPACE;
- pargv = (Char **)xrealloc((ptr_t)pargv,
- (size_t)pargsiz * sizeof(Char *));
+ pargv = xrealloc(pargv, (size_t)pargsiz * sizeof(Char *));
}
pargv[pargc++] = Strsave(pargs);
pargv[pargc] = NULL;
@@ -902,8 +897,7 @@ Gcat(Char *s1, Char *s2)
n = (p - s1) + (q - s2) - 1;
if (++gargc >= gargsiz) {
gargsiz += GLOBSPACE;
- gargv = (Char **)xrealloc((ptr_t)gargv,
- (size_t)gargsiz * sizeof(Char *));
+ gargv = xrealloc(gargv, (size_t)gargsiz * sizeof(Char *));
}
gargv[gargc] = 0;
p = gargv[gargc - 1] = xmalloc((size_t)n * sizeof(Char));
@@ -915,27 +909,29 @@ Gcat(Char *s1, Char *s2)
#ifdef FILEC
int
-sortscmp(const ptr_t a, const ptr_t b)
+sortscmp(const void *va, const void *vb)
{
#if defined(NLS) && !defined(NOSTRCOLL)
char buf[2048];
#endif
+ const Char * const *a = va;
+ const Char * const *b = vb;
if (!a) /* check for NULL */
return (b ? 1 : 0);
if (!b)
- return (-1);
+ return -1;
- if (!*(Char **)a) /* check for NULL */
- return (*(Char **)b ? 1 : 0);
- if (!*(Char **)b)
+ if (!*a) /* check for NULL */
+ return *b ? 1 : 0;
+ if (!*b)
return (-1);
#if defined(NLS) && !defined(NOSTRCOLL)
- (void)strcpy(buf, short2str(*(Char **)a));
- return ((int)strcoll(buf, short2str(*(Char **)b)));
+ (void)strcpy(buf, short2str(*a));
+ return (int)strcoll(buf, short2str(*b));
#else
- return ((int)Strcmp(*(Char **)a, *(Char **)b));
+ return (int)Strcmp(*a, *b);
#endif
}
#endif /* FILEC */
Index: src/bin/csh/parse.c
diff -u src/bin/csh/parse.c:1.18 src/bin/csh/parse.c:1.19
--- src/bin/csh/parse.c:1.18 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/parse.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.18 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: parse.c,v 1.19 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: parse.c,v 1.18 2019/01/05 10:51:06 maya Exp $");
+__RCSID("$NetBSD: parse.c,v 1.19 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -171,7 +171,7 @@ asyn3(struct wordent *p1, struct wordent
cp = alout.next->word;
alout.next->word = Strspl(STRQNULL, cp);
- free((ptr_t) cp);
+ free(cp);
}
p1 = freenod(p1, redid ? p2 : p1->next);
if (alout.next != &alout) {
@@ -179,8 +179,8 @@ asyn3(struct wordent *p1, struct wordent
alout.prev->prev->next = p1->next;
alout.next->prev = p1;
p1->next = alout.next;
- free((ptr_t)alout.prev->word);
- free((ptr_t)(alout.prev));
+ free(alout.prev->word);
+ free(alout.prev);
}
reset(); /* throw! */
}
@@ -192,9 +192,9 @@ freenod(struct wordent *p1, struct worde
retp = p1->prev;
while (p1 != p2) {
- free((ptr_t)p1->word);
+ free(p1->word);
p1 = p1->next;
- free((ptr_t) (p1->prev));
+ free(p1->prev);
}
retp->next = p2;
p2->prev = retp;
@@ -619,15 +619,15 @@ freesyn(struct command *t)
switch (t->t_dtyp) {
case NODE_COMMAND:
for (v = t->t_dcom; *v; v++)
- free((ptr_t) * v);
- free((ptr_t)(t->t_dcom));
- free((ptr_t)t->t_dlef);
- free((ptr_t)t->t_drit);
+ free(* v);
+ free(t->t_dcom);
+ free(t->t_dlef);
+ free(t->t_drit);
break;
case NODE_PAREN:
freesyn(t->t_dspr);
- free((ptr_t)t->t_dlef);
- free((ptr_t)t->t_drit);
+ free(t->t_dlef);
+ free(t->t_drit);
break;
case NODE_AND:
case NODE_OR:
@@ -636,5 +636,5 @@ freesyn(struct command *t)
freesyn(t->t_dcar), freesyn(t->t_dcdr);
break;
}
- free((ptr_t)t);
+ free(t);
}
Index: src/bin/csh/proc.c
diff -u src/bin/csh/proc.c:1.37 src/bin/csh/proc.c:1.38
--- src/bin/csh/proc.c:1.37 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/proc.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.c,v 1.37 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: proc.c,v 1.38 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)proc.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: proc.c,v 1.37 2019/01/05 10:51:06 maya Exp $");
+__RCSID("$NetBSD: proc.c,v 1.38 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -231,11 +231,11 @@ pwait(void)
for (pp = (fp = &proclist)->p_next; pp != NULL; pp = (fp = pp)->p_next)
if (pp->p_pid == 0) {
fp->p_next = pp->p_next;
- free((ptr_t) pp->p_command);
+ free(pp->p_command);
if (pp->p_cwd && --pp->p_cwd->di_count == 0)
if (pp->p_cwd->di_next == 0)
dfree(pp->p_cwd);
- free((ptr_t) pp);
+ free(pp);
pp = fp;
}
(void)sigprocmask(SIG_SETMASK, &osigset, NULL);
Index: src/bin/csh/set.c
diff -u src/bin/csh/set.c:1.34 src/bin/csh/set.c:1.35
--- src/bin/csh/set.c:1.34 Sat Jan 5 05:51:06 2019
+++ src/bin/csh/set.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: set.c,v 1.34 2019/01/05 10:51:06 maya Exp $ */
+/* $NetBSD: set.c,v 1.35 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)set.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: set.c,v 1.34 2019/01/05 10:51:06 maya Exp $");
+__RCSID("$NetBSD: set.c,v 1.35 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -108,7 +108,7 @@ update_vars(Char *vp)
Setenv(STRHOME, cp);
/* fix directory stack for new tilde home */
dtilde();
- free((ptr_t)cp);
+ free(cp);
}
#ifdef FILEC
else if (eq(vp, STRfilec))
@@ -215,7 +215,7 @@ asx(Char *vp, int subscr, Char *p)
struct varent *v;
v = getvx(vp, subscr);
- free((ptr_t) v->vec[subscr - 1]);
+ free(v->vec[subscr - 1]);
v->vec[subscr - 1] = globone(p, G_APPEND);
}
@@ -315,9 +315,9 @@ dolet(Char **v, struct command *t)
dohash(NULL, NULL);
}
}
- free((ptr_t) vp);
+ free(vp);
if (c != '=')
- free((ptr_t) p);
+ free(p);
} while ((p = *v++) != NULL);
}
@@ -329,7 +329,7 @@ xset(Char *cp, Char ***vp)
if (*cp) {
dp = Strsave(cp);
--(*vp);
- free((ptr_t) ** vp);
+ free(** vp);
**vp = dp;
}
return (putn(expr(vp)));
@@ -570,7 +570,7 @@ unsetv1(struct varent *p)
* Free associated memory first to avoid complications.
*/
blkfree(p->vec);
- free((ptr_t) p->v_name);
+ free(p->v_name);
/*
* If p is missing one child, then we can move the other into where p is.
* Otherwise, we find the predecessor of p, which is guaranteed to have no
@@ -598,7 +598,7 @@ unsetv1(struct varent *p)
/*
* Free the deleted node, and rebalance.
*/
- free((ptr_t) p);
+ free(p);
balance(pp, f, 1);
}
Index: src/bin/csh/str.c
diff -u src/bin/csh/str.c:1.15 src/bin/csh/str.c:1.16
--- src/bin/csh/str.c:1.15 Tue Jul 16 13:47:43 2013
+++ src/bin/csh/str.c Sat Jan 5 11:54:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: str.c,v 1.15 2013/07/16 17:47:43 christos Exp $ */
+/* $NetBSD: str.c,v 1.16 2019/01/05 16:54:00 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)str.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: str.c,v 1.15 2013/07/16 17:47:43 christos Exp $");
+__RCSID("$NetBSD: str.c,v 1.16 2019/01/05 16:54:00 christos Exp $");
#endif
#endif /* not lint */
@@ -114,8 +114,7 @@ str2short(const char *src)
*dst++ = (Char) ((unsigned char) *src++);
if (dst == edst) {
dstsize += MALLOC_INCR;
- sdst = xrealloc((ptr_t)sdst,
- (size_t)dstsize * sizeof(*sdst));
+ sdst = xrealloc(sdst, (size_t)dstsize * sizeof(*sdst));
edst = &sdst[dstsize];
dst = &edst[-MALLOC_INCR];
}
@@ -144,8 +143,7 @@ short2str(const Char *src)
*dst++ = (char) *src++;
if (dst == edst) {
dstsize += MALLOC_INCR;
- sdst = xrealloc((ptr_t)sdst,
- (size_t)dstsize * sizeof(*sdst));
+ sdst = xrealloc(sdst, (size_t)dstsize * sizeof(*sdst));
edst = &sdst[dstsize];
dst = &edst[-MALLOC_INCR];
}
@@ -390,8 +388,7 @@ short2qstr(const Char *src)
*dst++ = '\\';
if (dst == edst) {
dstsize += MALLOC_INCR;
- sdst = xrealloc((ptr_t) sdst,
- (size_t)dstsize * sizeof(*sdst));
+ sdst = xrealloc(sdst, (size_t)dstsize * sizeof(*sdst));
edst = &sdst[dstsize];
dst = &edst[-MALLOC_INCR];
}
@@ -399,8 +396,7 @@ short2qstr(const Char *src)
*dst++ = (char) *src++;
if (dst == edst) {
dstsize += MALLOC_INCR;
- sdst = xrealloc((ptr_t) sdst,
- (size_t)dstsize * sizeof(*sdst));
+ sdst = xrealloc(sdst, (size_t)dstsize * sizeof(*sdst));
edst = &sdst[dstsize];
dst = &edst[-MALLOC_INCR];
}
