Module Name: src
Committed By: mrg
Date: Mon Aug 7 23:28:58 UTC 2023
Modified Files:
src/sys/arch/atari/dev: ncr5380var.h
src/sys/arch/hp300/dev: intiovar.h
src/sys/dist/pf/net: pf_norm.c
src/sys/netinet: dccp_tfrc.c
Log Message:
fix indentation issues.
found by GCC 12.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/atari/dev/ncr5380var.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/dev/intiovar.h
cvs rdiff -u -r1.29 -r1.30 src/sys/dist/pf/net/pf_norm.c
cvs rdiff -u -r1.9 -r1.10 src/sys/netinet/dccp_tfrc.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/atari/dev/ncr5380var.h
diff -u src/sys/arch/atari/dev/ncr5380var.h:1.9 src/sys/arch/atari/dev/ncr5380var.h:1.10
--- src/sys/arch/atari/dev/ncr5380var.h:1.9 Fri Jan 6 10:28:28 2023
+++ src/sys/arch/atari/dev/ncr5380var.h Mon Aug 7 23:28:58 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr5380var.h,v 1.9 2023/01/06 10:28:28 tsutsui Exp $ */
+/* $NetBSD: ncr5380var.h,v 1.10 2023/08/07 23:28:58 mrg Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -63,7 +63,7 @@ static const char *last_hit[DBG_PID];
int i; \
for (i = 0; i < DBG_PID - 1; i++) \
last_hit[i] = last_hit[i + 1]; \
- last_hit[DBG_PID - 1] = a; \
+ last_hit[DBG_PID - 1] = a; \
} \
/* olast_hit = last_hit; last_hit = a; */
#else
Index: src/sys/arch/hp300/dev/intiovar.h
diff -u src/sys/arch/hp300/dev/intiovar.h:1.13 src/sys/arch/hp300/dev/intiovar.h:1.14
--- src/sys/arch/hp300/dev/intiovar.h:1.13 Mon Apr 28 20:23:19 2008
+++ src/sys/arch/hp300/dev/intiovar.h Mon Aug 7 23:28:58 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: intiovar.h,v 1.13 2008/04/28 20:23:19 martin Exp $ */
+/* $NetBSD: intiovar.h,v 1.14 2023/08/07 23:28:58 mrg Exp $ */
/*-
* Copyright (c) 1996, 1998, 2001 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@ intio_device_writecmd(bus_space_tag_t bs
WAIT(bst, bsh);
bus_space_write_1(bst, bsh, INTIO_DEV_3xx_CMD, cmd);
while (len--) {
- WAIT(bst, bsh);
+ WAIT(bst, bsh);
bus_space_write_1(bst, bsh, INTIO_DEV_3xx_DATA, *datap++);
}
return (0);
Index: src/sys/dist/pf/net/pf_norm.c
diff -u src/sys/dist/pf/net/pf_norm.c:1.29 src/sys/dist/pf/net/pf_norm.c:1.30
--- src/sys/dist/pf/net/pf_norm.c:1.29 Mon Mar 8 23:34:58 2021
+++ src/sys/dist/pf/net/pf_norm.c Mon Aug 7 23:28:58 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pf_norm.c,v 1.29 2021/03/08 23:34:58 christos Exp $ */
+/* $NetBSD: pf_norm.c,v 1.30 2023/08/07 23:28:58 mrg Exp $ */
/* $OpenBSD: pf_norm.c,v 1.109 2007/05/28 17:16:39 henning Exp $ */
/*
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pf_norm.c,v 1.29 2021/03/08 23:34:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf_norm.c,v 1.30 2023/08/07 23:28:58 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1011,10 +1011,12 @@ pf_normalize_ip(struct mbuf **m0, int di
if (dir == PF_IN)
#ifdef __NetBSD__
+ {
pf_mtag = pf_find_mtag(m);
KASSERT(pf_mtag != NULL);
pf_mtag->flags |= PF_TAG_FRAGCACHE;
+ }
#else
m->m_pkthdr.pf.flags |= PF_TAG_FRAGCACHE;
#endif /* !__NetBSD__ */
Index: src/sys/netinet/dccp_tfrc.c
diff -u src/sys/netinet/dccp_tfrc.c:1.9 src/sys/netinet/dccp_tfrc.c:1.10
--- src/sys/netinet/dccp_tfrc.c:1.9 Fri Dec 10 20:36:04 2021
+++ src/sys/netinet/dccp_tfrc.c Mon Aug 7 23:28:58 2023
@@ -1,5 +1,5 @@
/* $KAME: dccp_tfrc.c,v 1.16 2006/03/01 17:34:08 nishida Exp $ */
-/* $NetBSD: dccp_tfrc.c,v 1.9 2021/12/10 20:36:04 andvar Exp $ */
+/* $NetBSD: dccp_tfrc.c,v 1.10 2023/08/07 23:28:58 mrg Exp $ */
/*
* Copyright (c) 2003 Nils-Erik Mattsson
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dccp_tfrc.c,v 1.9 2021/12/10 20:36:04 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp_tfrc.c,v 1.10 2023/08/07 23:28:58 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_dccp.h"
@@ -128,10 +128,10 @@ const struct timeval delta_half = {0, TF
*/
#define HALFTIMEVAL(tvp) \
do { \
- if ((tvp)->tv_sec & 1) \
- (tvp)->tv_usec += 1000000; \
- (tvp)->tv_sec = (tvp)->tv_sec >> 1; \
- (tvp)->tv_usec = (tvp)->tv_usec >> 1; \
+ if ((tvp)->tv_sec & 1) \
+ (tvp)->tv_usec += 1000000; \
+ (tvp)->tv_sec = (tvp)->tv_sec >> 1; \
+ (tvp)->tv_usec = (tvp)->tv_usec >> 1; \
} while (0)
/* Sender side */
