use c99 initializers

consistently terminate nlist arrays with NULL not ""
This commit is contained in:
christos 2006-10-22 16:43:24 +00:00
parent 7284ae463f
commit 8a3920f2c8
12 changed files with 70 additions and 70 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: bufcache.c,v 1.19 2005/02/26 22:12:33 dsl Exp $ */ /* $NetBSD: bufcache.c,v 1.20 2006/10/22 16:43:24 christos Exp $ */
/*- /*-
* Copyright (c) 1999 The NetBSD Foundation, Inc. * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: bufcache.c,v 1.19 2005/02/26 22:12:33 dsl Exp $"); __RCSID("$NetBSD: bufcache.c,v 1.20 2006/10/22 16:43:24 christos Exp $");
#endif /* not lint */ #endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
@ -82,8 +82,8 @@ struct ml_entry {
static struct nlist namelist[] = { static struct nlist namelist[] = {
#define X_BUFMEM 0 #define X_BUFMEM 0
{ "_bufmem" }, { .n_name = "_bufmem" },
{ "" }, { .n_name = NULL },
}; };
static struct vcache vcache[VCACHE_SIZE]; static struct vcache vcache[VCACHE_SIZE];

View File

@ -1,4 +1,4 @@
/* $NetBSD: cmdtab.c,v 1.21 2005/02/26 19:01:09 dsl Exp $ */ /* $NetBSD: cmdtab.c,v 1.22 2006/10/22 16:43:24 christos Exp $ */
/*- /*-
* Copyright (c) 1980, 1992, 1993 * Copyright (c) 1980, 1992, 1993
@ -34,7 +34,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
#endif #endif
__RCSID("$NetBSD: cmdtab.c,v 1.21 2005/02/26 19:01:09 dsl Exp $"); __RCSID("$NetBSD: cmdtab.c,v 1.22 2006/10/22 16:43:24 christos Exp $");
#endif /* not lint */ #endif /* not lint */
#include "systat.h" #include "systat.h"
@ -52,13 +52,13 @@ struct command global_commands[] = {
{ "quit", global_quit, "exit systat"}, { "quit", global_quit, "exit systat"},
{ "start", global_interval, "restart updating display"}, { "start", global_interval, "restart updating display"},
{ "stop", global_stop, "stop updating display"}, { "stop", global_stop, "stop updating display"},
{ 0 } { .c_name = NULL }
}; };
struct command df_commands[] = { struct command df_commands[] = {
{ "all", df_all, "show all filesystems"}, { "all", df_all, "show all filesystems"},
{ "some", df_some, "show only some filesystems"}, { "some", df_some, "show only some filesystems"},
{ 0 } { .c_name = NULL }
}; };
struct command icmp_commands[] = { struct command icmp_commands[] = {
@ -66,7 +66,7 @@ struct command icmp_commands[] = {
{ "run", icmp_run, "show running total stats"}, { "run", icmp_run, "show running total stats"},
{ "time", icmp_time, "show stats for each sample time"}, { "time", icmp_time, "show stats for each sample time"},
{ "zero", icmp_zero, "re-zero running totals"}, { "zero", icmp_zero, "re-zero running totals"},
{ 0 } { .c_name = NULL }
}; };
struct command iostat_commands[] = { struct command iostat_commands[] = {
@ -79,7 +79,7 @@ struct command iostat_commands[] = {
{ "display", disks_add, "add a disk to displayed disks"}, { "display", disks_add, "add a disk to displayed disks"},
{ "ignore", disks_remove, "remove a disk from displayed disks"}, { "ignore", disks_remove, "remove a disk from displayed disks"},
{ "drives", disks_drives, "list all disks/set disk list"}, { "drives", disks_drives, "list all disks/set disk list"},
{ 0 } { .c_name = NULL }
}; };
struct command ip_commands[] = { struct command ip_commands[] = {
@ -87,7 +87,7 @@ struct command ip_commands[] = {
{ "run", ip_run, "show running total stats"}, { "run", ip_run, "show running total stats"},
{ "time", ip_time, "show stats for each sample time"}, { "time", ip_time, "show stats for each sample time"},
{ "zero", ip_zero, "re-zero running totals"}, { "zero", ip_zero, "re-zero running totals"},
{ 0 } { .c_name = NULL }
}; };
#ifdef INET6 #ifdef INET6
@ -96,7 +96,7 @@ struct command ip6_commands[] = {
{ "run", ip6_run, "show running total stats"}, { "run", ip6_run, "show running total stats"},
{ "time", ip6_time, "show stats for each sample time"}, { "time", ip6_time, "show stats for each sample time"},
{ "zero", ip6_zero, "re-zero running totals"}, { "zero", ip6_zero, "re-zero running totals"},
{ 0 } { .c_name = NULL }
}; };
#endif #endif
@ -106,7 +106,7 @@ struct command ipsec_commands[] = {
{ "run", ipsec_run, "show running total stats"}, { "run", ipsec_run, "show running total stats"},
{ "time", ipsec_time, "show stats for each sample time"}, { "time", ipsec_time, "show stats for each sample time"},
{ "zero", ipsec_zero, "re-zero running totals"}, { "zero", ipsec_zero, "re-zero running totals"},
{ NULL, NULL, NULL }, { .c_name = NULL }
}; };
#endif #endif
@ -120,12 +120,12 @@ struct command netstat_commands[] = {
{ "show", netstat_show, "show current display/ignore settings"}, { "show", netstat_show, "show current display/ignore settings"},
{ "tcp", netstat_tcp, "show only tcp connections"}, { "tcp", netstat_tcp, "show only tcp connections"},
{ "udp", netstat_udp, "show only udp connections"}, { "udp", netstat_udp, "show only udp connections"},
{ 0 } { .c_name = NULL }
}; };
struct command ps_commands[] = { struct command ps_commands[] = {
{ "user", ps_user, "limit displayed processes to a user"}, { "user", ps_user, "limit displayed processes to a user"},
{ 0 } { .c_name = NULL }
}; };
struct command tcp_commands[] = { struct command tcp_commands[] = {
@ -133,7 +133,7 @@ struct command tcp_commands[] = {
{ "run", tcp_run, "show running total stats"}, { "run", tcp_run, "show running total stats"},
{ "time", tcp_time, "show stats for each sample time"}, { "time", tcp_time, "show stats for each sample time"},
{ "zero", tcp_zero, "re-zero running totals"}, { "zero", tcp_zero, "re-zero running totals"},
{ NULL, NULL, NULL }, { .c_name = NULL }
}; };
struct command vmstat_commands[] = { struct command vmstat_commands[] = {
@ -145,7 +145,7 @@ struct command vmstat_commands[] = {
{ "display", disks_add, "add a disk to displayed disks"}, { "display", disks_add, "add a disk to displayed disks"},
{ "ignore", disks_remove, "remove a disk from displayed disks"}, { "ignore", disks_remove, "remove a disk from displayed disks"},
{ "drives", disks_drives, "list all disks/set disk list"}, { "drives", disks_drives, "list all disks/set disk list"},
{ 0 } { .c_name = NULL }
}; };
struct mode modes[] = { struct mode modes[] = {
@ -199,6 +199,6 @@ struct mode modes[] = {
{ "vmstat", showvmstat, fetchvmstat, labelvmstat, { "vmstat", showvmstat, fetchvmstat, labelvmstat,
initvmstat, openvmstat, closevmstat, vmstat_commands, initvmstat, openvmstat, closevmstat, vmstat_commands,
0 }, 0 },
{ 0 } { .c_name = NULL }
}; };
struct mode *curmode = &modes[0]; struct mode *curmode = &modes[0];

View File

@ -1,4 +1,4 @@
/* $NetBSD: icmp.c,v 1.8 2005/02/26 22:12:33 dsl Exp $ */ /* $NetBSD: icmp.c,v 1.9 2006/10/22 16:43:24 christos Exp $ */
/* /*
* Copyright (c) 1999, 2000 Andrew Doran <ad@NetBSD.org> * Copyright (c) 1999, 2000 Andrew Doran <ad@NetBSD.org>
@ -29,7 +29,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: icmp.c,v 1.8 2005/02/26 22:12:33 dsl Exp $"); __RCSID("$NetBSD: icmp.c,v 1.9 2006/10/22 16:43:24 christos Exp $");
#endif /* not lint */ #endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
@ -65,8 +65,8 @@ static struct icmpstat newstat;
static struct icmpstat oldstat; static struct icmpstat oldstat;
static struct nlist namelist[] = { static struct nlist namelist[] = {
{ "_icmpstat" }, { .n_name = "_icmpstat" },
{ "" } { .n_name = NULL }
}; };
WINDOW * WINDOW *

View File

@ -1,4 +1,4 @@
/* $NetBSD: ip.c,v 1.12 2005/02/26 22:12:33 dsl Exp $ */ /* $NetBSD: ip.c,v 1.13 2006/10/22 16:43:24 christos Exp $ */
/* /*
* Copyright (c) 1999, 2000 Andrew Doran <ad@NetBSD.org> * Copyright (c) 1999, 2000 Andrew Doran <ad@NetBSD.org>
@ -29,7 +29,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: ip.c,v 1.12 2005/02/26 22:12:33 dsl Exp $"); __RCSID("$NetBSD: ip.c,v 1.13 2006/10/22 16:43:24 christos Exp $");
#endif /* not lint */ #endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
@ -69,9 +69,9 @@ static struct mystat oldstat;
static struct mystat newstat; static struct mystat newstat;
static struct nlist namelist[] = { static struct nlist namelist[] = {
{ "_ipstat" }, { .n_name = "_ipstat" },
{ "_udpstat" }, { .n_name = "_udpstat" },
{ "" } { .n_name = NULL }
}; };
WINDOW * WINDOW *

View File

@ -1,4 +1,4 @@
/* $NetBSD: ip6.c,v 1.11 2005/02/26 22:12:33 dsl Exp $ */ /* $NetBSD: ip6.c,v 1.12 2006/10/22 16:43:24 christos Exp $ */
/* /*
* Copyright (c) 1999, 2000 Andrew Doran <ad@NetBSD.org> * Copyright (c) 1999, 2000 Andrew Doran <ad@NetBSD.org>
@ -29,7 +29,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: ip6.c,v 1.11 2005/02/26 22:12:33 dsl Exp $"); __RCSID("$NetBSD: ip6.c,v 1.12 2006/10/22 16:43:24 christos Exp $");
#endif /* not lint */ #endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
@ -62,8 +62,8 @@ static struct ip6stat newstat;
static struct ip6stat oldstat; static struct ip6stat oldstat;
static struct nlist namelist[] = { static struct nlist namelist[] = {
{ "_ip6stat" }, { .n_name = "_ip6stat" },
{ "" } { .n_name = NULL }
}; };
WINDOW * WINDOW *

View File

@ -1,4 +1,4 @@
/* $NetBSD: ipsec.c,v 1.8 2005/02/26 22:12:33 dsl Exp $ */ /* $NetBSD: ipsec.c,v 1.9 2006/10/22 16:43:24 christos Exp $ */
/* /*
* Copyright (c) 1999, 2000 Andrew Doran <ad@NetBSD.org> * Copyright (c) 1999, 2000 Andrew Doran <ad@NetBSD.org>
@ -29,7 +29,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: ipsec.c,v 1.8 2005/02/26 22:12:33 dsl Exp $"); __RCSID("$NetBSD: ipsec.c,v 1.9 2006/10/22 16:43:24 christos Exp $");
#endif /* not lint */ #endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
@ -66,11 +66,11 @@ static struct mystat newstat;
static struct mystat oldstat; static struct mystat oldstat;
static struct nlist namelist[] = { static struct nlist namelist[] = {
{ "_ipsecstat" }, { .n_name = "_ipsecstat" },
#ifdef INET6 #ifdef INET6
{ "_ipsec6stat" }, { .n_name = "_ipsec6stat" },
#endif #endif
{ "" } { .n_name = NULL }
}; };
WINDOW * WINDOW *

View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.39 2005/02/26 22:12:33 dsl Exp $ */ /* $NetBSD: main.c,v 1.40 2006/10/22 16:43:24 christos Exp $ */
/*- /*-
* Copyright (c) 1980, 1992, 1993 * Copyright (c) 1980, 1992, 1993
@ -36,7 +36,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1992, 1993\n\
#if 0 #if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif #endif
__RCSID("$NetBSD: main.c,v 1.39 2005/02/26 22:12:33 dsl Exp $"); __RCSID("$NetBSD: main.c,v 1.40 2006/10/22 16:43:24 christos Exp $");
#endif /* not lint */ #endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
@ -59,12 +59,12 @@ __RCSID("$NetBSD: main.c,v 1.39 2005/02/26 22:12:33 dsl Exp $");
static struct nlist namelist[] = { static struct nlist namelist[] = {
#define X_FIRST 0 #define X_FIRST 0
#define X_HZ 0 #define X_HZ 0
{ "_hz" }, { .n_name = "_hz" },
#define X_STATHZ 1 #define X_STATHZ 1
{ "_stathz" }, { .n_name = "_stathz" },
#define X_MAXSLP 2 #define X_MAXSLP 2
{ "_maxslp" }, { .n_name = "_maxslp" },
{ "" } { .n_name = NULL }
}; };
static int dellave; static int dellave;

View File

@ -1,4 +1,4 @@
/* $NetBSD: mbufs.c,v 1.13 2005/02/26 22:12:33 dsl Exp $ */ /* $NetBSD: mbufs.c,v 1.14 2006/10/22 16:43:24 christos Exp $ */
/*- /*-
* Copyright (c) 1980, 1992, 1993 * Copyright (c) 1980, 1992, 1993
@ -34,7 +34,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93";
#endif #endif
__RCSID("$NetBSD: mbufs.c,v 1.13 2005/02/26 22:12:33 dsl Exp $"); __RCSID("$NetBSD: mbufs.c,v 1.14 2006/10/22 16:43:24 christos Exp $");
#endif /* not lint */ #endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
@ -132,8 +132,8 @@ showmbufs(void)
static struct nlist namelist[] = { static struct nlist namelist[] = {
#define X_MBSTAT 0 #define X_MBSTAT 0
{ "_mbstat" }, { .n_name = "_mbstat" },
{ "" } { .n_name = NULL }
}; };
int int

View File

@ -1,4 +1,4 @@
/* $NetBSD: netstat.c,v 1.27 2005/02/26 22:12:33 dsl Exp $ */ /* $NetBSD: netstat.c,v 1.28 2006/10/22 16:43:24 christos Exp $ */
/*- /*-
* Copyright (c) 1980, 1992, 1993 * Copyright (c) 1980, 1992, 1993
@ -34,7 +34,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)netstat.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)netstat.c 8.1 (Berkeley) 6/6/93";
#endif #endif
__RCSID("$NetBSD: netstat.c,v 1.27 2005/02/26 22:12:33 dsl Exp $"); __RCSID("$NetBSD: netstat.c,v 1.28 2006/10/22 16:43:24 christos Exp $");
#endif /* not lint */ #endif /* not lint */
/* /*
@ -157,10 +157,10 @@ closenetstat(WINDOW *w)
static struct nlist namelist[] = { static struct nlist namelist[] = {
#define X_TCBTABLE 0 #define X_TCBTABLE 0
{ "_tcbtable" }, { .n_name = "_tcbtable" },
#define X_UDBTABLE 1 #define X_UDBTABLE 1
{ "_udbtable" }, { .n_name = "_udbtable" },
{ "" }, { .n_name = NULL },
}; };
int int

View File

@ -1,4 +1,4 @@
/* $NetBSD: pigs.c,v 1.29 2005/12/24 21:14:50 matt Exp $ */ /* $NetBSD: pigs.c,v 1.30 2006/10/22 16:43:24 christos Exp $ */
/*- /*-
* Copyright (c) 1980, 1992, 1993 * Copyright (c) 1980, 1992, 1993
@ -34,7 +34,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)pigs.c 8.2 (Berkeley) 9/23/93"; static char sccsid[] = "@(#)pigs.c 8.2 (Berkeley) 9/23/93";
#endif #endif
__RCSID("$NetBSD: pigs.c,v 1.29 2005/12/24 21:14:50 matt Exp $"); __RCSID("$NetBSD: pigs.c,v 1.30 2006/10/22 16:43:24 christos Exp $");
#endif /* not lint */ #endif /* not lint */
/* /*
@ -143,12 +143,12 @@ showpigs(void)
static struct nlist namelist[] = { static struct nlist namelist[] = {
#define X_FIRST 0 #define X_FIRST 0
#define X_CCPU 0 #define X_CCPU 0
{ "_ccpu" }, { .n_name = "_ccpu" },
#define X_FSCALE 1 #define X_FSCALE 1
{ "_fscale" }, { .n_name = "_fscale" },
#define X_PHYSMEM 2 #define X_PHYSMEM 2
{ "_physmem" }, { .n_name = "_physmem" },
{ "" } { .n_name = NULL }
}; };
int int

View File

@ -1,4 +1,4 @@
/* $NetBSD: tcp.c,v 1.11 2005/02/26 22:12:34 dsl Exp $ */ /* $NetBSD: tcp.c,v 1.12 2006/10/22 16:43:24 christos Exp $ */
/* /*
* Copyright (c) 1999, 2000 Andrew Doran <ad@NetBSD.org> * Copyright (c) 1999, 2000 Andrew Doran <ad@NetBSD.org>
@ -29,7 +29,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: tcp.c,v 1.11 2005/02/26 22:12:34 dsl Exp $"); __RCSID("$NetBSD: tcp.c,v 1.12 2006/10/22 16:43:24 christos Exp $");
#endif /* not lint */ #endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
@ -65,8 +65,8 @@ static struct tcpstat newstat;
static struct tcpstat oldstat; static struct tcpstat oldstat;
static struct nlist namelist[] = { static struct nlist namelist[] = {
{ "_tcpstat" }, { .n_name = "_tcpstat" },
{ "" } { .n_name = NULL }
}; };
WINDOW * WINDOW *

View File

@ -1,4 +1,4 @@
/* $NetBSD: vmstat.c,v 1.68 2006/05/21 20:22:34 dsl Exp $ */ /* $NetBSD: vmstat.c,v 1.69 2006/10/22 16:43:24 christos Exp $ */
/*- /*-
* Copyright (c) 1983, 1989, 1992, 1993 * Copyright (c) 1983, 1989, 1992, 1993
@ -34,7 +34,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 1/12/94"; static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 1/12/94";
#endif #endif
__RCSID("$NetBSD: vmstat.c,v 1.68 2006/05/21 20:22:34 dsl Exp $"); __RCSID("$NetBSD: vmstat.c,v 1.69 2006/10/22 16:43:24 christos Exp $");
#endif /* not lint */ #endif /* not lint */
/* /*
@ -107,18 +107,18 @@ closevmstat(WINDOW *w)
static struct nlist namelist[] = { static struct nlist namelist[] = {
#define X_NCHSTATS 0 #define X_NCHSTATS 0
{ "_nchstats" }, { .n_name = "_nchstats" },
#define X_INTRNAMES 1 #define X_INTRNAMES 1
{ "_intrnames" }, { .n_name = "_intrnames" },
#define X_EINTRNAMES 2 #define X_EINTRNAMES 2
{ "_eintrnames" }, { .n_name = "_eintrnames" },
#define X_INTRCNT 3 #define X_INTRCNT 3
{ "_intrcnt" }, { .n_name = "_intrcnt" },
#define X_EINTRCNT 4 #define X_EINTRCNT 4
{ "_eintrcnt" }, { .n_name = "_eintrcnt" },
#define X_ALLEVENTS 5 #define X_ALLEVENTS 5
{ "_allevents" }, { .n_name = "_allevents" },
{ NULL } { .n_name = NULL }
}; };
/* /*