CVS commit: src/lib/libm
Module Name:src
Committed By: riastradh
Date: Mon Aug 29 01:48:34 UTC 2022
Modified Files:
src/lib/libm/ld128: e_rem_pio2l.h
src/lib/libm/ld80: e_rem_pio2l.h
src/lib/libm/src: e_rem_pio2l.h k_sincos.h k_sincosl.h s_sincos.c
Log Message:
libm: Fix some whitespace issues in recent sincos additions.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/ld128/e_rem_pio2l.h
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/ld80/e_rem_pio2l.h
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/e_rem_pio2l.h \
src/lib/libm/src/k_sincos.h src/lib/libm/src/k_sincosl.h
cvs rdiff -u -r1.4 -r1.5 src/lib/libm/src/s_sincos.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/ld128/e_rem_pio2l.h
diff -u src/lib/libm/ld128/e_rem_pio2l.h:1.1 src/lib/libm/ld128/e_rem_pio2l.h:1.2
--- src/lib/libm/ld128/e_rem_pio2l.h:1.1 Sat Aug 27 08:31:58 2022
+++ src/lib/libm/ld128/e_rem_pio2l.h Mon Aug 29 01:48:34 2022
@@ -6,7 +6,7 @@
*
* Developed at SunSoft, a Sun Microsystems, Inc. business.
* Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
+ * software is freely granted, provided that this notice
* is preserved.
*
*
@@ -19,8 +19,8 @@ __FBSDID("$FreeBSD: head/lib/msun/ld128/
#endif
/* ld128 version of __ieee754_rem_pio2l(x,y)
- *
- * return the remainder of x rem pi/2 in y[0]+y[1]
+ *
+ * return the remainder of x rem pi/2 in y[0]+y[1]
* use __kernel_rem_pio2()
*/
@@ -85,32 +85,32 @@ __ieee754_rem_pio2l(long double x, long
union ieee_ext_u u2;
int ex1;
j = ex;
- y[0] = r-w;
+ y[0] = r-w;
u2.extu_ld = y[0];
ex1 = u2.extu_exp;
i = j-ex1;
if(i>51) { /* 2nd iteration needed, good to 248 */
t = r;
- w = fn*pio2_2;
+ w = fn*pio2_2;
r = t-w;
- w = fn*pio2_2t-((t-r)-w);
+ w = fn*pio2_2t-((t-r)-w);
y[0] = r-w;
u2.extu_ld = y[0];
ex1 = u2.extu_exp;
i = j-ex1;
if(i>119) { /* 3rd iteration need, 316 bits acc */
- t = r; /* will cover all possible cases */
- w = fn*pio2_3;
- r = t-w;
- w = fn*pio2_3t-((t-r)-w);
- y[0] = r-w;
+ t = r; /* will cover all possible cases */
+ w = fn*pio2_3;
+ r = t-w;
+ w = fn*pio2_3t-((t-r)-w);
+ y[0] = r-w;
}
}
}
y[1] = (r-y[0])-w;
return n;
}
-/*
+/*
* all other (large) arguments
*/
if(ex==0x7fff) { /* x is inf or NaN */
Index: src/lib/libm/ld80/e_rem_pio2l.h
diff -u src/lib/libm/ld80/e_rem_pio2l.h:1.1 src/lib/libm/ld80/e_rem_pio2l.h:1.2
--- src/lib/libm/ld80/e_rem_pio2l.h:1.1 Sat Aug 27 08:31:59 2022
+++ src/lib/libm/ld80/e_rem_pio2l.h Mon Aug 29 01:48:34 2022
@@ -6,7 +6,7 @@
*
* Developed at SunSoft, a Sun Microsystems, Inc. business.
* Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
+ * software is freely granted, provided that this notice
* is preserved.
*
*
@@ -19,8 +19,8 @@ __FBSDID("$FreeBSD: head/lib/msun/ld80/e
#endif
/* ld80 version of __ieee754_rem_pio2l(x,y)
- *
- * return the remainder of x rem pi/2 in y[0]+y[1]
+ *
+ * return the remainder of x rem pi/2 in y[0]+y[1]
* use __kernel_rem_pio2()
*/
@@ -94,32 +94,32 @@ __ieee754_rem_pio2l(long double x, long
union ieee_ext_u u2;
int ex1;
j = ex;
- y[0] = r-w;
+ y[0] = r-w;
u2.extu_ld = y[0];
ex1 = u2.extu_exp;
i = j-ex1;
if(i>22) { /* 2nd iteration needed, good to 141 */
t = r;
- w = fn*pio2_2;
+ w = fn*pio2_2;
r = t-w;
- w = fn*pio2_2t-((t-r)-w);
+ w = fn*pio2_2t-((t-r)-w);
y[0] = r-w;
u2.extu_ld = y[0];
ex1 = u2.extu_exp;
i = j-ex1;
if(i>61) { /* 3rd iteration need, 180 bits acc */
- t = r; /* will cover all possible cases */
- w = fn*pio2_3;
- r = t-w;
- w = fn*pio2_3t-((t-r)-w);
- y[0] = r-w;
+ t = r; /* will cover all possible cases */
+ w = fn*pio2_3;
+ r = t-w;
+ w = fn*pio2_3t-((t-r)-w);
+ y[0] = r-w;
}
}
}
y[1] = (r-y[0])-w;
return n;
}
-/*
+/*
* all other (large) arguments
*/
if(ex==0x7fff) { /* x is inf or NaN */
Index: src/lib/libm/src/e_rem_pio2l.h
diff -u src/lib/libm/src/e_rem_pio2l.h:1.1 src/lib/libm/src/e_rem_pio2l.h:1.2
--- src/lib/libm/src/e_rem_pio2l.h:1.1 Sat Aug 27 08:31:59 2022
+++ src/lib/libm/src/e_rem_pio2l.h Mon Aug 29 01:48:34 2022
@@ -6,7 +6,7 @@
*
* Developed at SunSoft, a Sun Microsystems, Inc. business.
* Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this not
CVS commit: src/lib/libm
Module Name:src Committed By: riastradh Date: Mon Aug 29 01:48:34 UTC 2022 Modified Files: src/lib/libm/ld128: e_rem_pio2l.h src/lib/libm/ld80: e_rem_pio2l.h src/lib/libm/src: e_rem_pio2l.h k_sincos.h k_sincosl.h s_sincos.c Log Message: libm: Fix some whitespace issues in recent sincos additions. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libm/ld128/e_rem_pio2l.h cvs rdiff -u -r1.1 -r1.2 src/lib/libm/ld80/e_rem_pio2l.h cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/e_rem_pio2l.h \ src/lib/libm/src/k_sincos.h src/lib/libm/src/k_sincosl.h cvs rdiff -u -r1.4 -r1.5 src/lib/libm/src/s_sincos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/fpu
Module Name:src
Committed By: rin
Date: Sun Aug 28 22:22:41 UTC 2022
Modified Files:
src/sys/arch/powerpc/fpu: fpu_explode.c fpu_extern.h fpu_implode.c
Log Message:
u_int64_t --> uint64_t. No binary changes.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/fpu/fpu_explode.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/fpu/fpu_extern.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/fpu/fpu_implode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/fpu/fpu_explode.c
diff -u src/sys/arch/powerpc/fpu/fpu_explode.c:1.9 src/sys/arch/powerpc/fpu/fpu_explode.c:1.10
--- src/sys/arch/powerpc/fpu/fpu_explode.c:1.9 Sat Jun 27 04:24:08 2020
+++ src/sys/arch/powerpc/fpu/fpu_explode.c Sun Aug 28 22:22:41 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_explode.c,v 1.9 2020/06/27 04:24:08 rin Exp $ */
+/* $NetBSD: fpu_explode.c,v 1.10 2022/08/28 22:22:41 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_explode.c,v 1.9 2020/06/27 04:24:08 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_explode.c,v 1.10 2022/08/28 22:22:41 rin Exp $");
#include
#include
@@ -107,7 +107,7 @@ fpu_itof(struct fpn *fp, u_int i)
* 64-bit int -> fpn.
*/
int
-fpu_xtof(struct fpn *fp, u_int64_t i)
+fpu_xtof(struct fpn *fp, uint64_t i)
{
if (i == 0)
@@ -209,9 +209,9 @@ void
fpu_explode(struct fpemu *fe, struct fpn *fp, int type, int reg)
{
u_int s, *space;
- u_int64_t l, *xspace;
+ uint64_t l, *xspace;
- xspace = (u_int64_t *)&fe->fe_fpstate->fpreg[reg];
+ xspace = (uint64_t *)&fe->fe_fpstate->fpreg[reg];
l = xspace[0];
space = (u_int *)&fe->fe_fpstate->fpreg[reg];
s = space[0];
Index: src/sys/arch/powerpc/fpu/fpu_extern.h
diff -u src/sys/arch/powerpc/fpu/fpu_extern.h:1.5 src/sys/arch/powerpc/fpu/fpu_extern.h:1.6
--- src/sys/arch/powerpc/fpu/fpu_extern.h:1.5 Mon Jul 23 04:13:06 2012
+++ src/sys/arch/powerpc/fpu/fpu_extern.h Sun Aug 28 22:22:41 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_extern.h,v 1.5 2012/07/23 04:13:06 matt Exp $ */
+/* $NetBSD: fpu_extern.h,v 1.6 2022/08/28 22:22:41 rin Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@ struct fpn *fpu_div(struct fpemu *);
/* fpu_explode.c */
int fpu_itof(struct fpn *, u_int);
-int fpu_xtof(struct fpn *, u_int64_t);
+int fpu_xtof(struct fpn *, uint64_t);
int fpu_stof(struct fpn *, u_int);
int fpu_dtof(struct fpn *, u_int, u_int);
void fpu_explode(struct fpemu *, struct fpn *, int, int);
Index: src/sys/arch/powerpc/fpu/fpu_implode.c
diff -u src/sys/arch/powerpc/fpu/fpu_implode.c:1.7 src/sys/arch/powerpc/fpu/fpu_implode.c:1.8
--- src/sys/arch/powerpc/fpu/fpu_implode.c:1.7 Sat Jun 27 03:07:57 2020
+++ src/sys/arch/powerpc/fpu/fpu_implode.c Sun Aug 28 22:22:41 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_implode.c,v 1.7 2020/06/27 03:07:57 rin Exp $ */
+/* $NetBSD: fpu_implode.c,v 1.8 2022/08/28 22:22:41 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_implode.c,v 1.7 2020/06/27 03:07:57 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_implode.c,v 1.8 2022/08/28 22:22:41 rin Exp $");
#include
#include
@@ -245,7 +245,7 @@ fpu_ftoi(struct fpemu *fe, struct fpn *f
u_int
fpu_ftox(struct fpemu *fe, struct fpn *fp, u_int *res)
{
- u_int64_t i;
+ uint64_t i;
int sign, exp;
sign = fp->fp_sign;
@@ -271,8 +271,8 @@ fpu_ftox(struct fpemu *fe, struct fpn *f
/* NB: the following includes exp < 0 cases */
if (fpu_shr(fp, FP_NMANT - 1 - exp) != 0)
fe->fe_cx |= FPSCR_UX;
- i = ((u_int64_t)fp->fp_mant[2]<<32)|fp->fp_mant[3];
- if (i >= ((u_int64_t)0x8000LL + sign))
+ i = ((uint64_t)fp->fp_mant[2]<<32)|fp->fp_mant[3];
+ if (i >= ((uint64_t)0x8000LL + sign))
break;
return (sign ? -i : i);
CVS commit: src/sys/arch/powerpc/fpu
Module Name:src Committed By: rin Date: Sun Aug 28 22:22:41 UTC 2022 Modified Files: src/sys/arch/powerpc/fpu: fpu_explode.c fpu_extern.h fpu_implode.c Log Message: u_int64_t --> uint64_t. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/fpu/fpu_explode.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/fpu/fpu_extern.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/fpu/fpu_implode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc/fpu
Module Name:src
Committed By: rin
Date: Sun Aug 28 22:09:26 UTC 2022
Modified Files:
src/sys/arch/sparc/fpu: fpu_add.c fpu_compare.c fpu_div.c fpu_emu.h
fpu_explode.c fpu_extern.h fpu_implode.c fpu_mul.c fpu_sqrt.c
fpu_subr.c
Log Message:
Drop ``register'' qualifier.
No binary changes for GENERIC compiled by GCC 10.4.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc/fpu/fpu_add.c \
src/sys/arch/sparc/fpu/fpu_compare.c src/sys/arch/sparc/fpu/fpu_sqrt.c \
src/sys/arch/sparc/fpu/fpu_subr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc/fpu/fpu_div.c \
src/sys/arch/sparc/fpu/fpu_mul.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc/fpu/fpu_emu.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc/fpu/fpu_explode.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc/fpu/fpu_extern.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc/fpu/fpu_implode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/fpu/fpu_add.c
diff -u src/sys/arch/sparc/fpu/fpu_add.c:1.6 src/sys/arch/sparc/fpu/fpu_add.c:1.7
--- src/sys/arch/sparc/fpu/fpu_add.c:1.6 Wed Nov 16 23:24:44 2005
+++ src/sys/arch/sparc/fpu/fpu_add.c Sun Aug 28 22:09:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_add.c,v 1.6 2005/11/16 23:24:44 uwe Exp $ */
+/* $NetBSD: fpu_add.c,v 1.7 2022/08/28 22:09:26 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_add.c,v 1.6 2005/11/16 23:24:44 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_add.c,v 1.7 2022/08/28 22:09:26 rin Exp $");
#include
#ifdef DIAGNOSTIC
@@ -64,9 +64,9 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_add.c,v
struct fpn *
fpu_add(struct fpemu *fe)
{
- register struct fpn *x = &fe->fe_f1, *y = &fe->fe_f2, *r;
- register u_int r0, r1, r2, r3;
- register int rd;
+ struct fpn *x = &fe->fe_f1, *y = &fe->fe_f2, *r;
+ u_int r0, r1, r2, r3;
+ int rd;
/*
* Put the `heavier' operand on the right (see fpu_emu.h).
Index: src/sys/arch/sparc/fpu/fpu_compare.c
diff -u src/sys/arch/sparc/fpu/fpu_compare.c:1.6 src/sys/arch/sparc/fpu/fpu_compare.c:1.7
--- src/sys/arch/sparc/fpu/fpu_compare.c:1.6 Sun Dec 11 12:19:05 2005
+++ src/sys/arch/sparc/fpu/fpu_compare.c Sun Aug 28 22:09:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_compare.c,v 1.6 2005/12/11 12:19:05 christos Exp $ */
+/* $NetBSD: fpu_compare.c,v 1.7 2022/08/28 22:09:26 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_compare.c,v 1.6 2005/12/11 12:19:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_compare.c,v 1.7 2022/08/28 22:09:26 rin Exp $");
#include
@@ -75,8 +75,8 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_compare.
void
fpu_compare(struct fpemu *fe, int cmpe)
{
- register struct fpn *a, *b;
- register int cc;
+ struct fpn *a, *b;
+ int cc;
FPU_DECL_CARRY
a = &fe->fe_f1;
Index: src/sys/arch/sparc/fpu/fpu_sqrt.c
diff -u src/sys/arch/sparc/fpu/fpu_sqrt.c:1.6 src/sys/arch/sparc/fpu/fpu_sqrt.c:1.7
--- src/sys/arch/sparc/fpu/fpu_sqrt.c:1.6 Tue May 24 20:00:49 2022
+++ src/sys/arch/sparc/fpu/fpu_sqrt.c Sun Aug 28 22:09:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_sqrt.c,v 1.6 2022/05/24 20:00:49 andvar Exp $ */
+/* $NetBSD: fpu_sqrt.c,v 1.7 2022/08/28 22:09:26 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v 1.6 2022/05/24 20:00:49 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v 1.7 2022/08/28 22:09:26 rin Exp $");
#include
@@ -188,12 +188,12 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_sqrt.c,v
struct fpn *
fpu_sqrt(struct fpemu *fe)
{
- register struct fpn *x = &fe->fe_f1;
- register u_int bit, q, tt;
- register u_int x0, x1, x2, x3;
- register u_int y0, y1, y2, y3;
- register u_int d0, d1, d2, d3;
- register int e;
+ struct fpn *x = &fe->fe_f1;
+ u_int bit, q, tt;
+ u_int x0, x1, x2, x3;
+ u_int y0, y1, y2, y3;
+ u_int d0, d1, d2, d3;
+ int e;
/*
* Take care of special cases first. In order:
Index: src/sys/arch/sparc/fpu/fpu_subr.c
diff -u src/sys/arch/sparc/fpu/fpu_subr.c:1.6 src/sys/arch/sparc/fpu/fpu_subr.c:1.7
--- src/sys/arch/sparc/fpu/fpu_subr.c:1.6 Sun Dec 11 12:19:05 2005
+++ src/sys/arch/sparc/fpu/fpu_subr.c Sun Aug 28 22:09:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_subr.c,v 1.6 2005/12/11 12:19:05 christos Exp $ */
+/* $NetBSD: fpu_subr.c,v 1.7 2022/08/28 22:09:26 rin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_subr.c,v 1.6 2005/12/11 12:19:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_subr.c,v 1.7 2022/08/28 22:09:26 rin Exp $");
#include
#ifdef DIAGNOSTIC
@@ -66,10 +66,10 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_subr.c,v
* sticky field is ignored anyway.
*/
int
-fpu_shr(register struct fpn *fp, register int rsh)
+fpu_shr(struct fpn *fp, register int rsh)
{
- register u_int m0
CVS commit: src/sys/arch/sparc/fpu
Module Name:src Committed By: rin Date: Sun Aug 28 22:09:26 UTC 2022 Modified Files: src/sys/arch/sparc/fpu: fpu_add.c fpu_compare.c fpu_div.c fpu_emu.h fpu_explode.c fpu_extern.h fpu_implode.c fpu_mul.c fpu_sqrt.c fpu_subr.c Log Message: Drop ``register'' qualifier. No binary changes for GENERIC compiled by GCC 10.4. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc/fpu/fpu_add.c \ src/sys/arch/sparc/fpu/fpu_compare.c src/sys/arch/sparc/fpu/fpu_sqrt.c \ src/sys/arch/sparc/fpu/fpu_subr.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc/fpu/fpu_div.c \ src/sys/arch/sparc/fpu/fpu_mul.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc/fpu/fpu_emu.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc/fpu/fpu_explode.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc/fpu/fpu_extern.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc/fpu/fpu_implode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm/src
Module Name:src
Committed By: he
Date: Sun Aug 28 21:24:09 UTC 2022
Modified Files:
src/lib/libm/src: s_rint.c
Log Message:
s_rint.c: weak-alias rintl -> rint for ports without __HAVE_LONG_DOUBLE.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libm/src/s_rint.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/s_rint.c
diff -u src/lib/libm/src/s_rint.c:1.12 src/lib/libm/src/s_rint.c:1.13
--- src/lib/libm/src/s_rint.c:1.12 Fri Apr 25 22:21:53 2008
+++ src/lib/libm/src/s_rint.c Sun Aug 28 21:24:09 2022
@@ -12,7 +12,7 @@
#include
#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_rint.c,v 1.12 2008/04/25 22:21:53 christos Exp $");
+__RCSID("$NetBSD: s_rint.c,v 1.13 2022/08/28 21:24:09 he Exp $");
#endif
/*
@@ -77,3 +77,7 @@ rint(double x)
w = TWO52[sx]+x;
return w-TWO52[sx];
}
+
+#if !defined(__HAVE_LONG_DOUBLE)
+__weak_alias(rintl, rint)
+#endif
CVS commit: src/lib/libm/src
Module Name:src Committed By: he Date: Sun Aug 28 21:24:09 UTC 2022 Modified Files: src/lib/libm/src: s_rint.c Log Message: s_rint.c: weak-alias rintl -> rint for ports without __HAVE_LONG_DOUBLE. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/libm/src/s_rint.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/distrib/sets/lists/debug
On Sun, Aug 28, 2022 at 03:30:41AM -0400, Christos Zoulas wrote: > Modified Files: > src/distrib/sets/lists/debug: mi > > Log Message: > fix sets Bah. Sorry about that. Been too long since the last time... -- David A. Holland dholl...@netbsd.org
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sun Aug 28 19:09:12 UTC 2022
Modified Files:
src/usr.bin/xlint/lint1: decl.c externs1.h func.c tree.c
Log Message:
lint: inline previous_declaration for nonconstant message IDs
This adds back the compile-time printf validation in debug mode that was
missing before.
To generate a diff of this commit:
cvs rdiff -u -r1.298 -r1.299 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.168 -r1.169 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.143 -r1.144 src/usr.bin/xlint/lint1/func.c
cvs rdiff -u -r1.479 -r1.480 src/usr.bin/xlint/lint1/tree.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/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.298 src/usr.bin/xlint/lint1/decl.c:1.299
--- src/usr.bin/xlint/lint1/decl.c:1.298 Sun Aug 28 12:04:47 2022
+++ src/usr.bin/xlint/lint1/decl.c Sun Aug 28 19:09:12 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.298 2022/08/28 12:04:47 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.299 2022/08/28 19:09:12 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: decl.c,v 1.298 2022/08/28 12:04:47 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.299 2022/08/28 19:09:12 rillig Exp $");
#endif
#include
@@ -1780,7 +1780,7 @@ new_tag(sym_t *tag, scl_t scl, bool decl
/* %s tag '%s' redeclared as %s */
error(46, storage_class_name(tag->s_scl),
tag->s_name, storage_class_name(scl));
- print_previous_declaration(-1, tag);
+ print_previous_declaration(tag);
tag = pushdown(tag);
dcs->d_enclosing->d_nonempty_decl = true;
} else if (semi || decl)
@@ -1896,7 +1896,7 @@ enumeration_constant(sym_t *sym, int val
* previous declaration
*/
if (block_level == 0)
- print_previous_declaration(-1, sym);
+ print_previous_declaration(sym);
}
} else {
if (hflag)
@@ -1993,7 +1993,7 @@ declare_extern(sym_t *dsym, bool initflg
else
/* redeclaration of '%s' */
warning(27, dsym->s_name);
-print_previous_declaration(-1, rdsym);
+print_previous_declaration(rdsym);
}
/*
@@ -2085,32 +2085,32 @@ check_redeclaration(sym_t *dsym, bool *d
if (rsym->s_scl == ENUM_CONST) {
/* redeclaration of '%s' */
error(27, dsym->s_name);
- print_previous_declaration(-1, rsym);
+ print_previous_declaration(rsym);
return true;
}
if (rsym->s_scl == TYPEDEF) {
/* typedef '%s' redeclared */
error(89, dsym->s_name);
- print_previous_declaration(-1, rsym);
+ print_previous_declaration(rsym);
return true;
}
if (dsym->s_scl == TYPEDEF) {
/* redeclaration of '%s' */
error(27, dsym->s_name);
- print_previous_declaration(-1, rsym);
+ print_previous_declaration(rsym);
return true;
}
if (rsym->s_def == DEF && dsym->s_def == DEF) {
/* redefinition of '%s' */
error(28, dsym->s_name);
- print_previous_declaration(-1, rsym);
+ print_previous_declaration(rsym);
return true;
}
if (!types_compatible(rsym->s_type, dsym->s_type, false, false, dowarn)) {
/* redeclaration of '%s' with type '%s', expected '%s' */
error(347, dsym->s_name,
type_name(dsym->s_type), type_name(rsym->s_type));
- print_previous_declaration(-1, rsym);
+ print_previous_declaration(rsym);
return true;
}
if (rsym->s_scl == EXTERN && dsym->s_scl == EXTERN)
@@ -2126,13 +2126,13 @@ check_redeclaration(sym_t *dsym, bool *d
*/
/* redeclaration of '%s' */
error(27, dsym->s_name);
- print_previous_declaration(-1, rsym);
+ print_previous_declaration(rsym);
return true;
}
if (rsym->s_scl == EXTERN) {
/* '%s' was previously declared extern, becomes static */
warning(29, dsym->s_name);
- print_previous_declaration(-1, rsym);
+ print_previous_declaration(rsym);
return false;
}
/*
@@ -2143,7 +2143,7 @@ check_redeclaration(sym_t *dsym, bool *d
if (!allow_trad && !allow_c99) {
/* redeclaration of '%s'; ANSI C requires static */
warning(30, dsym->s_name);
- print_previous_declaration(-1, rsym);
+ print_previous_declaration(rsym);
}
dsym->s_scl = STATIC;
return false;
@@ -2337,9 +2337,10 @@ check_old_style_definition(sym_t *rdsym,
}
end:
- if (msg)
+ if (msg && rflag) {
/* old style definition */
- print_previous_declaration(300, rdsym);
+ message_at(300, &rdsym->s_def_pos);
+ }
return msg;
}
@@ -2577,10 +2578,9 @@ check_func_old_style_arguments(void)
arg = arg->s_next;
}
}
- if (msg) {
+ if (msg && rflag) {
/* prototype declaration */
- print_previous_declaration(285,
- dcs->d_redeclared_symbol);
+ message_at(285, &dcs->d_redeclared_symbol->s_def_pos);
}
/* from now on the prototype is valid */
@@ -2793,7 +2793,7 @@ declare_external_in_block(sym_t *dsym)
/* gcc accepts this without a warning, pcc prints an error. */
/* redeclaration of
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sun Aug 28 19:09:12 UTC 2022 Modified Files: src/usr.bin/xlint/lint1: decl.c externs1.h func.c tree.c Log Message: lint: inline previous_declaration for nonconstant message IDs This adds back the compile-time printf validation in debug mode that was missing before. To generate a diff of this commit: cvs rdiff -u -r1.298 -r1.299 src/usr.bin/xlint/lint1/decl.c cvs rdiff -u -r1.168 -r1.169 src/usr.bin/xlint/lint1/externs1.h cvs rdiff -u -r1.143 -r1.144 src/usr.bin/xlint/lint1/func.c cvs rdiff -u -r1.479 -r1.480 src/usr.bin/xlint/lint1/tree.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm/src
Module Name:src
Committed By: he
Date: Sun Aug 28 16:07:58 UTC 2022
Modified Files:
src/lib/libm/src: s_sincos.c
Log Message:
s_sincos.c: use correct order of __weak_alias() arguments...
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libm/src/s_sincos.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/s_sincos.c
diff -u src/lib/libm/src/s_sincos.c:1.3 src/lib/libm/src/s_sincos.c:1.4
--- src/lib/libm/src/s_sincos.c:1.3 Sun Aug 28 14:30:41 2022
+++ src/lib/libm/src/s_sincos.c Sun Aug 28 16:07:58 2022
@@ -14,7 +14,7 @@
#include
#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_sincos.c,v 1.3 2022/08/28 14:30:41 he Exp $");
+__RCSID("$NetBSD: s_sincos.c,v 1.4 2022/08/28 16:07:58 he Exp $");
#endif
#if 0
__FBSDID("$FreeBSD: head/lib/msun/src/s_sincos.c 319047 2017-05-28 06:13:38Z mmel $");
@@ -86,5 +86,5 @@ sincos(double x, double *sn, double *cs)
}
#if !defined(__HAVE_LONG_DOUBLE)
-__weak_alias(sincos, sincosl);
+__weak_alias(sincosl, sincos);
#endif
CVS commit: src/lib/libm/src
Module Name:src Committed By: he Date: Sun Aug 28 16:07:58 UTC 2022 Modified Files: src/lib/libm/src: s_sincos.c Log Message: s_sincos.c: use correct order of __weak_alias() arguments... To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libm/src/s_sincos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm/src
Module Name:src
Committed By: he
Date: Sun Aug 28 14:30:41 UTC 2022
Modified Files:
src/lib/libm/src: s_sincos.c
Log Message:
s_sincos.c: use __weak_alias and not __weak_reference.
Fixes build on NetBSD/macppc, thanks to hint from riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libm/src/s_sincos.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/s_sincos.c
diff -u src/lib/libm/src/s_sincos.c:1.2 src/lib/libm/src/s_sincos.c:1.3
--- src/lib/libm/src/s_sincos.c:1.2 Sun Aug 28 07:29:04 2022
+++ src/lib/libm/src/s_sincos.c Sun Aug 28 14:30:41 2022
@@ -14,7 +14,7 @@
#include
#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_sincos.c,v 1.2 2022/08/28 07:29:04 christos Exp $");
+__RCSID("$NetBSD: s_sincos.c,v 1.3 2022/08/28 14:30:41 he Exp $");
#endif
#if 0
__FBSDID("$FreeBSD: head/lib/msun/src/s_sincos.c 319047 2017-05-28 06:13:38Z mmel $");
@@ -86,5 +86,5 @@ sincos(double x, double *sn, double *cs)
}
#if !defined(__HAVE_LONG_DOUBLE)
-__weak_reference(sincos, sincosl);
+__weak_alias(sincos, sincosl);
#endif
CVS commit: src/lib/libm/src
Module Name:src Committed By: he Date: Sun Aug 28 14:30:41 UTC 2022 Modified Files: src/lib/libm/src: s_sincos.c Log Message: s_sincos.c: use __weak_alias and not __weak_reference. Fixes build on NetBSD/macppc, thanks to hint from riastradh@ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libm/src/s_sincos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: riastradh Date: Sun Aug 28 14:29:05 UTC 2022 Modified Files: src/share/man/man4: options.4 Log Message: options(4): Clarify MSGBUFSIZE units: bytes. To generate a diff of this commit: cvs rdiff -u -r1.522 -r1.523 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/options.4 diff -u src/share/man/man4/options.4:1.522 src/share/man/man4/options.4:1.523 --- src/share/man/man4/options.4:1.522 Sat May 7 04:35:20 2022 +++ src/share/man/man4/options.4 Sun Aug 28 14:29:05 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: options.4,v 1.522 2022/05/07 04:35:20 rin Exp $ +.\" $NetBSD: options.4,v 1.523 2022/08/28 14:29:05 riastradh Exp $ .\" .\" Copyright (c) 1996 .\" Perry E. Metzger. All rights reserved. @@ -669,7 +669,7 @@ See .Xr ktrace 1 for details. .It Cd options MSGBUFSIZE=integer -This option sets the size of the kernel message buffer. +This option sets the size of the kernel message buffer in bytes. This buffer holds the kernel output of .Fn printf when not (yet) read by
CVS commit: src/share/man/man4
Module Name:src Committed By: riastradh Date: Sun Aug 28 14:29:05 UTC 2022 Modified Files: src/share/man/man4: options.4 Log Message: options(4): Clarify MSGBUFSIZE units: bytes. To generate a diff of this commit: cvs rdiff -u -r1.522 -r1.523 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst/arch/atari
Module Name:src
Committed By: tsutsui
Date: Sun Aug 28 13:56:56 UTC 2022
Modified Files:
src/usr.sbin/sysinst/arch/atari: md.c
Log Message:
Choose a proper kernel set per a running kernel during installation.
Mostly taken from sgimips.
This avoids users from overwriting by the default ATARITT kernel on
non TT machines like Falcon, Hades, and Milan etc.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/atari/md.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.sbin/sysinst/arch/atari/md.c
diff -u src/usr.sbin/sysinst/arch/atari/md.c:1.8 src/usr.sbin/sysinst/arch/atari/md.c:1.9
--- src/usr.sbin/sysinst/arch/atari/md.c:1.8 Sat Jan 29 16:01:17 2022
+++ src/usr.sbin/sysinst/arch/atari/md.c Sun Aug 28 13:56:56 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.8 2022/01/29 16:01:17 martin Exp $ */
+/* $NetBSD: md.c,v 1.9 2022/08/28 13:56:56 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -39,6 +39,7 @@
#include
#include
#include
+#include
#include "defs.h"
#include "md.h"
@@ -53,7 +54,27 @@ md_init(void)
void
md_init_set_status(int flags)
{
+ struct utsname instsys;
+
(void)flags;
+
+ /*
+ * Get the name of the kernel we are running under and
+ * enable the installation of the corresponding GENERIC-like kernel.
+ */
+ uname(&instsys);
+ if (strstr(instsys.version, "(ATARITT"))
+ set_kernel_set(SET_KERNEL_1);
+ else if (strstr(instsys.version, "(FALCON"))
+ set_kernel_set(SET_KERNEL_2);
+ else if (strstr(instsys.version, "(SMALL030"))
+ set_kernel_set(SET_KERNEL_3);
+ else if (strstr(instsys.version, "(HADES"))
+ set_kernel_set(SET_KERNEL_4);
+ else if (strstr(instsys.version, "(MILAN-ISAIDE"))
+ set_kernel_set(SET_KERNEL_5);
+ else if (strstr(instsys.version, "(MILAN_PCIIDE"))
+ set_kernel_set(SET_KERNEL_6);
}
bool
CVS commit: src/usr.sbin/sysinst/arch/atari
Module Name:src Committed By: tsutsui Date: Sun Aug 28 13:56:56 UTC 2022 Modified Files: src/usr.sbin/sysinst/arch/atari: md.c Log Message: Choose a proper kernel set per a running kernel during installation. Mostly taken from sgimips. This avoids users from overwriting by the default ATARITT kernel on non TT machines like Falcon, Hades, and Milan etc. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/arch/atari/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
Hi, On Sun, Aug 28, 2022 at 03:26:28PM +0300, Valery Ushakov wrote: > On Sun, Aug 28, 2022 at 10:48:17 +, Harold Gutch wrote: > > > Change back various occurrences of \*[Le], \*[Ge] (less/greater equal) > > and \*(ua (upwards arrow) to literal "<=", ">=" and "^" whenever > > appropriate (e.g., in code examples). > > Thanks. Using your commit as a pretext (and in no way intended as > censure) ... > > I wonder if we should switch to consistently use \(ha (a groff > extension also understood by heirloom) for ascii circumflex. Troff > turns plain ^ into circumflex accent which is visually very small and > you cannot find it, obviously, when you search pdf output for "^". No strong opinion here - my test case earlier was "man csh" when LC_CTYPE=en_US.UTF-8 where \*(ua renders an actual error. Both ^ and \ha render a caret here, so no objection from my side to such a change. > Check out e.g. > > groff -Tps -mandoc csh.1 > csh.ps && ps2pdf csh.ps csh.pdf > > (that postscript output has a lot of other problems, b/c examples are > not in monospaced font, etc, which makes the ^ size problem even worse > visually). At least on macOS (and using pstopdf from there), \ha seems like a small improvement over ^ in that Preview now actually finds occurrences of ^ if you search for it. It doesn't highlight the carets but it now returns the pages with one on it (it doesn't find the pages only containing ones that come from a ^ in the source). Harold
CVS commit: src/sys/sys
Module Name:src
Committed By: riastradh
Date: Sun Aug 28 13:50:50 UTC 2022
Modified Files:
src/sys/sys: disklabel_gpt.h
Log Message:
sys/disklabel_gpt.h: Fix description of name encoding.
The encoding is UCS-2 from Unicode 2.1 or ISO/IEC 10646. This is not
to be confused with UTF-16, which encodes code points outside the BMP
(Basic Multilingual Plane, ~16-bit space) with pairs of surrogate
code points.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/sys/disklabel_gpt.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/disklabel_gpt.h
diff -u src/sys/sys/disklabel_gpt.h:1.14 src/sys/sys/disklabel_gpt.h:1.15
--- src/sys/sys/disklabel_gpt.h:1.14 Mon May 18 05:47:54 2020
+++ src/sys/sys/disklabel_gpt.h Sun Aug 28 13:50:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel_gpt.h,v 1.14 2020/05/18 05:47:54 msaitoh Exp $ */
+/* $NetBSD: disklabel_gpt.h,v 1.15 2022/08/28 13:50:50 riastradh Exp $ */
/*
* Copyright (c) 2002 Marcel Moolenaar
@@ -79,7 +79,7 @@ struct gpt_ent {
uint64_t ent_lba_start; /* start of partition */
uint64_t ent_lba_end; /* end of partition */
uint64_t ent_attr; /* partition attributes */
- uint16_t ent_name[36]; /* partition name in UNICODE-16 */
+ uint16_t ent_name[36]; /* partition name in UCS-2 */
};
#define GPT_ENT_ATTR_REQUIRED_PARTITION (1ULL << 0)
CVS commit: src/sys/sys
Module Name:src Committed By: riastradh Date: Sun Aug 28 13:50:50 UTC 2022 Modified Files: src/sys/sys: disklabel_gpt.h Log Message: sys/disklabel_gpt.h: Fix description of name encoding. The encoding is UCS-2 from Unicode 2.1 or ISO/IEC 10646. This is not to be confused with UTF-16, which encodes code points outside the BMP (Basic Multilingual Plane, ~16-bit space) with pairs of surrogate code points. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/sys/disklabel_gpt.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Aug 28 13:32:34 UTC 2022 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1756 To generate a diff of this commit: cvs rdiff -u -r1.1.2.142 -r1.1.2.143 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.142 src/doc/CHANGES-8.3:1.1.2.143 --- src/doc/CHANGES-8.3:1.1.2.142 Fri Aug 12 15:20:07 2022 +++ src/doc/CHANGES-8.3 Sun Aug 28 13:32:34 2022 @@ -1,4 +1,4 @@ - $NetBSD: CHANGES-8.3,v 1.1.2.142 2022/08/12 15:20:07 martin Exp $ + $NetBSD: CHANGES-8.3,v 1.1.2.143 2022/08/28 13:32:34 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -2741,3 +2741,8 @@ sys/dev/ic/dwc_gmac.c1.76,1.77 consistent for all packet types. [sekiya, ticket #1755] +libexec/telnetd/utility.c 1.34 + + telnetd(8): fix CVE-2020-10188. + [hgutch, ticket #1756] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Aug 28 13:32:34 UTC 2022 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1756 To generate a diff of this commit: cvs rdiff -u -r1.1.2.142 -r1.1.2.143 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/libexec/telnetd
Module Name:src
Committed By: martin
Date: Sun Aug 28 13:31:40 UTC 2022
Modified Files:
src/libexec/telnetd [netbsd-8]: utility.c
Log Message:
Pull up following revision(s) (requested by hgutch in ticket #1756):
libexec/telnetd/utility.c: revision 1.34
Fix CVE-2020-10188
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.32.1 src/libexec/telnetd/utility.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/telnetd/utility.c
diff -u src/libexec/telnetd/utility.c:1.32 src/libexec/telnetd/utility.c:1.32.32.1
--- src/libexec/telnetd/utility.c:1.32 Mon Jan 9 16:36:48 2012
+++ src/libexec/telnetd/utility.c Sun Aug 28 13:31:39 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: utility.c,v 1.32 2012/01/09 16:36:48 christos Exp $ */
+/* $NetBSD: utility.c,v 1.32.32.1 2022/08/28 13:31:39 martin Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)utility.c 8.4 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: utility.c,v 1.32 2012/01/09 16:36:48 christos Exp $");
+__RCSID("$NetBSD: utility.c,v 1.32.32.1 2022/08/28 13:31:39 martin Exp $");
#endif
#endif /* not lint */
@@ -43,7 +43,7 @@ __RCSID("$NetBSD: utility.c,v 1.32 2012/
#define PRINTOPTIONS
#include "telnetd.h"
-char *nextitem(char *);
+char *nextitem(char *, const char *);
void putstr(char *);
extern int not42;
@@ -143,31 +143,38 @@ ptyflush(void)
* character.
*/
char *
-nextitem(char *current)
+nextitem(char *current, const char *endp)
{
+if (current >= endp) {
+ return NULL;
+}
if ((*current&0xff) != IAC) {
return current+1;
}
+if (current+1 >= endp) {
+ return NULL;
+}
switch (*(current+1)&0xff) {
case DO:
case DONT:
case WILL:
case WONT:
- return current+3;
+ return current+3 <= endp ? current+3 : NULL;
case SB: /* loop forever looking for the SE */
{
char *look = current+2;
- for (;;) {
+ while (look < endp) {
if ((*look++&0xff) == IAC) {
- if ((*look++&0xff) == SE) {
+ if (look < endp && (*look++&0xff) == SE) {
return look;
}
}
}
+ return NULL;
}
default:
- return current+2;
+ return current+2 <= endp ? current+2 : NULL;
}
} /* end of nextitem */
@@ -194,7 +201,7 @@ netclear(void)
char *thisitem, *next;
char *good;
#define wewant(p) ((nfrontp > p) && ((*p&0xff) == IAC) && \
-((*(p+1)&0xff) != EC) && ((*(p+1)&0xff) != EL))
+(nfrontp > p+1) && ((*(p+1)&0xff) != EC) && ((*(p+1)&0xff) != EL))
#ifdef ENCRYPTION
thisitem = nclearto > netobuf ? nclearto : netobuf;
@@ -202,7 +209,7 @@ netclear(void)
thisitem = netobuf;
#endif /* ENCRYPTION */
-while ((next = nextitem(thisitem)) <= nbackp) {
+while ((next = nextitem(thisitem, nbackp)) != NULL && (next <= nbackp)) {
thisitem = next;
}
@@ -214,20 +221,23 @@ netclear(void)
good = netobuf; /* where the good bytes go */
#endif /* ENCRYPTION */
-while (nfrontp > thisitem) {
+while ((thisitem != NULL) && (nfrontp > thisitem)) {
if (wewant(thisitem)) {
int length;
next = thisitem;
do {
- next = nextitem(next);
- } while (wewant(next) && (nfrontp > next));
+ next = nextitem(next, nfrontp);
+ } while ((next != NULL) && wewant(next) && (nfrontp > next));
+ if (next == NULL) {
+ next = nfrontp;
+ }
length = next-thisitem;
memmove(good, thisitem, length);
good += length;
thisitem = next;
} else {
- thisitem = nextitem(thisitem);
+ thisitem = nextitem(thisitem, nfrontp);
}
}
CVS commit: [netbsd-8] src/libexec/telnetd
Module Name:src Committed By: martin Date: Sun Aug 28 13:31:40 UTC 2022 Modified Files: src/libexec/telnetd [netbsd-8]: utility.c Log Message: Pull up following revision(s) (requested by hgutch in ticket #1756): libexec/telnetd/utility.c: revision 1.34 Fix CVE-2020-10188 To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.32.32.1 src/libexec/telnetd/utility.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Aug 28 13:30:53 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1502 To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.4 diff -u src/doc/CHANGES-9.4:1.1.2.4 src/doc/CHANGES-9.4:1.1.2.5 --- src/doc/CHANGES-9.4:1.1.2.4 Wed Aug 17 16:43:50 2022 +++ src/doc/CHANGES-9.4 Sun Aug 28 13:30:53 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.4 2022/08/17 16:43:50 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.5 2022/08/28 13:30:53 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -41,4 +41,8 @@ sys/kern/uipc_sem.c1.60 PR 55509: fix per-uid "semcnt" bookeeping. [chs, ticket #1501] +libexec/telnetd/utility.c 1.34 + + telnetd(8): fix CVE-2020-10188. + [hgutch, ticket #1502]
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Aug 28 13:30:53 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1502 To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/libexec/telnetd
Module Name:src
Committed By: martin
Date: Sun Aug 28 13:29:40 UTC 2022
Modified Files:
src/libexec/telnetd [netbsd-9]: utility.c
Log Message:
Pull up following revision(s) (requested by hgutch in ticket #1502):
libexec/telnetd/utility.c: revision 1.34
Fix CVE-2020-10188
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.2.1 src/libexec/telnetd/utility.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/telnetd/utility.c
diff -u src/libexec/telnetd/utility.c:1.33 src/libexec/telnetd/utility.c:1.33.2.1
--- src/libexec/telnetd/utility.c:1.33 Mon Feb 4 04:36:41 2019
+++ src/libexec/telnetd/utility.c Sun Aug 28 13:29:40 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: utility.c,v 1.33 2019/02/04 04:36:41 mrg Exp $ */
+/* $NetBSD: utility.c,v 1.33.2.1 2022/08/28 13:29:40 martin Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)utility.c 8.4 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: utility.c,v 1.33 2019/02/04 04:36:41 mrg Exp $");
+__RCSID("$NetBSD: utility.c,v 1.33.2.1 2022/08/28 13:29:40 martin Exp $");
#endif
#endif /* not lint */
@@ -43,7 +43,7 @@ __RCSID("$NetBSD: utility.c,v 1.33 2019/
#define PRINTOPTIONS
#include "telnetd.h"
-char *nextitem(char *);
+char *nextitem(char *, const char *);
void putstr(char *);
extern int not42;
@@ -143,31 +143,38 @@ ptyflush(void)
* character.
*/
char *
-nextitem(char *current)
+nextitem(char *current, const char *endp)
{
+if (current >= endp) {
+ return NULL;
+}
if ((*current&0xff) != IAC) {
return current+1;
}
+if (current+1 >= endp) {
+ return NULL;
+}
switch (*(current+1)&0xff) {
case DO:
case DONT:
case WILL:
case WONT:
- return current+3;
+ return current+3 <= endp ? current+3 : NULL;
case SB: /* loop forever looking for the SE */
{
char *look = current+2;
- for (;;) {
+ while (look < endp) {
if ((*look++&0xff) == IAC) {
- if ((*look++&0xff) == SE) {
+ if (look < endp && (*look++&0xff) == SE) {
return look;
}
}
}
+ return NULL;
}
default:
- return current+2;
+ return current+2 <= endp ? current+2 : NULL;
}
} /* end of nextitem */
@@ -194,7 +201,7 @@ netclear(void)
char *thisitem, *next;
char *good;
#define wewant(p) ((nfrontp > p) && ((*p&0xff) == IAC) && \
-((*(p+1)&0xff) != EC) && ((*(p+1)&0xff) != EL))
+(nfrontp > p+1) && ((*(p+1)&0xff) != EC) && ((*(p+1)&0xff) != EL))
#ifdef ENCRYPTION
thisitem = nclearto > netobuf ? nclearto : netobuf;
@@ -202,7 +209,7 @@ netclear(void)
thisitem = netobuf;
#endif /* ENCRYPTION */
-while ((next = nextitem(thisitem)) <= nbackp) {
+while ((next = nextitem(thisitem, nbackp)) != NULL && (next <= nbackp)) {
thisitem = next;
}
@@ -214,20 +221,23 @@ netclear(void)
good = netobuf; /* where the good bytes go */
#endif /* ENCRYPTION */
-while (nfrontp > thisitem) {
+while ((thisitem != NULL) && (nfrontp > thisitem)) {
if (wewant(thisitem)) {
int length;
next = thisitem;
do {
- next = nextitem(next);
- } while (wewant(next) && (nfrontp > next));
+ next = nextitem(next, nfrontp);
+ } while ((next != NULL) && wewant(next) && (nfrontp > next));
+ if (next == NULL) {
+ next = nfrontp;
+ }
length = next-thisitem;
memmove(good, thisitem, length);
good += length;
thisitem = next;
} else {
- thisitem = nextitem(thisitem);
+ thisitem = nextitem(thisitem, nfrontp);
}
}
CVS commit: [netbsd-9] src/libexec/telnetd
Module Name:src Committed By: martin Date: Sun Aug 28 13:29:40 UTC 2022 Modified Files: src/libexec/telnetd [netbsd-9]: utility.c Log Message: Pull up following revision(s) (requested by hgutch in ticket #1502): libexec/telnetd/utility.c: revision 1.34 Fix CVE-2020-10188 To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.33.2.1 src/libexec/telnetd/utility.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/regex
Module Name:src
Committed By: uwe
Date: Sun Aug 28 12:59:50 UTC 2022
Modified Files:
src/lib/libc/regex: re_format.7
Log Message:
re_format(7): Use dagger, not double dagger. Make it superscript.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/regex/re_format.7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/regex/re_format.7
diff -u src/lib/libc/regex/re_format.7:1.14 src/lib/libc/regex/re_format.7:1.15
--- src/lib/libc/regex/re_format.7:1.14 Wed Feb 24 09:10:12 2021
+++ src/lib/libc/regex/re_format.7 Sun Aug 28 12:59:50 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: re_format.7,v 1.14 2021/02/24 09:10:12 wiz Exp $
+.\" $NetBSD: re_format.7,v 1.15 2022/08/28 12:59:50 uwe Exp $
.\"
.\" Copyright (c) 1992, 1993, 1994 Henry Spencer.
.\" Copyright (c) 1992, 1993, 1994
@@ -64,18 +64,19 @@ Obsolete REs mostly exist for backward c
they will be discussed at the end.
.St -p1003.2
leaves some aspects of RE syntax and semantics open;
-`\(dd' marks decisions on these aspects that
+.ds DG \\s-2\\v'-0.4m'\\(dg\\v'0.4m'\\s+2
+`\(dg' marks decisions on these aspects that
may not be fully portable to other
.St -p1003.2
implementations.
.Pp
-A (modern) RE is one\(dd or more non-empty\(dd
+A (modern) RE is one\*(DG or more non-empty\*(DG
.Em branches ,
separated by
.Ql \&| .
It matches anything that matches one of the branches.
.Pp
-A branch is one\(dd or more
+A branch is one\*(DG or more
.Em pieces ,
concatenated.
It matches a match for the first, followed by a match for the second, etc.
@@ -83,7 +84,7 @@ It matches a match for the first, follow
A piece is an
.Em atom
possibly followed
-by a single\(dd
+by a single\*(DG
.Ql \&* ,
.Ql \&+ ,
.Ql \&? ,
@@ -111,7 +112,7 @@ always followed by
.Ql \&} .
The integers must lie between 0 and
.Dv RE_DUP_MAX
-(255\(dd) inclusive,
+(255\*(DG) inclusive,
and if there are two of them, the first may not exceed the second.
An atom followed by a bound containing one integer
.Em i
@@ -144,7 +145,7 @@ An atom is a regular expression enclosed
regular expression),
an empty set of
.Ql ()
-(matching the null string)\(dd,
+(matching the null string)\*(DG,
a
.Em bracket expression
(see below),
@@ -160,16 +161,16 @@ followed by one of the characters
(matching that character taken as an ordinary character),
a
.Ql \e
-followed by any other character\(dd
+followed by any other character\*(DG
(matching that character taken as an ordinary character,
as if the
.Ql \e
-had not been present\(dd),
+had not been present\*(DG),
or a single character with no other significance (matching that character).
A
.Ql \&{
followed by a character other than a digit is an ordinary
-character, not the beginning of a bound\(dd.
+character, not the beginning of a bound\*(DG.
It is illegal to end an RE with
.Ql \e .
.Pp
@@ -193,7 +194,7 @@ of characters between those two (inclusi
collating sequence,
.No e.g. Ql [0-9]
in ASCII matches any decimal digit.
-It is illegal\(dd for two ranges to share an
+It is illegal\*(DG for two ranges to share an
endpoint,
.No e.g. Ql a-c-e .
Ranges are very collating-sequence-dependent,
@@ -265,7 +266,7 @@ then
and
.Ql [xy]
are all synonymous.
-An equivalence class may not\(dd be an endpoint
+An equivalence class may not\*(DG be an endpoint
of a range.
.Pp
Within a bracket expression, the name of a
@@ -297,7 +298,7 @@ The reverse, matching any character that
class, the negation operator of bracket expressions may be used:
.Ql [^[:class:]] .
.Pp
-There are two special cases\(dd of bracket expressions:
+There are two special cases\*(DG of bracket expressions:
the bracket expressions
.Ql [[:<:]]
and
@@ -377,7 +378,7 @@ and
becomes
.Ql [^xX] .
.Pp
-No particular limit is imposed on the length of REs\(dd.
+No particular limit is imposed on the length of REs\*(DG.
Programs intended to be portable should not employ REs longer
than 256 bytes,
as an implementation can refuse to accept such REs and remain
@@ -424,10 +425,10 @@ and
by themselves ordinary characters.
.Ql \&^
is an ordinary character except at the beginning of the
-RE or\(dd the beginning of a parenthesized subexpression,
+RE or\*(DG the beginning of a parenthesized subexpression,
.Ql \&$
is an ordinary character except at the end of the
-RE or\(dd the end of a parenthesized subexpression,
+RE or\*(DG the end of a parenthesized subexpression,
and
.Ql \&*
is an ordinary character if it appears at the beginning of the
CVS commit: src/lib/libc/regex
Module Name:src Committed By: uwe Date: Sun Aug 28 12:59:50 UTC 2022 Modified Files: src/lib/libc/regex: re_format.7 Log Message: re_format(7): Use dagger, not double dagger. Make it superscript. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libc/regex/re_format.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src
Committed By: tsutsui
Date: Sun Aug 28 12:44:01 UTC 2022
Modified Files:
src/distrib/amiga/floppies/inst-common: dot.commonutils
src/distrib/amiga/miniroot: dot.profile
src/distrib/utils/script-installer: dot.commonutils
src/distrib/vax/inst-common: dot.commonutils
Log Message:
Avoid more obsolescent binary primaries not supported by crunched test(1).
See PR/54835 and PR/56983 for details.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/distrib/amiga/floppies/inst-common/dot.commonutils
cvs rdiff -u -r1.10 -r1.11 src/distrib/amiga/miniroot/dot.profile
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/script-installer/dot.commonutils
cvs rdiff -u -r1.5 -r1.6 src/distrib/vax/inst-common/dot.commonutils
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amiga/floppies/inst-common/dot.commonutils
diff -u src/distrib/amiga/floppies/inst-common/dot.commonutils:1.8 src/distrib/amiga/floppies/inst-common/dot.commonutils:1.9
--- src/distrib/amiga/floppies/inst-common/dot.commonutils:1.8 Sat Jul 26 17:06:29 2003
+++ src/distrib/amiga/floppies/inst-common/dot.commonutils Sun Aug 28 12:44:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: dot.commonutils,v 1.8 2003/07/26 17:06:29 salo Exp $
+# $NetBSD: dot.commonutils,v 1.9 2022/08/28 12:44:00 tsutsui Exp $
#
# Copyright (c) 1994 Christopher G. Demetriou
# All rights reserved.
@@ -49,7 +49,7 @@ GUNZIP=/usr/bin/gunzip
Set_tmp_dir()
{
def_tmp_dir=`pwd`
- if [ "$def_tmp_dir" = "/" -o "$def_tmp_dir" = "/mnt" ]; then
+ if [ "$def_tmp_dir" = "/" ] || [ "$def_tmp_dir" = "/mnt" ]; then
def_tmp_dir="$dest_dir"usr/distrib
fi
@@ -78,7 +78,7 @@ Load_fd()
{
Tmp_dir
which=
- while [ "$which" != "a" -a "$which" != "b" ]; do
+ while [ "$which" != "a" ] && [ "$which" != "b" ]; do
echo -n "Read from which floppy drive ('a' or 'b')? [a] "
read which
if [ "X$which" = "X" ]; then
Index: src/distrib/amiga/miniroot/dot.profile
diff -u src/distrib/amiga/miniroot/dot.profile:1.10 src/distrib/amiga/miniroot/dot.profile:1.11
--- src/distrib/amiga/miniroot/dot.profile:1.10 Sun Jul 27 19:55:19 2008
+++ src/distrib/amiga/miniroot/dot.profile Sun Aug 28 12:44:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.10 2008/07/27 19:55:19 mlelstv Exp $
+# $NetBSD: dot.profile,v 1.11 2022/08/28 12:44:01 tsutsui Exp $
#
# Copyright (c) 1995 Jason R. Thorpe
# Copyright (c) 1994 Christopher G. Demetriou
@@ -71,7 +71,7 @@ if [ "X${DONEPROFILE}" = "X" ]; then
# Check if the answer is valid (in range). Note that an answer
# < 0 cannot happen because the sed(1) above also removes the
# sign.
- if [ -z "$_ans" -o "$_ans" -ge $_num ]; then
+ if [ -z "$_ans" ] || [ "$_ans" -ge $_num ]; then
echo "You entered an invalid response, please try again."
continue
fi
Index: src/distrib/utils/script-installer/dot.commonutils
diff -u src/distrib/utils/script-installer/dot.commonutils:1.7 src/distrib/utils/script-installer/dot.commonutils:1.8
--- src/distrib/utils/script-installer/dot.commonutils:1.7 Sat Jul 26 17:07:37 2003
+++ src/distrib/utils/script-installer/dot.commonutils Sun Aug 28 12:44:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: dot.commonutils,v 1.7 2003/07/26 17:07:37 salo Exp $
+# $NetBSD: dot.commonutils,v 1.8 2022/08/28 12:44:01 tsutsui Exp $
#
# Copyright (c) 1994 Christopher G. Demetriou
# All rights reserved.
@@ -49,7 +49,7 @@ GUNZIP=/usr/bin/gunzip
Set_tmp_dir()
{
def_tmp_dir=`pwd`
- if [ "$def_tmp_dir" = "/" -o "$def_tmp_dir" = "/mnt" ]; then
+ if [ "$def_tmp_dir" = "/" ] || [ "$def_tmp_dir" = "/mnt" ]; then
def_tmp_dir="$dest_dir"usr/distrib
fi
@@ -81,7 +81,7 @@ Load_fd()
# echo "Don't forget that you can't load from the drive you booted from."
echo ""
- while [ "$which" != "0" -a "$which" != "1" ]; do
+ while [ "$which" != "0" ] && [ "$which" != "1" ]; do
echo -n "Read from which floppy drive ('0' or '1')? [0] "
read which
if [ "X$which" = "X" ]; then
Index: src/distrib/vax/inst-common/dot.commonutils
diff -u src/distrib/vax/inst-common/dot.commonutils:1.5 src/distrib/vax/inst-common/dot.commonutils:1.6
--- src/distrib/vax/inst-common/dot.commonutils:1.5 Sat Jul 26 17:07:41 2003
+++ src/distrib/vax/inst-common/dot.commonutils Sun Aug 28 12:44:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: dot.commonutils,v 1.5 2003/07/26 17:07:41 salo Exp $
+# $NetBSD: dot.commonutils,v 1.6 2022/08/28 12:44:01 tsutsui Exp $
#
# Copyright (c) 1994 Christopher G. Demetriou
# All rights reserved.
@@ -39,7 +39,7 @@
Set_tmp_dir()
{
def_tmp_dir=`pwd`
- if [ "$def_tmp_dir" = "/" -o "$def_tmp_dir" = "/mnt" ]; then
+ if [ "$def_tmp_dir" = "/" ] || [ "$def_tmp_dir" = "/mnt" ]; then
def_tmp_dir=/mnt/usr/distrib
fi
@@ -68,7 +68,7 @@ Load_fd()
{
Tmp_dir
which=
- while [ "$which" != "a" -a "$which" != "b" ]; do
+ while [ "$which" != "a" ] && [ "$which" != "b" ]; do
echo -n "Read
CVS commit: src/distrib
Module Name:src Committed By: tsutsui Date: Sun Aug 28 12:44:01 UTC 2022 Modified Files: src/distrib/amiga/floppies/inst-common: dot.commonutils src/distrib/amiga/miniroot: dot.profile src/distrib/utils/script-installer: dot.commonutils src/distrib/vax/inst-common: dot.commonutils Log Message: Avoid more obsolescent binary primaries not supported by crunched test(1). See PR/54835 and PR/56983 for details. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/distrib/amiga/floppies/inst-common/dot.commonutils cvs rdiff -u -r1.10 -r1.11 src/distrib/amiga/miniroot/dot.profile cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/script-installer/dot.commonutils cvs rdiff -u -r1.5 -r1.6 src/distrib/vax/inst-common/dot.commonutils Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
On Sun, Aug 28, 2022 at 10:48:17 +, Harold Gutch wrote: > Change back various occurrences of \*[Le], \*[Ge] (less/greater equal) > and \*(ua (upwards arrow) to literal "<=", ">=" and "^" whenever > appropriate (e.g., in code examples). Thanks. Using your commit as a pretext (and in no way intended as censure) ... I wonder if we should switch to consistently use \(ha (a groff extension also understood by heirloom) for ascii circumflex. Troff turns plain ^ into circumflex accent which is visually very small and you cannot find it, obviously, when you search pdf output for "^". Check out e.g. groff -Tps -mandoc csh.1 > csh.ps && ps2pdf csh.ps csh.pdf (that postscript output has a lot of other problems, b/c examples are not in monospaced font, etc, which makes the ^ size problem even worse visually). -uwe
CVS commit: src/sys/kern
Module Name:src
Committed By: riastradh
Date: Sun Aug 28 12:24:39 UTC 2022
Modified Files:
src/sys/kern: subr_devsw.c
Log Message:
devsw(9): Clarify to match loop condition. NFCI.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/kern/subr_devsw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_devsw.c
diff -u src/sys/kern/subr_devsw.c:1.47 src/sys/kern/subr_devsw.c:1.48
--- src/sys/kern/subr_devsw.c:1.47 Sun Aug 28 11:17:38 2022
+++ src/sys/kern/subr_devsw.c Sun Aug 28 12:24:39 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_devsw.c,v 1.47 2022/08/28 11:17:38 riastradh Exp $ */
+/* $NetBSD: subr_devsw.c,v 1.48 2022/08/28 12:24:39 riastradh Exp $ */
/*-
* Copyright (c) 2001, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.47 2022/08/28 11:17:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.48 2022/08/28 12:24:39 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_dtrace.h"
@@ -194,7 +194,7 @@ devsw_attach(const char *devname,
* If we already found a conv, we're done. Otherwise, find an
* empty slot or extend the table.
*/
- if (i != max_devsw_convs) {
+ if (i < max_devsw_convs) {
error = 0;
goto out;
}
CVS commit: src/sys/kern
Module Name:src Committed By: riastradh Date: Sun Aug 28 12:24:39 UTC 2022 Modified Files: src/sys/kern: subr_devsw.c Log Message: devsw(9): Clarify to match loop condition. NFCI. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/kern/subr_devsw.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint
Module Name:src
Committed By: rillig
Date: Sun Aug 28 12:04:48 UTC 2022
Modified Files:
src/usr.bin/xlint/lint1: decl.c externs1.h init.c tree.c
src/usr.bin/xlint/lint2: chk.c
Log Message:
lint: clean up visual clutter
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.297 -r1.298 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.167 -r1.168 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.236 -r1.237 src/usr.bin/xlint/lint1/init.c
cvs rdiff -u -r1.478 -r1.479 src/usr.bin/xlint/lint1/tree.c
cvs rdiff -u -r1.50 -r1.51 src/usr.bin/xlint/lint2/chk.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/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.297 src/usr.bin/xlint/lint1/decl.c:1.298
--- src/usr.bin/xlint/lint1/decl.c:1.297 Sun Aug 28 10:43:18 2022
+++ src/usr.bin/xlint/lint1/decl.c Sun Aug 28 12:04:47 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.297 2022/08/28 10:43:18 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.298 2022/08/28 12:04:47 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: decl.c,v 1.297 2022/08/28 10:43:18 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.298 2022/08/28 12:04:47 rillig Exp $");
#endif
#include
@@ -66,7 +66,7 @@ static type_t *typedef_error(type_t *, t
static void set_first_typedef(type_t *, sym_t *);
static void dcs_align(unsigned int, unsigned int);
static sym_t *new_tag(sym_t *, scl_t, bool, bool);
-static bool eq_prototype_args(const type_t *, const type_t *, bool *);
+static bool prototypes_compatible(const type_t *, const type_t *, bool *);
static bool matches_no_arg_function(const type_t *, bool *);
static bool check_old_style_definition(sym_t *, sym_t *);
static bool check_prototype_declaration(sym_t *, sym_t *);
@@ -190,8 +190,8 @@ expr_unqualified_type(const type_t *tp)
* In case of a struct or union type, the members should lose their
* qualifiers as well, but that would require a deep copy of the
* struct or union type. This in turn would defeat the type
- * comparison in eqtype, which simply tests whether tp1->t_str ==
- * tp2->t_str.
+ * comparison in types_compatible, which simply tests whether
+ * tp1->t_str == tp2->t_str.
*/
return ntp;
@@ -206,15 +206,15 @@ is_incomplete(const type_t *tp)
{
tspec_t t;
- if ((t = tp->t_tspec) == VOID) {
+ if ((t = tp->t_tspec) == VOID)
return true;
- } else if (t == ARRAY) {
+ if (t == ARRAY)
return tp->t_incomplete_array;
- } else if (is_struct_or_union(t)) {
+ if (is_struct_or_union(t))
return tp->t_str->sou_incomplete;
- } else if (t == ENUM) {
+ if (t == ENUM)
return tp->t_enum->en_incomplete;
- }
+
return false;
}
@@ -233,16 +233,17 @@ dcs_add_storage_class(scl_t sc)
dcs->d_inline = true;
return;
}
+
if (dcs->d_type != NULL || dcs->d_abstract_type != NOTSPEC ||
dcs->d_sign_mod != NOTSPEC || dcs->d_rank_mod != NOTSPEC) {
/* storage class after type is obsolescent */
warning(83);
}
- if (dcs->d_scl == NOSCL) {
+
+ if (dcs->d_scl == NOSCL)
dcs->d_scl = sc;
- } else {
+ else
dcs->d_multiple_storage_classes = true;
- }
}
/*
@@ -419,31 +420,33 @@ typedef_error(type_t *td, tspec_t t)
return td;
}
- if (t == LONG &&
- (t2 == INT || t2 == UINT || t2 == LONG || t2 == ULONG ||
- t2 == FLOAT || t2 == DOUBLE || t2 == DCOMPLEX)) {
- /* modifying typedef with '%s'; only qualifiers allowed */
- warning(5, "long");
- if (t2 == INT) {
- td = gettyp(LONG);
- } else if (t2 == UINT) {
- td = gettyp(ULONG);
- } else if (t2 == LONG) {
- td = gettyp(QUAD);
- } else if (t2 == ULONG) {
- td = gettyp(UQUAD);
- } else if (t2 == FLOAT) {
- td = gettyp(DOUBLE);
- } else if (t2 == DOUBLE) {
- td = gettyp(LDOUBLE);
- } else if (t2 == DCOMPLEX) {
- td = gettyp(LCOMPLEX);
- }
- td = block_dup_type(td);
- td->t_typedef = true;
- return td;
- }
+ if (t != LONG)
+ goto invalid;
+
+ if (t2 == INT)
+ td = gettyp(LONG);
+ else if (t2 == UINT)
+ td = gettyp(ULONG);
+ else if (t2 == LONG)
+ td = gettyp(QUAD);
+ else if (t2 == ULONG)
+ td = gettyp(UQUAD);
+ else if (t2 == FLOAT)
+ td = gettyp(DOUBLE);
+ else if (t2 == DOUBLE)
+ td = gettyp(LDOUBLE);
+ else if (t2 == DCOMPLEX)
+ td = gettyp(LCOMPLEX);
+ else
+ goto invalid;
+
+ /* modifying typedef with '%s'; only qualifiers allowed */
+ warning(5, "long");
+ td = block_dup_type(td);
+ td->t_typedef = true;
+ return td;
+invalid:
/* Anything else is not accepted. */
dcs->d_invalid_type_combination = true;
return td;
@@ -463,7 +466,7 @@ set_first_typedef(type_t *tp, sym_t *sym
{
tspec_t t;
- if ((t = tp->t_tspec) == STRUCT || t == UNION) {
+ if (is_struct_or_union(t = tp->t_tspec)) {
if (tp->t_str->sou_first_typedef == NULL)
tp->t_str->sou_first_typedef = sym;
} else if (t == ENUM) {
CVS commit: src/usr.bin/xlint
Module Name:src Committed By: rillig Date: Sun Aug 28 12:04:48 UTC 2022 Modified Files: src/usr.bin/xlint/lint1: decl.c externs1.h init.c tree.c src/usr.bin/xlint/lint2: chk.c Log Message: lint: clean up visual clutter No functional change. To generate a diff of this commit: cvs rdiff -u -r1.297 -r1.298 src/usr.bin/xlint/lint1/decl.c cvs rdiff -u -r1.167 -r1.168 src/usr.bin/xlint/lint1/externs1.h cvs rdiff -u -r1.236 -r1.237 src/usr.bin/xlint/lint1/init.c cvs rdiff -u -r1.478 -r1.479 src/usr.bin/xlint/lint1/tree.c cvs rdiff -u -r1.50 -r1.51 src/usr.bin/xlint/lint2/chk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/fsck_msdos
Module Name:src
Committed By: mlelstv
Date: Sun Aug 28 11:32:19 UTC 2022
Modified Files:
src/sbin/fsck_msdos: boot.c
Log Message:
fix 32bit builds
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sbin/fsck_msdos/boot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_msdos/boot.c
diff -u src/sbin/fsck_msdos/boot.c:1.26 src/sbin/fsck_msdos/boot.c:1.27
--- src/sbin/fsck_msdos/boot.c:1.26 Sun Aug 28 10:20:25 2022
+++ src/sbin/fsck_msdos/boot.c Sun Aug 28 11:32:19 2022
@@ -27,7 +27,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: boot.c,v 1.26 2022/08/28 10:20:25 mlelstv Exp $");
+__RCSID("$NetBSD: boot.c,v 1.27 2022/08/28 11:32:19 mlelstv Exp $");
#endif /* not lint */
#include
@@ -159,7 +159,7 @@ readboot(int dosfs, struct bootblock *bo
fsinfo[0x3ff] = 0xaa;
if (lseek(dosfs, boot->FSInfo * boot->BytesPerSec, SEEK_SET)
!= boot->FSInfo * boot->BytesPerSec
-|| write(dosfs, fsinfo, 2 * secsize)
+|| (size_t)write(dosfs, fsinfo, 2 * secsize)
!= 2 * secsize) {
perr("Unable to write FSInfo");
free(fsinfo);
CVS commit: src/sbin/fsck_msdos
Module Name:src Committed By: mlelstv Date: Sun Aug 28 11:32:19 UTC 2022 Modified Files: src/sbin/fsck_msdos: boot.c Log Message: fix 32bit builds To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sbin/fsck_msdos/boot.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: riastradh Date: Sun Aug 28 11:17:38 UTC 2022 Modified Files: src/sys/kern: subr_devsw.c Log Message: devsw(9): Fix case of existing conv in devsw_attach. - Fix sense of conditional: if we found a conv, i < max_devsw_convs. - Make sure to initialize error on the way out. PR kern/56962: Incorrect behavior of the devsw_attach function To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/kern/subr_devsw.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: riastradh
Date: Sun Aug 28 11:17:38 UTC 2022
Modified Files:
src/sys/kern: subr_devsw.c
Log Message:
devsw(9): Fix case of existing conv in devsw_attach.
- Fix sense of conditional: if we found a conv, i < max_devsw_convs.
- Make sure to initialize error on the way out.
PR kern/56962: Incorrect behavior of the devsw_attach function
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/kern/subr_devsw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_devsw.c
diff -u src/sys/kern/subr_devsw.c:1.46 src/sys/kern/subr_devsw.c:1.47
--- src/sys/kern/subr_devsw.c:1.46 Sat Jul 9 10:30:27 2022
+++ src/sys/kern/subr_devsw.c Sun Aug 28 11:17:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_devsw.c,v 1.46 2022/07/09 10:30:27 riastradh Exp $ */
+/* $NetBSD: subr_devsw.c,v 1.47 2022/08/28 11:17:38 riastradh Exp $ */
/*-
* Copyright (c) 2001, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.46 2022/07/09 10:30:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.47 2022/08/28 11:17:38 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_dtrace.h"
@@ -194,8 +194,10 @@ devsw_attach(const char *devname,
* If we already found a conv, we're done. Otherwise, find an
* empty slot or extend the table.
*/
- if (i == max_devsw_convs)
+ if (i != max_devsw_convs) {
+ error = 0;
goto out;
+ }
for (i = 0; i < max_devsw_convs; i++) {
if (devsw_conv[i].d_name == NULL)
CVS commit: src
Module Name:src Committed By: hgutch Date: Sun Aug 28 10:48:17 UTC 2022 Modified Files: src/bin/csh: csh.1 src/bin/expr: expr.1 src/external/bsd/flex/bin: flex.1 src/lib/libc/string: strlcpy.3 src/sbin/disklabel: disklabel.5 src/share/man/man4: unix.4 src/share/man/man4/man4.sun2: leds.4 src/share/man/man4/man4.sun3: leds.4 src/usr.bin/head: head.1 src/usr.bin/mkstr: mkstr.1 src/usr.bin/tail: tail.1 Log Message: Change back various occurrences of \*[Le], \*[Ge] (less/greater equal) and \*(ua (upwards arrow) to literal "<=", ">=" and "^" whenever appropriate (e.g., in code examples). To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/bin/csh/csh.1 cvs rdiff -u -r1.37 -r1.38 src/bin/expr/expr.1 cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/bin/flex.1 cvs rdiff -u -r1.13 -r1.14 src/lib/libc/string/strlcpy.3 cvs rdiff -u -r1.30 -r1.31 src/sbin/disklabel/disklabel.5 cvs rdiff -u -r1.28 -r1.29 src/share/man/man4/unix.4 cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/man4.sun2/leds.4 cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/man4.sun3/leds.4 cvs rdiff -u -r1.14 -r1.15 src/usr.bin/head/head.1 cvs rdiff -u -r1.13 -r1.14 src/usr.bin/mkstr/mkstr.1 cvs rdiff -u -r1.20 -r1.21 src/usr.bin/tail/tail.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: hgutch
Date: Sun Aug 28 10:48:17 UTC 2022
Modified Files:
src/bin/csh: csh.1
src/bin/expr: expr.1
src/external/bsd/flex/bin: flex.1
src/lib/libc/string: strlcpy.3
src/sbin/disklabel: disklabel.5
src/share/man/man4: unix.4
src/share/man/man4/man4.sun2: leds.4
src/share/man/man4/man4.sun3: leds.4
src/usr.bin/head: head.1
src/usr.bin/mkstr: mkstr.1
src/usr.bin/tail: tail.1
Log Message:
Change back various occurrences of \*[Le], \*[Ge] (less/greater equal)
and \*(ua (upwards arrow) to literal "<=", ">=" and "^" whenever
appropriate (e.g., in code examples).
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/bin/csh/csh.1
cvs rdiff -u -r1.37 -r1.38 src/bin/expr/expr.1
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/bin/flex.1
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/string/strlcpy.3
cvs rdiff -u -r1.30 -r1.31 src/sbin/disklabel/disklabel.5
cvs rdiff -u -r1.28 -r1.29 src/share/man/man4/unix.4
cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/man4.sun2/leds.4
cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/man4.sun3/leds.4
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/head/head.1
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/mkstr/mkstr.1
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/tail/tail.1
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/csh.1
diff -u src/bin/csh/csh.1:1.56 src/bin/csh/csh.1:1.57
--- src/bin/csh/csh.1:1.56 Sat Jul 9 21:19:44 2022
+++ src/bin/csh/csh.1 Sun Aug 28 10:48:15 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: csh.1,v 1.56 2022/07/09 21:19:44 uwe Exp $
+.\" $NetBSD: csh.1,v 1.57 2022/08/28 10:48:15 hgutch Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -476,7 +476,7 @@ nest.)
This `!' may be preceded by a `\e' to prevent its special meaning; for
convenience, an `!' is passed unchanged when it is followed by a blank,
tab, newline, `=' or `('.
-(History substitutions also occur when an input line begins with `\*(ua'.
+(History substitutions also occur when an input line begins with `^'.
This special abbreviation will be described later.)
Any input line that contains history substitution is echoed on the terminal
before it is executed as it would have been typed without history substitution.
@@ -530,7 +530,7 @@ first (command) word
.It Ar n
.Ar n Ns 'th
argument
-.It \*(ua
+.It ^
first argument, i.e., `1'
.It $
last argument
@@ -544,7 +544,7 @@ range of words
abbreviates
.Ar `\&0\-y\'
.It *
-abbreviates `\*(ua\-$', or nothing if only 1 word in event
+abbreviates `^\-$', or nothing if only 1 word in event
.It Ar x*
abbreviates
.Ar `x\-$\'
@@ -555,7 +555,7 @@ but omitting word `$'
.El
.Pp
The `:' separating the event specification from the word designator
-can be omitted if the argument selector begins with a `\*(ua', `$', `*',
+can be omitted if the argument selector begins with a `^', `$', `*',
`\-' or `%'.
After the optional word designator can be
placed a sequence of modifiers, each preceded by a `:'.
@@ -624,14 +624,14 @@ A history reference may be given without
Here, the reference is to the previous command unless a previous
history reference occurred on the same line in which case this form repeats
the previous reference.
-Thus `!?foo?\*(ua !$' gives the first and last arguments
+Thus `!?foo?^ !$' gives the first and last arguments
from the command matching `?foo?'.
.Pp
A special abbreviation of a history reference occurs when the first
-non-blank character of an input line is a `\*(ua'.
-This is equivalent to `!:s\*(ua' providing a convenient
+non-blank character of an input line is a `^'.
+This is equivalent to `!:s^' providing a convenient
shorthand for substitutions on the text of the previous line.
-Thus `\*(ualb\*(ualib' fixes the spelling of
+Thus `^lb^lib' fixes the spelling of
`lib'
in the previous command.
Finally, a history substitution may be surrounded with `{' and `}'
@@ -669,7 +669,7 @@ left unchanged.
.Pp
Thus if the alias for `ls' is `ls \-l' the command `ls /usr' would map to
`ls \-l /usr', the argument list here being undisturbed.
-Similarly if the alias for `lookup' was `grep !\*(ua /etc/passwd' then
+Similarly if the alias for `lookup' was `grep !^ /etc/passwd' then
`lookup bill' would map to `grep bill /etc/passwd'.
.Pp
If an alias is found, the word transformation of the input text
@@ -987,12 +987,12 @@ and
commands.
The following operators are available:
.Bd -ragged -offset indent
-\&|\&| && \&| \*(ua & == != =~ !~ \*[Le] \*[Ge]
+\&|\&| && \&| ^ & == != =~ !~ <= >=
< > << >> + \- * / % ! ~ ( )
.Ed
.Pp
Here the precedence increases to the right,
-`==' `!=' `=~' and `!~', `\*[Le]' `\*[Ge]' `<'
+`==' `!=' `=~' and `!~', `<=' `>=' `<'
and `>', `<<' and `>>', `+' and `\-',
`*' `/' and `%' being, in grou
CVS commit: src/usr.bin/xlint
Module Name:src
Committed By: rillig
Date: Sun Aug 28 10:43:19 UTC 2022
Modified Files:
src/usr.bin/xlint/lint1: cgram.y decl.c externs1.h tree.c
src/usr.bin/xlint/lint2: chk.c
Log Message:
lint: rename functions to be clearer
No need anymore to keep external identifiers at the "6 significant
initial characters" mandated by C90.
To generate a diff of this commit:
cvs rdiff -u -r1.422 -r1.423 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.296 -r1.297 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.166 -r1.167 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.477 -r1.478 src/usr.bin/xlint/lint1/tree.c
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/xlint/lint2/chk.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/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.422 src/usr.bin/xlint/lint1/cgram.y:1.423
--- src/usr.bin/xlint/lint1/cgram.y:1.422 Sun Aug 28 08:41:06 2022
+++ src/usr.bin/xlint/lint1/cgram.y Sun Aug 28 10:43:18 2022
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.422 2022/08/28 08:41:06 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.423 2022/08/28 10:43:18 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: cgram.y,v 1.422 2022/08/28 08:41:06 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.423 2022/08/28 10:43:18 rillig Exp $");
#endif
#include
@@ -872,15 +872,15 @@ struct_or_union_specifier: /* C99 6.7.2.
* yychar is valid because otherwise the parser would not
* have been able to decide if it must shift or reduce
*/
- $$ = mktag($2, $1, false, yychar == T_SEMI);
+ $$ = make_tag_type($2, $1, false, yychar == T_SEMI);
}
| struct_or_union identifier_sym {
- dcs->d_tagtyp = mktag($2, $1, true, false);
+ dcs->d_tagtyp = make_tag_type($2, $1, true, false);
} braced_struct_declaration_list {
$$ = complete_tag_struct_or_union(dcs->d_tagtyp, $4);
}
| struct_or_union {
- dcs->d_tagtyp = mktag(NULL, $1, true, false);
+ dcs->d_tagtyp = make_tag_type(NULL, $1, true, false);
} braced_struct_declaration_list {
$$ = complete_tag_struct_or_union(dcs->d_tagtyp, $3);
}
@@ -924,7 +924,7 @@ struct_declaration_list_with_rbrace: /*
struct_declaration_list: /* C99 6.7.2.1 */
struct_declaration
| struct_declaration_list struct_declaration {
- $$ = lnklst($1, $2);
+ $$ = concat_lists($1, $2);
}
;
@@ -980,7 +980,7 @@ notype_struct_declarators:
| notype_struct_declarators {
symtyp = FMEMBER;
} T_COMMA type_struct_declarator {
- $$ = lnklst($1, declarator_1_struct_union($4));
+ $$ = concat_lists($1, declarator_1_struct_union($4));
}
;
@@ -991,46 +991,46 @@ type_struct_declarators:
| type_struct_declarators {
symtyp = FMEMBER;
} T_COMMA type_struct_declarator {
- $$ = lnklst($1, declarator_1_struct_union($4));
+ $$ = concat_lists($1, declarator_1_struct_union($4));
}
;
notype_struct_declarator:
notype_declarator
| notype_declarator T_COLON constant_expr { /* C99 6.7.2.1 */
- $$ = bitfield($1, to_int_constant($3, true));
+ $$ = set_bit_field_width($1, to_int_constant($3, true));
}
| {
symtyp = FVFT;
} T_COLON constant_expr { /* C99 6.7.2.1 */
- $$ = bitfield(NULL, to_int_constant($3, true));
+ $$ = set_bit_field_width(NULL, to_int_constant($3, true));
}
;
type_struct_declarator:
type_declarator
| type_declarator T_COLON constant_expr {
- $$ = bitfield($1, to_int_constant($3, true));
+ $$ = set_bit_field_width($1, to_int_constant($3, true));
}
| {
symtyp = FVFT;
} T_COLON constant_expr {
- $$ = bitfield(NULL, to_int_constant($3, true));
+ $$ = set_bit_field_width(NULL, to_int_constant($3, true));
}
;
/* K&R ---, C90 6.5.2.2, C99 6.7.2.2, C11 6.7.2.2 */
enum_specifier: /* C99 6.7.2.2 */
enum gcc_attribute_specifier_list_opt identifier_sym {
- $$ = mktag($3, ENUM, false, false);
+ $$ = make_tag_type($3, ENUM, false, false);
}
| enum gcc_attribute_specifier_list_opt identifier_sym {
- dcs->d_tagtyp = mktag($3, ENUM, true, false);
+ dcs->d_tagtyp = make_tag_type($3, ENUM, true, false);
} enum_declaration /*gcc_attribute_specifier_list_opt*/ {
$$ = complete_tag_enum(dcs->d_tagtyp, $5);
}
| enum gcc_attribute_specifier_list_opt {
- dcs->d_tagtyp = mktag(NULL, ENUM, true, false);
+ dcs->d_tagtyp = make_tag_type(NULL, ENUM, true, false);
} enum_declaration /*gcc_attribute_specifier_list_opt*/ {
$$ = complete_tag_enum(dcs->d_tagtyp, $4);
}
@@ -1077,7 +1077,7 @@ enums_with_opt_comma: /* helper for C99
enumerator_list: /* C99 6.7.2.2 */
enumerator
| enumerator_list T_COMMA enumerator {
- $$ = lnklst($1, $3);
+ $$ = concat_lists($1, $3);
}
| error {
$$ = NULL;
@@ -1341,7 +1341,7 @@ identifier_list: /* C99 6.7.5 */
$$ = old_style_function_name(getsym($1));
CVS commit: src/usr.bin/xlint
Module Name:src Committed By: rillig Date: Sun Aug 28 10:43:19 UTC 2022 Modified Files: src/usr.bin/xlint/lint1: cgram.y decl.c externs1.h tree.c src/usr.bin/xlint/lint2: chk.c Log Message: lint: rename functions to be clearer No need anymore to keep external identifiers at the "6 significant initial characters" mandated by C90. To generate a diff of this commit: cvs rdiff -u -r1.422 -r1.423 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.296 -r1.297 src/usr.bin/xlint/lint1/decl.c cvs rdiff -u -r1.166 -r1.167 src/usr.bin/xlint/lint1/externs1.h cvs rdiff -u -r1.477 -r1.478 src/usr.bin/xlint/lint1/tree.c cvs rdiff -u -r1.49 -r1.50 src/usr.bin/xlint/lint2/chk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: mlelstv
Date: Sun Aug 28 10:26:37 UTC 2022
Modified Files:
src/sys/dev/scsipi: sd.c sdvar.h
Log Message:
Don't fetch data beyond end of inquiry buffer, which, here, is not
NUL-terminated.
Reduce target buffer to needed size (product name + NUL terminator).
To generate a diff of this commit:
cvs rdiff -u -r1.334 -r1.335 src/sys/dev/scsipi/sd.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/scsipi/sdvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.334 src/sys/dev/scsipi/sd.c:1.335
--- src/sys/dev/scsipi/sd.c:1.334 Mon Mar 28 12:39:46 2022
+++ src/sys/dev/scsipi/sd.c Sun Aug 28 10:26:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.334 2022/03/28 12:39:46 riastradh Exp $ */
+/* $NetBSD: sd.c,v 1.335 2022/08/28 10:26:37 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.334 2022/03/28 12:39:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.335 2022/08/28 10:26:37 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_scsi.h"
@@ -258,9 +258,8 @@ sdattach(device_t parent, device_t self,
SC_DEBUG(periph, SCSIPI_DB2, ("sdattach: "));
sd->type = (sa->sa_inqbuf.type & SID_TYPE);
- strncpy(sd->name, sa->sa_inqbuf.product, sizeof(sd->name));
-
- strncpy(sd->typename, sa->sa_inqbuf.product, sizeof(sd->typename));
+ memcpy(sd->name, sa->sa_inqbuf.product, uimin(16, sizeof(sd->name)));
+ memcpy(sd->typename, sa->sa_inqbuf.product, uimin(16, sizeof(sd->typename)));
if (sd->type == T_SIMPLE_DIRECT)
periph->periph_quirks |= PQUIRK_ONLYBIG | PQUIRK_NOBIGMODESENSE;
Index: src/sys/dev/scsipi/sdvar.h
diff -u src/sys/dev/scsipi/sdvar.h:1.39 src/sys/dev/scsipi/sdvar.h:1.40
--- src/sys/dev/scsipi/sdvar.h:1.39 Tue Mar 19 06:59:40 2019
+++ src/sys/dev/scsipi/sdvar.h Sun Aug 28 10:26:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sdvar.h,v 1.39 2019/03/19 06:59:40 mlelstv Exp $ */
+/* $NetBSD: sdvar.h,v 1.40 2022/08/28 10:26:37 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@ struct sd_softc {
callout_t sc_callout;
u_int8_t type;
char name[16]; /* product name, for default disklabel */
- char typename[128+4+1]; /* stored in disk info */
+ char typename[16+1]; /* stored in disk info */
};
#define SDGP_RESULT_OK 0 /* parameters obtained */
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: mlelstv Date: Sun Aug 28 10:26:37 UTC 2022 Modified Files: src/sys/dev/scsipi: sd.c sdvar.h Log Message: Don't fetch data beyond end of inquiry buffer, which, here, is not NUL-terminated. Reduce target buffer to needed size (product name + NUL terminator). To generate a diff of this commit: cvs rdiff -u -r1.334 -r1.335 src/sys/dev/scsipi/sd.c cvs rdiff -u -r1.39 -r1.40 src/sys/dev/scsipi/sdvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/fsck_msdos
Module Name:src Committed By: mlelstv Date: Sun Aug 28 10:20:25 UTC 2022 Modified Files: src/sbin/fsck_msdos: boot.c check.c Log Message: Fix writing of corrected fsinfo. Continue when fsinfo has been rewritten. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sbin/fsck_msdos/boot.c cvs rdiff -u -r1.19 -r1.20 src/sbin/fsck_msdos/check.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/fsck_msdos
Module Name:src
Committed By: mlelstv
Date: Sun Aug 28 10:20:25 UTC 2022
Modified Files:
src/sbin/fsck_msdos: boot.c check.c
Log Message:
Fix writing of corrected fsinfo.
Continue when fsinfo has been rewritten.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sbin/fsck_msdos/boot.c
cvs rdiff -u -r1.19 -r1.20 src/sbin/fsck_msdos/check.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_msdos/boot.c
diff -u src/sbin/fsck_msdos/boot.c:1.25 src/sbin/fsck_msdos/boot.c:1.26
--- src/sbin/fsck_msdos/boot.c:1.25 Sun Apr 24 10:35:15 2022
+++ src/sbin/fsck_msdos/boot.c Sun Aug 28 10:20:25 2022
@@ -27,7 +27,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: boot.c,v 1.25 2022/04/24 10:35:15 hannken Exp $");
+__RCSID("$NetBSD: boot.c,v 1.26 2022/08/28 10:20:25 mlelstv Exp $");
#endif /* not lint */
#include
@@ -147,7 +147,7 @@ readboot(int dosfs, struct bootblock *bo
|| fsinfo[0x3fd]
|| fsinfo[0x3fe] != 0x55
|| fsinfo[0x3ff] != 0xaa) {
- pwarn("Invalid signature in fsinfo block");
+ pwarn("Invalid signature in fsinfo block\n");
if (ask(0, "fix")) {
memcpy(fsinfo, "RRaA", 4);
memcpy(fsinfo + 0x1e4, "rrAa", 4);
@@ -159,8 +159,8 @@ readboot(int dosfs, struct bootblock *bo
fsinfo[0x3ff] = 0xaa;
if (lseek(dosfs, boot->FSInfo * boot->BytesPerSec, SEEK_SET)
!= boot->FSInfo * boot->BytesPerSec
-|| write(dosfs, fsinfo, sizeof fsinfo)
-!= sizeof fsinfo) {
+|| write(dosfs, fsinfo, 2 * secsize)
+!= 2 * secsize) {
perr("Unable to write FSInfo");
free(fsinfo);
free(backup);
Index: src/sbin/fsck_msdos/check.c
diff -u src/sbin/fsck_msdos/check.c:1.19 src/sbin/fsck_msdos/check.c:1.20
--- src/sbin/fsck_msdos/check.c:1.19 Thu Jul 10 21:06:20 2014
+++ src/sbin/fsck_msdos/check.c Sun Aug 28 10:20:25 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: check.c,v 1.19 2014/07/10 21:06:20 christos Exp $ */
+/* $NetBSD: check.c,v 1.20 2022/08/28 10:20:25 mlelstv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
@@ -28,7 +28,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: check.c,v 1.19 2014/07/10 21:06:20 christos Exp $");
+__RCSID("$NetBSD: check.c,v 1.20 2022/08/28 10:20:25 mlelstv Exp $");
#endif /* not lint */
#include
@@ -72,7 +72,8 @@ checkfilesys(const char *filename)
return FSCK_EXIT_CHECK_FAILED;
}
- if (readboot(dosfs, &boot) != FSOK) {
+ mod = readboot(dosfs, &boot);
+ if (mod & FSFATAL) {
close(dosfs);
printf("\n");
return FSCK_EXIT_CHECK_FAILED;
CVS commit: src/sys/dev
Module Name:src Committed By: riastradh Date: Sun Aug 28 09:52:43 UTC 2022 Modified Files: src/sys/dev: cons.h Log Message: cons(9): Need sys/types.h for dev_t, u_int. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/cons.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src
Committed By: riastradh
Date: Sun Aug 28 09:52:43 UTC 2022
Modified Files:
src/sys/dev: cons.h
Log Message:
cons(9): Need sys/types.h for dev_t, u_int.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/cons.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/cons.h
diff -u src/sys/dev/cons.h:1.27 src/sys/dev/cons.h:1.28
--- src/sys/dev/cons.h:1.27 Tue Feb 8 20:20:26 2011
+++ src/sys/dev/cons.h Sun Aug 28 09:52:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.h,v 1.27 2011/02/08 20:20:26 rmind Exp $ */
+/* $NetBSD: cons.h,v 1.28 2022/08/28 09:52:43 riastradh Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -41,6 +41,8 @@
#ifndef _SYS_DEV_CONS_H_
#define _SYS_DEV_CONS_H_
+#include
+
struct consdev {
void (*cn_probe) /* probe hardware and fill in consdev info */
(struct consdev *);
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: skrll
Date: Sun Aug 28 09:48:12 UTC 2022
Modified Files:
src/sys/dev/scsipi: if_se.c
Log Message:
se(4): don't set if_watchdog as it's not used.
if_timer is never set in this driver and so if_watchdog will never be
called.
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/dev/scsipi/if_se.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/scsipi/if_se.c
diff -u src/sys/dev/scsipi/if_se.c:1.116 src/sys/dev/scsipi/if_se.c:1.117
--- src/sys/dev/scsipi/if_se.c:1.116 Thu Jul 7 06:11:28 2022
+++ src/sys/dev/scsipi/if_se.c Sun Aug 28 09:48:12 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_se.c,v 1.116 2022/07/07 06:11:28 skrll Exp $ */
+/* $NetBSD: if_se.c,v 1.117 2022/08/28 09:48:12 skrll Exp $ */
/*
* Copyright (c) 1997 Ian W. Dall
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.116 2022/07/07 06:11:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.117 2022/08/28 09:48:12 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -359,7 +359,7 @@ seattach(device_t parent, device_t self,
ifp->if_softc = sc;
ifp->if_start = se_ifstart;
ifp->if_ioctl = se_ioctl;
- ifp->if_watchdog = sewatchdog;
+ ifp->if_watchdog = NULL;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_extflags = IFEF_MPSAFE;
IFQ_SET_READY(&ifp->if_snd);
@@ -767,7 +767,7 @@ se_read(struct se_softc *sc, char *data,
return (n);
}
-
+#if 0
static void
sewatchdog(struct ifnet *ifp)
{
@@ -778,6 +778,7 @@ sewatchdog(struct ifnet *ifp)
se_reset(sc);
}
+#endif
static void
se_reset(struct se_softc *sc)
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: skrll Date: Sun Aug 28 09:48:12 UTC 2022 Modified Files: src/sys/dev/scsipi: if_se.c Log Message: se(4): don't set if_watchdog as it's not used. if_timer is never set in this driver and so if_watchdog will never be called. To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/dev/scsipi/if_se.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: rillig Date: Sun Aug 28 08:41:06 UTC 2022 Modified Files: src/tests/usr.bin/xlint/lint1: decl.c queries.c src/usr.bin/xlint/lint1: cgram.y decl.c externs1.h lint1.h Log Message: lint: rename dcs manipulation functions to be clearer No functional change. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/tests/usr.bin/xlint/lint1/decl.c cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/queries.c cvs rdiff -u -r1.421 -r1.422 src/usr.bin/xlint/lint1/cgram.y cvs rdiff -u -r1.295 -r1.296 src/usr.bin/xlint/lint1/decl.c cvs rdiff -u -r1.165 -r1.166 src/usr.bin/xlint/lint1/externs1.h cvs rdiff -u -r1.156 -r1.157 src/usr.bin/xlint/lint1/lint1.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sun Aug 28 08:41:06 UTC 2022
Modified Files:
src/tests/usr.bin/xlint/lint1: decl.c queries.c
src/usr.bin/xlint/lint1: cgram.y decl.c externs1.h lint1.h
Log Message:
lint: rename dcs manipulation functions to be clearer
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/tests/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/queries.c
cvs rdiff -u -r1.421 -r1.422 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.295 -r1.296 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.165 -r1.166 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.156 -r1.157 src/usr.bin/xlint/lint1/lint1.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/decl.c
diff -u src/tests/usr.bin/xlint/lint1/decl.c:1.18 src/tests/usr.bin/xlint/lint1/decl.c:1.19
--- src/tests/usr.bin/xlint/lint1/decl.c:1.18 Wed Jun 22 19:23:18 2022
+++ src/tests/usr.bin/xlint/lint1/decl.c Sun Aug 28 08:41:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.18 2022/06/22 19:23:18 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.19 2022/08/28 08:41:06 rillig Exp $ */
# 3 "decl.c"
/*
@@ -144,7 +144,7 @@ struct {
/*
* Before decl.c 1.201 from 2021-07-15, lint crashed with an internal error
- * in end_type.
+ * in dcs_end_type (named end_type back then).
*/
unsigned long sizes =
sizeof(const typeof(bool)) +
Index: src/tests/usr.bin/xlint/lint1/queries.c
diff -u src/tests/usr.bin/xlint/lint1/queries.c:1.3 src/tests/usr.bin/xlint/lint1/queries.c:1.4
--- src/tests/usr.bin/xlint/lint1/queries.c:1.3 Fri Jul 8 21:19:07 2022
+++ src/tests/usr.bin/xlint/lint1/queries.c Sun Aug 28 08:41:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: queries.c,v 1.3 2022/07/08 21:19:07 rillig Exp $ */
+/* $NetBSD: queries.c,v 1.4 2022/08/28 08:41:06 rillig Exp $ */
# 3 "queries.c"
/*
@@ -173,7 +173,7 @@ Q7(void)
/*
* Neither GCC nor Clang accept typeof(bit-field), as that would add
* unnecessary complexity. Lint accepts it but silently discards the
- * bit-field portion from the type; see add_type.
+ * bit-field portion from the type; see dcs_add_type.
*/
/* expect+1: redundant cast from 'unsigned char' to 'unsigned int' before assignment [Q7] */
bits.u9 = (typeof(bits.u9))u8;
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.421 src/usr.bin/xlint/lint1/cgram.y:1.422
--- src/usr.bin/xlint/lint1/cgram.y:1.421 Thu Aug 25 19:03:47 2022
+++ src/usr.bin/xlint/lint1/cgram.y Sun Aug 28 08:41:06 2022
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.421 2022/08/25 19:03:47 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.422 2022/08/28 08:41:06 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: cgram.y,v 1.421 2022/08/25 19:03:47 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.422 2022/08/28 08:41:06 rillig Exp $");
#endif
#include
@@ -730,24 +730,24 @@ declaration: /* C99 6.7 */
begin_type_declaration_specifiers: /* see C99 6.7 */
begin_type_typespec {
- add_type($1);
+ dcs_add_type($1);
}
| begin_type_declmods type_specifier {
- add_type($2);
+ dcs_add_type($2);
}
| type_attribute begin_type_declaration_specifiers
| begin_type_declaration_specifiers declmod
| begin_type_declaration_specifiers notype_type_specifier {
- add_type($2);
+ dcs_add_type($2);
}
;
begin_type_declmods: /* see C99 6.7 */
begin_type T_QUAL {
- add_qualifier($2);
+ dcs_add_qualifier($2);
}
| begin_type T_SCLASS {
- add_storage_class($2);
+ dcs_add_storage_class($2);
}
| begin_type_declmods declmod
;
@@ -759,16 +759,16 @@ begin_type_specifier_qualifier_list: /*
begin_type_specifier_qualifier_list_postfix:
begin_type_typespec {
- add_type($1);
+ dcs_add_type($1);
}
| begin_type_qualifier_list type_specifier {
- add_type($2);
+ dcs_add_type($2);
}
| begin_type_specifier_qualifier_list_postfix T_QUAL {
- add_qualifier($2);
+ dcs_add_qualifier($2);
}
| begin_type_specifier_qualifier_list_postfix notype_type_specifier {
- add_type($2);
+ dcs_add_type($2);
}
| begin_type_specifier_qualifier_list_postfix type_attribute
;
@@ -784,19 +784,19 @@ begin_type_typespec:
begin_type_qualifier_list:
begin_type T_QUAL {
- add_qualifier($2);
+ dcs_add_qualifier($2);
}
| begin_type_qualifier_list T_QUAL {
- add_qualifier($2);
+ dcs_add_qualifier($2);
}
;
declmod:
T_QUAL {
- add_qualifier($1);
+ dcs_add_qualifier($1);
}
| T_SCLASS {
- add_storage_class($1);
+ dcs_add_storage_class($1);
}
| type_attribute_list
;
@@ -821,20 +821,20 @@ type_attribute: /* See C11 6.7 declara
| T_ALIGNAS T_LPAREN type_specifier T_RPAREN /* C11 6.7.5 */
| T_ALIGNAS T_LPAREN constant_expr T_RPAREN /* C11 6.
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: skrll
Date: Sun Aug 28 08:40:56 UTC 2022
Modified Files:
src/sys/dev/ic: dwc_eqos.c
Log Message:
Sprinkle const
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/dwc_eqos.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dwc_eqos.c
diff -u src/sys/dev/ic/dwc_eqos.c:1.14 src/sys/dev/ic/dwc_eqos.c:1.15
--- src/sys/dev/ic/dwc_eqos.c:1.14 Thu Aug 25 01:58:48 2022
+++ src/sys/dev/ic/dwc_eqos.c Sun Aug 28 08:40:56 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos.c,v 1.14 2022/08/25 01:58:48 ryo Exp $ */
+/* $NetBSD: dwc_eqos.c,v 1.15 2022/08/28 08:40:56 skrll Exp $ */
/*-
* Copyright (c) 2022 Jared McNeill
@@ -33,7 +33,7 @@
#include "opt_net_mpsafe.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.14 2022/08/25 01:58:48 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.15 2022/08/28 08:40:56 skrll Exp $");
#include
#include
@@ -121,7 +121,7 @@ unsigned int eqos_debug;
static int
eqos_mii_readreg(device_t dev, int phy, int reg, uint16_t *val)
{
- struct eqos_softc *sc = device_private(dev);
+ struct eqos_softc * const sc = device_private(dev);
uint32_t addr;
int retry;
@@ -154,7 +154,7 @@ eqos_mii_readreg(device_t dev, int phy,
static int
eqos_mii_writereg(device_t dev, int phy, int reg, uint16_t val)
{
- struct eqos_softc *sc = device_private(dev);
+ struct eqos_softc * const sc = device_private(dev);
uint32_t addr;
int retry;
@@ -188,7 +188,7 @@ eqos_mii_writereg(device_t dev, int phy,
static void
eqos_update_link(struct eqos_softc *sc)
{
- struct mii_data *mii = &sc->sc_mii;
+ struct mii_data * const mii = &sc->sc_mii;
uint64_t baudrate;
uint32_t conf;
@@ -418,8 +418,8 @@ eqos_disable_intr(struct eqos_softc *sc)
static void
eqos_tick(void *softc)
{
- struct eqos_softc *sc = softc;
- struct mii_data *mii = &sc->sc_mii;
+ struct eqos_softc * const sc = softc;
+ struct mii_data * const mii = &sc->sc_mii;
#ifndef EQOS_MPSAFE
int s = splnet();
#endif
@@ -559,8 +559,8 @@ eqos_init_rings(struct eqos_softc *sc, i
static int
eqos_init_locked(struct eqos_softc *sc)
{
- struct ifnet *ifp = &sc->sc_ec.ec_if;
- struct mii_data *mii = &sc->sc_mii;
+ struct ifnet * const ifp = &sc->sc_ec.ec_if;
+ struct mii_data * const mii = &sc->sc_mii;
uint32_t val, tqs, rqs;
EQOS_ASSERT_LOCKED(sc);
@@ -664,7 +664,7 @@ eqos_init_locked(struct eqos_softc *sc)
static int
eqos_init(struct ifnet *ifp)
{
- struct eqos_softc *sc = ifp->if_softc;
+ struct eqos_softc * const sc = ifp->if_softc;
int error;
EQOS_LOCK(sc);
@@ -679,7 +679,7 @@ eqos_init(struct ifnet *ifp)
static void
eqos_stop_locked(struct eqos_softc *sc, int disable)
{
- struct ifnet *ifp = &sc->sc_ec.ec_if;
+ struct ifnet * const ifp = &sc->sc_ec.ec_if;
uint32_t val;
int retry;
@@ -747,7 +747,7 @@ eqos_stop(struct ifnet *ifp, int disable
static void
eqos_rxintr(struct eqos_softc *sc, int qid)
{
- struct ifnet *ifp = &sc->sc_ec.ec_if;
+ struct ifnet * const ifp = &sc->sc_ec.ec_if;
int error, index, pkts = 0;
struct mbuf *m, *m0, *new_m, *mprev;
uint32_t tdes3;
@@ -887,7 +887,7 @@ eqos_rxintr(struct eqos_softc *sc, int q
static void
eqos_txintr(struct eqos_softc *sc, int qid)
{
- struct ifnet *ifp = &sc->sc_ec.ec_if;
+ struct ifnet * const ifp = &sc->sc_ec.ec_if;
struct eqos_bufmap *bmap;
struct eqos_dma_desc *desc;
uint32_t tdes3;
@@ -955,7 +955,7 @@ eqos_txintr(struct eqos_softc *sc, int q
static void
eqos_start_locked(struct eqos_softc *sc)
{
- struct ifnet *ifp = &sc->sc_ec.ec_if;
+ struct ifnet * const ifp = &sc->sc_ec.ec_if;
struct mbuf *m;
int cnt, nsegs, start;
@@ -1022,7 +1022,7 @@ eqos_start_locked(struct eqos_softc *sc)
static void
eqos_start(struct ifnet *ifp)
{
- struct eqos_softc *sc = ifp->if_softc;
+ struct eqos_softc * const sc = ifp->if_softc;
EQOS_TXLOCK(sc);
eqos_start_locked(sc);
@@ -1073,8 +1073,8 @@ eqos_intr_mtl(struct eqos_softc *sc, uin
int
eqos_intr(void *arg)
{
- struct eqos_softc *sc = arg;
- struct ifnet *ifp = &sc->sc_ec.ec_if;
+ struct eqos_softc * const sc = arg;
+ struct ifnet * const ifp = &sc->sc_ec.ec_if;
uint32_t mac_status, mtl_status, dma_status, rx_tx_status;
sc->sc_ev_intr.ev_count++;
@@ -1142,8 +1142,8 @@ eqos_intr(void *arg)
static int
eqos_ioctl(struct ifnet *ifp, u_long cmd, void *data)
{
- struct eqos_softc *sc = ifp->if_softc;
- struct ifreq *ifr = (struct ifreq *)data;
+ struct eqos_softc * const sc = ifp->if_softc;
+ struct ifreq * const ifr = (struct ifreq *)data;
int error, s;
#ifndef EQOS_MPSAFE
@@ -1365,8 +1365,8 @@ eqos_setup_dma(struct eqos_softc *sc, in
int
eqos_attach(struct eqos_softc *sc)
{
- struct mii_data *mii = &sc->sc_mii;
- struct ifnet *ifp = &sc->sc_ec.ec_if;
+ struct mii_data * const mii = &sc->sc_mii;
+ struct ifnet * const ifp = &sc->sc_ec.ec_if;
uint8_t eaddr[ETHER_ADDR_LEN];
u_int u
CVS commit: src/sys/dev/ic
Module Name:src Committed By: skrll Date: Sun Aug 28 08:40:56 UTC 2022 Modified Files: src/sys/dev/ic: dwc_eqos.c Log Message: Sprinkle const To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/dwc_eqos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: skrll
Date: Sun Aug 28 07:54:03 UTC 2022
Modified Files:
src/sys/dev/pci: if_ixl.c if_mcx.c
Log Message:
Empty if_watchdog functions are useless and now waste resources. Let's
remove them.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/pci/if_ixl.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/if_mcx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_ixl.c
diff -u src/sys/dev/pci/if_ixl.c:1.86 src/sys/dev/pci/if_ixl.c:1.87
--- src/sys/dev/pci/if_ixl.c:1.86 Thu Aug 25 09:15:14 2022
+++ src/sys/dev/pci/if_ixl.c Sun Aug 28 07:54:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ixl.c,v 1.86 2022/08/25 09:15:14 knakahara Exp $ */
+/* $NetBSD: if_ixl.c,v 1.87 2022/08/28 07:54:03 skrll Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -74,7 +74,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.86 2022/08/25 09:15:14 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.87 2022/08/28 07:54:03 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -785,7 +785,6 @@ static int ixl_detach(device_t, int);
static void ixl_media_add(struct ixl_softc *);
static int ixl_media_change(struct ifnet *);
static void ixl_media_status(struct ifnet *, struct ifmediareq *);
-static void ixl_watchdog(struct ifnet *);
static int ixl_ioctl(struct ifnet *, u_long, void *);
static void ixl_start(struct ifnet *);
static int ixl_transmit(struct ifnet *, struct mbuf *);
@@ -1300,7 +1299,6 @@ ixl_attach(device_t parent, device_t sel
ifp->if_ioctl = ixl_ioctl;
ifp->if_start = ixl_start;
ifp->if_transmit = ixl_transmit;
- ifp->if_watchdog = ixl_watchdog;
ifp->if_init = ixl_init;
ifp->if_stop = ixl_stop;
IFQ_SET_MAXLEN(&ifp->if_snd, sc->sc_tx_ring_ndescs);
@@ -1675,11 +1673,6 @@ ixl_media_change(struct ifnet *ifp)
return ixl_set_phy_config(sc, link_speed, abilities, false);
}
-static void
-ixl_watchdog(struct ifnet *ifp)
-{
-
-}
static void
ixl_del_all_multiaddr(struct ixl_softc *sc)
Index: src/sys/dev/pci/if_mcx.c
diff -u src/sys/dev/pci/if_mcx.c:1.24 src/sys/dev/pci/if_mcx.c:1.25
--- src/sys/dev/pci/if_mcx.c:1.24 Thu Jul 7 06:11:19 2022
+++ src/sys/dev/pci/if_mcx.c Sun Aug 28 07:54:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mcx.c,v 1.24 2022/07/07 06:11:19 skrll Exp $ */
+/* $NetBSD: if_mcx.c,v 1.25 2022/08/28 07:54:03 skrll Exp $ */
/* $OpenBSD: if_mcx.c,v 1.101 2021/06/02 19:16:11 patrick Exp $ */
/*
@@ -23,7 +23,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: if_mcx.c,v 1.24 2022/07/07 06:11:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mcx.c,v 1.25 2022/08/28 07:54:03 skrll Exp $");
#include
#include
@@ -2634,7 +2634,6 @@ static int mcx_ioctl(struct ifnet *, u_l
static void mcx_start(struct ifnet *);
static int mcx_transmit(struct ifnet *, struct mbuf *);
static void mcx_deferred_transmit(void *);
-static void mcx_watchdog(struct ifnet *);
static void mcx_media_add_types(struct mcx_softc *);
static void mcx_media_status(struct ifnet *, struct ifmediareq *);
static int mcx_media_change(struct ifnet *);
@@ -2975,7 +2974,6 @@ mcx_attach(device_t parent, device_t sel
if (sc->sc_nqueues > 1) {
ifp->if_transmit = mcx_transmit;
}
- ifp->if_watchdog = mcx_watchdog;
ifp->if_mtu = sc->sc_hardmtu;
ifp->if_capabilities = IFCAP_CSUM_IPv4_Rx | IFCAP_CSUM_IPv4_Tx |
IFCAP_CSUM_UDPv4_Rx | IFCAP_CSUM_UDPv4_Tx |
@@ -8005,10 +8003,6 @@ mcx_deferred_transmit(void *arg)
mutex_exit(&tx->tx_lock);
}
-static void
-mcx_watchdog(struct ifnet *ifp)
-{
-}
static void
mcx_media_add_types(struct mcx_softc *sc)
CVS commit: src/sys/dev/pci
Module Name:src Committed By: skrll Date: Sun Aug 28 07:54:03 UTC 2022 Modified Files: src/sys/dev/pci: if_ixl.c if_mcx.c Log Message: Empty if_watchdog functions are useless and now waste resources. Let's remove them. To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 src/sys/dev/pci/if_ixl.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/if_mcx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: skrll
Date: Sun Aug 28 07:44:23 UTC 2022
Modified Files:
src/sys/dev/pci: if_rgereg.h
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/if_rgereg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_rgereg.h
diff -u src/sys/dev/pci/if_rgereg.h:1.5 src/sys/dev/pci/if_rgereg.h:1.6
--- src/sys/dev/pci/if_rgereg.h:1.5 Mon Mar 1 17:48:52 2021
+++ src/sys/dev/pci/if_rgereg.h Sun Aug 28 07:44:23 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rgereg.h,v 1.5 2021/03/01 17:48:52 jakllsch Exp $ */
+/* $NetBSD: if_rgereg.h,v 1.6 2022/08/28 07:44:23 skrll Exp $ */
/* $OpenBSD: if_rgereg.h,v 1.6 2020/12/24 01:00:00 kevlo Exp $ */
/*
@@ -80,7 +80,7 @@
#define RGE_ISR_TX_OK 0x0004
#define RGE_ISR_TX_ERR 0x0008
#define RGE_ISR_RX_DESC_UNAVAIL 0x0010
-#define RGE_ISR_LINKCHG 0x0020
+#define RGE_ISR_LINKCHG 0x0020
#define RGE_ISR_RX_FIFO_OFLOW 0x0040
#define RGE_ISR_TX_DESC_UNAVAIL 0x0080
#define RGE_ISR_SWI 0x0100
@@ -387,112 +387,112 @@ static const struct {
uint16_t reg;
uint16_t val;
} rtl8125_mac_bps[] = {
- { 0xf800, 0xe008 }, { 0xf802, 0xe01e }, { 0xf804, 0xe02e },
- { 0xf806, 0xe054 }, { 0xf808, 0xe057 }, { 0xf80a, 0xe059 },
- { 0xf80c, 0xe0c2 }, { 0xf80e, 0xe0cb }, { 0xf810, 0x9996 },
- { 0xf812, 0x49d1 }, { 0xf814, 0xf005 }, { 0xf816, 0x49d4 },
- { 0xf818, 0xf10a }, { 0xf81a, 0x49d8 }, { 0xf81c, 0xf108 },
- { 0xf81e, 0xc00f }, { 0xf820, 0x7100 }, { 0xf822, 0x209c },
- { 0xf824, 0x249c }, { 0xf826, 0xc009 }, { 0xf828, 0x9900 },
- { 0xf82a, 0xe004 }, { 0xf82c, 0xc006 }, { 0xf82e, 0x1900 },
- { 0xf830, 0x9900 }, { 0xf832, 0xc602 }, { 0xf834, 0xbe00 },
- { 0xf836, 0x5a48 }, { 0xf838, 0xe0c2 }, { 0xf83a, 0x0004 },
- { 0xf83c, 0xe10a }, { 0xf83e, 0xc60f }, { 0xf840, 0x73c4 },
- { 0xf842, 0x49b3 }, { 0xf844, 0xf106 }, { 0xf846, 0x73c2 },
- { 0xf848, 0xc608 }, { 0xf84a, 0xb406 }, { 0xf84c, 0xc609 },
- { 0xf84e, 0xff80 }, { 0xf850, 0xc605 }, { 0xf852, 0xb406 },
- { 0xf854, 0xc605 }, { 0xf856, 0xff80 }, { 0xf858, 0x0544 },
- { 0xf85a, 0x0568 }, { 0xf85c, 0xe906 }, { 0xf85e, 0xcde8 },
- { 0xf860, 0xc724 }, { 0xf862, 0xc624 }, { 0xf864, 0x9ee2 },
- { 0xf866, 0x1e01 }, { 0xf868, 0x9ee0 }, { 0xf86a, 0x76e0 },
- { 0xf86c, 0x49e0 }, { 0xf86e, 0xf1fe }, { 0xf870, 0x76e6 },
- { 0xf872, 0x486d }, { 0xf874, 0x4868 }, { 0xf876, 0x9ee4 },
- { 0xf878, 0x1e03 }, { 0xf87a, 0x9ee0 }, { 0xf87c, 0x76e0 },
- { 0xf87e, 0x49e0 }, { 0xf880, 0xf1fe }, { 0xf882, 0xc615 },
- { 0xf884, 0x9ee2 }, { 0xf886, 0x1e01 }, { 0xf888, 0x9ee0 },
- { 0xf88a, 0x76e0 }, { 0xf88c, 0x49e0 }, { 0xf88e, 0xf1fe },
- { 0xf890, 0x76e6 }, { 0xf892, 0x486f }, { 0xf894, 0x9ee4 },
- { 0xf896, 0x1e03 }, { 0xf898, 0x9ee0 }, { 0xf89a, 0x76e0 },
- { 0xf89c, 0x49e0 }, { 0xf89e, 0xf1fe }, { 0xf8a0, 0x7196 },
- { 0xf8a2, 0xc702 }, { 0xf8a4, 0xbf00 }, { 0xf8a6, 0x5a44 },
- { 0xf8a8, 0xeb0e }, { 0xf8aa, 0x0070 }, { 0xf8ac, 0x00c3 },
- { 0xf8ae, 0x1bc0 }, { 0xf8b0, 0xc602 }, { 0xf8b2, 0xbe00 },
- { 0xf8b4, 0x0e26 }, { 0xf8b6, 0xc602 }, { 0xf8b8, 0xbe00 },
- { 0xf8ba, 0x0eba }, { 0xf8bc, 0x1501 }, { 0xf8be, 0xf02a },
- { 0xf8c0, 0x1500 }, { 0xf8c2, 0xf15d }, { 0xf8c4, 0xc661 },
- { 0xf8c6, 0x75c8 }, { 0xf8c8, 0x49d5 }, { 0xf8ca, 0xf00a },
- { 0xf8cc, 0x49d6 }, { 0xf8ce, 0xf008 }, { 0xf8d0, 0x49d7 },
- { 0xf8d2, 0xf006 }, { 0xf8d4, 0x49d8 }, { 0xf8d6, 0xf004 },
- { 0xf8d8, 0x75d2 }, { 0xf8da, 0x49d9 }, { 0xf8dc, 0xf150 },
- { 0xf8de, 0xc553 }, { 0xf8e0, 0x77a0 }, { 0xf8e2, 0x75c8 },
- { 0xf8e4, 0x4855 }, { 0xf8e6, 0x4856 }, { 0xf8e8, 0x4857 },
- { 0xf8ea, 0x4858 }, { 0xf8ec, 0x48da }, { 0xf8ee, 0x48db },
- { 0xf8f0, 0x49fe }, { 0xf8f2, 0xf002 }, { 0xf8f4, 0x485a },
- { 0xf8f6, 0x49ff }, { 0xf8f8, 0xf002 }, { 0xf8fa, 0x485b },
- { 0xf8fc, 0x9dc8 }, { 0xf8fe, 0x75d2 }, { 0xf900, 0x4859 },
- { 0xf902, 0x9dd2 }, { 0xf904, 0xc643 }, { 0xf906, 0x75c0 },
- { 0xf908, 0x49d4 }, { 0xf90a, 0xf033 }, { 0xf90c, 0x49d0 },
- { 0xf90e, 0xf137 }, { 0xf910, 0xe030 }, { 0xf912, 0xc63a },
- { 0xf914, 0x75c8 }, { 0xf916, 0x49d5 }, { 0xf918, 0xf00e },
- { 0xf91a, 0x49d6 }, { 0xf91c, 0xf00c }, { 0xf91e, 0x49d7 },
- { 0xf920, 0xf00a }, { 0xf922, 0x49d8 }, { 0xf924, 0xf008 },
- { 0xf926, 0x75d2 }, { 0xf928, 0x49d9 }, { 0xf92a, 0xf005 },
- { 0xf92c, 0xc62e }, { 0xf92e, 0x75c0 }, { 0xf930, 0x49d7 },
- { 0xf932, 0xf125 }, { 0xf934, 0xc528 }, { 0xf936, 0x77a0 },
- { 0xf938, 0xc627 }, { 0xf93a, 0x75c8 }, { 0xf93c, 0x4855 },
- { 0xf93e, 0x4856 }, { 0xf940, 0x4857 }, { 0xf942, 0x4858 },
- { 0xf944, 0x48da }, { 0xf946, 0x48db }, { 0xf948, 0x49fe },
- { 0xf94a, 0xf002 }, { 0xf94c, 0x485a }, { 0xf94e, 0x49ff },
- { 0xf950, 0xf002 }, { 0xf952, 0x485b }, { 0xf954, 0x9dc8 },
- { 0xf956, 0x75d2 }, { 0xf958, 0x4859 }, { 0xf95a, 0x9dd2 },
- { 0xf95c, 0xc616 }, { 0xf95e, 0x75c0 }, { 0xf960, 0x4857 },
- { 0xf9
CVS commit: src/sys/dev/pci
Module Name:src Committed By: skrll Date: Sun Aug 28 07:44:23 UTC 2022 Modified Files: src/sys/dev/pci: if_rgereg.h Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/if_rgereg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: christos Date: Sun Aug 28 07:30:41 UTC 2022 Modified Files: src/distrib/sets/lists/debug: mi Log Message: fix sets To generate a diff of this commit: cvs rdiff -u -r1.388 -r1.389 src/distrib/sets/lists/debug/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.388 src/distrib/sets/lists/debug/mi:1.389 --- src/distrib/sets/lists/debug/mi:1.388 Sat Aug 27 04:31:58 2022 +++ src/distrib/sets/lists/debug/mi Sun Aug 28 03:30:41 2022 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.388 2022/08/27 08:31:58 christos Exp $ +# $NetBSD: mi,v 1.389 2022/08/28 07:30:41 christos Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -848,6 +848,7 @@ ./usr/libdata/debug/usr/bin/tpm_version.debug comp-tpm-debug tpm,debug ./usr/libdata/debug/usr/bin/tput.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/tr.debug comp-util-debug debug +./usr/libdata/debug/usr/bin/tradcpp.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/troff.debug comp-groff-debug groff,debug ./usr/libdata/debug/usr/bin/tset.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/tsort.debug comp-util-debug debug
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: christos Date: Sun Aug 28 07:30:41 UTC 2022 Modified Files: src/distrib/sets/lists/debug: mi Log Message: fix sets To generate a diff of this commit: cvs rdiff -u -r1.388 -r1.389 src/distrib/sets/lists/debug/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm/src
Module Name:src
Committed By: christos
Date: Sun Aug 28 07:29:05 UTC 2022
Modified Files:
src/lib/libm/src: s_sincos.c
Log Message:
only alias sincos to sincosl when we don't have long doubles
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/s_sincos.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/s_sincos.c
diff -u src/lib/libm/src/s_sincos.c:1.1 src/lib/libm/src/s_sincos.c:1.2
--- src/lib/libm/src/s_sincos.c:1.1 Sat Aug 27 04:31:59 2022
+++ src/lib/libm/src/s_sincos.c Sun Aug 28 03:29:04 2022
@@ -14,7 +14,7 @@
#include
#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_sincos.c,v 1.1 2022/08/27 08:31:59 christos Exp $");
+__RCSID("$NetBSD: s_sincos.c,v 1.2 2022/08/28 07:29:04 christos Exp $");
#endif
#if 0
__FBSDID("$FreeBSD: head/lib/msun/src/s_sincos.c 319047 2017-05-28 06:13:38Z mmel $");
@@ -85,6 +85,6 @@ sincos(double x, double *sn, double *cs)
}
}
-#if (LDBL_MANT_DIG == 53)
+#if !defined(__HAVE_LONG_DOUBLE)
__weak_reference(sincos, sincosl);
#endif
CVS commit: src/lib/libm/src
Module Name:src Committed By: christos Date: Sun Aug 28 07:29:05 UTC 2022 Modified Files: src/lib/libm/src: s_sincos.c Log Message: only alias sincos to sincosl when we don't have long doubles To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/s_sincos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
