From 2d362d1099f346202cb628665ff4ae563b2594f5 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 21 Dec 2009 12:54:58 +0300 Subject: lib: make some structures constant * isisd/isis_pdu.c * maskbit: this pre-initialized array is not modified * lib/prefix.c * maskbit: idem * lib/command.c * facility_map: idem * itoa64: idem * default_motd: make local var static * facility_name(): update local var accordingly * facility_match(): idem --- isisd/isis_pdu.c | 2 +- lib/command.c | 10 +++++----- lib/prefix.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c index 4311a905..a2ab0649 100644 --- a/isisd/isis_pdu.c +++ b/isisd/isis_pdu.c @@ -64,7 +64,7 @@ extern struct isis *isis; #endif /* PNBBY */ /* Utility mask array. */ -static u_char maskbit[] = { +static const u_char maskbit[] = { 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff }; diff --git a/lib/command.c b/lib/command.c index 31c067a3..478125f2 100644 --- a/lib/command.c +++ b/lib/command.c @@ -82,14 +82,14 @@ static struct cmd_node config_node = }; /* Default motd string. */ -const char *default_motd = +static const char *default_motd = "\r\n\ Hello, this is " QUAGGA_PROGNAME " (version " QUAGGA_VERSION ").\r\n\ " QUAGGA_COPYRIGHT "\r\n\ \r\n"; -static struct facility_map { +static const struct facility_map { int facility; const char *name; size_t match; @@ -122,7 +122,7 @@ static struct facility_map { static const char * facility_name(int facility) { - struct facility_map *fm; + const struct facility_map *fm; for (fm = syslog_facilities; fm->name; fm++) if (fm->facility == facility) @@ -133,7 +133,7 @@ facility_name(int facility) static int facility_match(const char *str) { - struct facility_map *fm; + const struct facility_map *fm; for (fm = syslog_facilities; fm->name; fm++) if (!strncmp(str,fm->name,fm->match)) @@ -506,7 +506,7 @@ install_element (enum node_type ntype, struct cmd_element *cmd) cmd->cmdsize = cmd_cmdsize (cmd->strvec); } -static unsigned char itoa64[] = +static const unsigned char itoa64[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; static void diff --git a/lib/prefix.c b/lib/prefix.c index 2afaa09c..c85e6594 100644 --- a/lib/prefix.c +++ b/lib/prefix.c @@ -29,7 +29,7 @@ #include "log.h" /* Maskbit. */ -static u_char maskbit[] = {0x00, 0x80, 0xc0, 0xe0, 0xf0, +static const u_char maskbit[] = {0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff}; /* Number of bits in prefix type. */ -- cgit v1.2.1