Module Name: src
Committed By: joerg
Date: Thu Sep 13 21:44:50 UTC 2012
Modified Files:
src/external/bsd/atf/dist/atf-c: macros_test.c
src/external/bsd/dhcpcd/dist: bpf-filter.h dhcp.c
src/lib/libutil: parsedate.y
src/sys/dev/sdmmc: sdhc.c
src/sys/kern: subr_vmem.c
src/usr.bin/rump_dhcpclient: bpf-filter.h dhcp.c
src/usr.sbin/quotarestore: quotarestore.c
Log Message:
Don't use const foo const as type, one const is enough.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/atf/dist/atf-c/macros_test.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/dhcpcd/dist/bpf-filter.h
cvs rdiff -u -r1.1.1.21 -r1.2 src/external/bsd/dhcpcd/dist/dhcp.c
cvs rdiff -u -r1.11 -r1.12 src/lib/libutil/parsedate.y
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.75 -r1.76 src/sys/kern/subr_vmem.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/rump_dhcpclient/bpf-filter.h \
src/usr.bin/rump_dhcpclient/dhcp.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/quotarestore/quotarestore.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-c/macros_test.c
diff -u src/external/bsd/atf/dist/atf-c/macros_test.c:1.1.1.5 src/external/bsd/atf/dist/atf-c/macros_test.c:1.2
--- src/external/bsd/atf/dist/atf-c/macros_test.c:1.1.1.5 Wed Jul 11 22:37:09 2012
+++ src/external/bsd/atf/dist/atf-c/macros_test.c Thu Sep 13 21:44:49 2012
@@ -442,8 +442,8 @@ H_CHECK_STREQ_MSG(2_1, "2", "1", "2 does
H_CHECK_STREQ_MSG(2_2, "2", "2", "2 does not match 2");
#define CHECK_STREQ_VAR1 "5"
#define CHECK_STREQ_VAR2 "9"
-const const char *check_streq_var1 = CHECK_STREQ_VAR1;
-const const char *check_streq_var2 = CHECK_STREQ_VAR2;
+const char check_streq_var1[] = CHECK_STREQ_VAR1;
+const char check_streq_var2[] = CHECK_STREQ_VAR2;
H_CHECK_STREQ(vars, check_streq_var1, check_streq_var2);
ATF_TC(check_streq);
@@ -630,8 +630,8 @@ H_REQUIRE_STREQ_MSG(2_1, "2", "1", "2 do
H_REQUIRE_STREQ_MSG(2_2, "2", "2", "2 does not match 2");
#define REQUIRE_STREQ_VAR1 "5"
#define REQUIRE_STREQ_VAR2 "9"
-const const char *require_streq_var1 = REQUIRE_STREQ_VAR1;
-const const char *require_streq_var2 = REQUIRE_STREQ_VAR2;
+const char require_streq_var1[] = REQUIRE_STREQ_VAR1;
+const char require_streq_var2[] = REQUIRE_STREQ_VAR2;
H_REQUIRE_STREQ(vars, require_streq_var1, require_streq_var2);
ATF_TC(require_streq);
Index: src/external/bsd/dhcpcd/dist/bpf-filter.h
diff -u src/external/bsd/dhcpcd/dist/bpf-filter.h:1.1.1.2 src/external/bsd/dhcpcd/dist/bpf-filter.h:1.2
--- src/external/bsd/dhcpcd/dist/bpf-filter.h:1.1.1.2 Sun May 3 06:48:59 2009
+++ src/external/bsd/dhcpcd/dist/bpf-filter.h Thu Sep 13 21:44:49 2012
@@ -30,7 +30,7 @@
#ifndef BPF_WHOLEPACKET
# define BPF_WHOLEPACKET ~0U
#endif
-static const struct bpf_insn const arp_bpf_filter [] = {
+static const struct bpf_insn arp_bpf_filter [] = {
#ifndef BPF_SKIPTYPE
/* Make sure this is an ARP packet... */
BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 12),
@@ -75,7 +75,7 @@ static const size_t arp_bpf_filter_len =
* http://www.isc.org/
*/
-static const struct bpf_insn const dhcp_bpf_filter [] = {
+static const struct bpf_insn dhcp_bpf_filter [] = {
#ifndef BPF_SKIPTYPE
/* Make sure this is an IP packet... */
BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 12),
Index: src/external/bsd/dhcpcd/dist/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/dhcp.c:1.1.1.21 src/external/bsd/dhcpcd/dist/dhcp.c:1.2
--- src/external/bsd/dhcpcd/dist/dhcp.c:1.1.1.21 Thu Jul 12 16:47:58 2012
+++ src/external/bsd/dhcpcd/dist/dhcp.c Thu Sep 13 21:44:49 2012
@@ -67,7 +67,7 @@ struct dhcp_opt {
const char *var;
};
-static const struct dhcp_opt const dhcp_opts[] = {
+static const struct dhcp_opt dhcp_opts[] = {
{ 1, IPV4 | REQUEST, "subnet_mask" },
/* RFC 3442 states that the CSR has to come before all other
* routes. For completeness, we also specify static routes,
Index: src/lib/libutil/parsedate.y
diff -u src/lib/libutil/parsedate.y:1.11 src/lib/libutil/parsedate.y:1.12
--- src/lib/libutil/parsedate.y:1.11 Sat Dec 17 19:14:10 2011
+++ src/lib/libutil/parsedate.y Thu Sep 13 21:44:50 2012
@@ -367,7 +367,7 @@ o_merid : /* NULL */ {
%%
/* Month and day table. */
-static const TABLE const MonthDayTable[] = {
+static const TABLE MonthDayTable[] = {
{ "january", tMONTH, 1 },
{ "february", tMONTH, 2 },
{ "march", tMONTH, 3 },
@@ -396,7 +396,7 @@ static const TABLE const MonthDayTable[]
};
/* Time units table. */
-static const TABLE const UnitsTable[] = {
+static const TABLE UnitsTable[] = {
{ "year", tMONTH_UNIT, 12 },
{ "month", tMONTH_UNIT, 1 },
{ "fortnight", tMINUTE_UNIT, 14 * 24 * 60 },
@@ -411,7 +411,7 @@ static const TABLE const UnitsTable[] =
};
/* Assorted relative-time words. */
-static const TABLE const OtherTable[] = {
+static const TABLE OtherTable[] = {
{ "tomorrow", tMINUTE_UNIT, 1 * 24 * 60 },
{ "yesterday", tMINUTE_UNIT, -1 * 24 * 60 },
{ "today", tMINUTE_UNIT, 0 },
@@ -449,7 +449,7 @@ static const TABLE const OtherTable[] =
/* The timezone table. */
/* Some of these are commented out because a time_t can't store a float. */
-static const TABLE const TimezoneTable[] = {
+static const TABLE TimezoneTable[] = {
{ "gmt", tZONE, HOUR( 0) }, /* Greenwich Mean */
{ "ut", tZONE, HOUR( 0) }, /* Universal (Coordinated) */
{ "utc", tZONE, HOUR( 0) },
@@ -533,7 +533,7 @@ static const TABLE const TimezoneTable[]
};
/* Military timezone table. */
-static const TABLE const MilitaryTable[] = {
+static const TABLE MilitaryTable[] = {
{ "a", tZONE, HOUR( 1) },
{ "b", tZONE, HOUR( 2) },
{ "c", tZONE, HOUR( 3) },
Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.30 src/sys/dev/sdmmc/sdhc.c:1.31
--- src/sys/dev/sdmmc/sdhc.c:1.30 Fri Aug 31 01:44:20 2012
+++ src/sys/dev/sdmmc/sdhc.c Thu Sep 13 21:44:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.30 2012/08/31 01:44:20 matt Exp $ */
+/* $NetBSD: sdhc.c,v 1.31 2012/09/13 21:44:50 joerg Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.30 2012/08/31 01:44:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.31 2012/09/13 21:44:50 joerg Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -220,7 +220,7 @@ static struct sdmmc_chip_functions sdhc_
static int
sdhc_cfprint(void *aux, const char *pnp)
{
- const struct sdmmcbus_attach_args const * saa = aux;
+ const struct sdmmcbus_attach_args * const saa = aux;
const struct sdhc_host * const hp = saa->saa_sch;
if (pnp) {
Index: src/sys/kern/subr_vmem.c
diff -u src/sys/kern/subr_vmem.c:1.75 src/sys/kern/subr_vmem.c:1.76
--- src/sys/kern/subr_vmem.c:1.75 Sat Sep 1 12:28:58 2012
+++ src/sys/kern/subr_vmem.c Thu Sep 13 21:44:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_vmem.c,v 1.75 2012/09/01 12:28:58 para Exp $ */
+/* $NetBSD: subr_vmem.c,v 1.76 2012/09/13 21:44:50 joerg Exp $ */
/*-
* Copyright (c)2006,2007,2008,2009 YAMAMOTO Takashi,
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.75 2012/09/01 12:28:58 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.76 2012/09/13 21:44:50 joerg Exp $");
#if defined(_KERNEL)
#include "opt_ddb.h"
@@ -895,7 +895,7 @@ vmem_rehash(vmem_t *vm, size_t newhashsi
*/
static int
-vmem_fit(const bt_t const *bt, vmem_size_t size, vmem_size_t align,
+vmem_fit(const bt_t *bt, vmem_size_t size, vmem_size_t align,
vmem_size_t phase, vmem_size_t nocross,
vmem_addr_t minaddr, vmem_addr_t maxaddr, vmem_addr_t *addrp)
{
Index: src/usr.bin/rump_dhcpclient/bpf-filter.h
diff -u src/usr.bin/rump_dhcpclient/bpf-filter.h:1.1 src/usr.bin/rump_dhcpclient/bpf-filter.h:1.2
--- src/usr.bin/rump_dhcpclient/bpf-filter.h:1.1 Thu Jan 20 18:47:19 2011
+++ src/usr.bin/rump_dhcpclient/bpf-filter.h Thu Sep 13 21:44:50 2012
@@ -30,7 +30,7 @@
#ifndef BPF_WHOLEPACKET
# define BPF_WHOLEPACKET ~0U
#endif
-static const struct bpf_insn const arp_bpf_filter [] = {
+static const struct bpf_insn arp_bpf_filter [] = {
#ifndef BPF_SKIPTYPE
/* Make sure this is an ARP packet... */
BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 12),
@@ -75,7 +75,7 @@ static const size_t arp_bpf_filter_len =
* http://www.isc.org/
*/
-static const struct bpf_insn const dhcp_bpf_filter [] = {
+static const struct bpf_insn dhcp_bpf_filter [] = {
#ifndef BPF_SKIPTYPE
/* Make sure this is an IP packet... */
BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 12),
Index: src/usr.bin/rump_dhcpclient/dhcp.c
diff -u src/usr.bin/rump_dhcpclient/dhcp.c:1.1 src/usr.bin/rump_dhcpclient/dhcp.c:1.2
--- src/usr.bin/rump_dhcpclient/dhcp.c:1.1 Thu Jan 20 18:47:20 2011
+++ src/usr.bin/rump_dhcpclient/dhcp.c Thu Sep 13 21:44:50 2012
@@ -64,7 +64,7 @@ struct dhcp_opt {
const char *var;
};
-static const struct dhcp_opt const dhcp_opts[] = {
+static const struct dhcp_opt dhcp_opts[] = {
{ 1, IPV4 | REQUEST, "subnet_mask" },
/* RFC 3442 states that the CSR has to come before all other
* routes. For completeness, we also specify static routes,
Index: src/usr.sbin/quotarestore/quotarestore.c
diff -u src/usr.sbin/quotarestore/quotarestore.c:1.2 src/usr.sbin/quotarestore/quotarestore.c:1.3
--- src/usr.sbin/quotarestore/quotarestore.c:1.2 Tue Feb 14 17:33:38 2012
+++ src/usr.sbin/quotarestore/quotarestore.c Thu Sep 13 21:44:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quotarestore.c,v 1.2 2012/02/14 17:33:38 joerg Exp $ */
+/* $NetBSD: quotarestore.c,v 1.3 2012/09/13 21:44:50 joerg Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: quotarestore.c,v 1.2 2012/02/14 17:33:38 joerg Exp $");
+__RCSID("$NetBSD: quotarestore.c,v 1.3 2012/09/13 21:44:50 joerg Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -42,7 +42,7 @@ __RCSID("$NetBSD: quotarestore.c,v 1.2 2
#include <quota.h>
-static const char const ws[] = " \t\r\n";
+static const char ws[] = " \t\r\n";
static char **idtypenames;
static unsigned numidtypes;
