[OSPF/cleanup] make message lists read only

This commit is contained in:
Stephen Hemminger 2009-05-15 10:47:45 -07:00 committed by Paul Jakma
parent b2d933f828
commit 7ba82f70dd
3 changed files with 23 additions and 23 deletions

View File

@ -42,7 +42,7 @@
#include "ospfd/ospf_packet.h"
#include "ospfd/ospf_network.h"
struct message ospf_ism_state_msg[] =
const struct message ospf_ism_state_msg[] =
{
{ ISM_DependUpon, "DependUpon" },
{ ISM_Down, "Down" },
@ -53,9 +53,9 @@ struct message ospf_ism_state_msg[] =
{ ISM_Backup, "Backup" },
{ ISM_DR, "DR" },
};
int ospf_ism_state_msg_max = OSPF_ISM_STATE_MAX;
const int ospf_ism_state_msg_max = OSPF_ISM_STATE_MAX;
struct message ospf_nsm_state_msg[] =
const struct message ospf_nsm_state_msg[] =
{
{ NSM_DependUpon, "DependUpon" },
{ NSM_Deleted, "Deleted" },
@ -68,9 +68,9 @@ struct message ospf_nsm_state_msg[] =
{ NSM_Loading, "Loading" },
{ NSM_Full, "Full" },
};
int ospf_nsm_state_msg_max = OSPF_NSM_STATE_MAX;
const int ospf_nsm_state_msg_max = OSPF_NSM_STATE_MAX;
struct message ospf_lsa_type_msg[] =
const struct message ospf_lsa_type_msg[] =
{
{ OSPF_UNKNOWN_LSA, "unknown" },
{ OSPF_ROUTER_LSA, "router-LSA" },
@ -85,9 +85,9 @@ struct message ospf_lsa_type_msg[] =
{ OSPF_OPAQUE_AREA_LSA, "Area-Local Opaque-LSA" },
{ OSPF_OPAQUE_AS_LSA, "AS-external Opaque-LSA" },
};
int ospf_lsa_type_msg_max = OSPF_MAX_LSA;
const int ospf_lsa_type_msg_max = OSPF_MAX_LSA;
struct message ospf_link_state_id_type_msg[] =
const struct message ospf_link_state_id_type_msg[] =
{
{ OSPF_UNKNOWN_LSA, "(unknown)" },
{ OSPF_ROUTER_LSA, "" },
@ -102,9 +102,9 @@ struct message ospf_link_state_id_type_msg[] =
{ OSPF_OPAQUE_AREA_LSA, "(Area-Local Opaque-Type/ID)" },
{ OSPF_OPAQUE_AS_LSA, "(AS-external Opaque-Type/ID)" },
};
int ospf_link_state_id_type_msg_max = OSPF_MAX_LSA;
const int ospf_link_state_id_type_msg_max = OSPF_MAX_LSA;
struct message ospf_network_type_msg[] =
const struct message ospf_network_type_msg[] =
{
{ OSPF_IFTYPE_NONE, "NONE" },
{ OSPF_IFTYPE_POINTOPOINT, "Point-to-Point" },
@ -113,7 +113,7 @@ struct message ospf_network_type_msg[] =
{ OSPF_IFTYPE_POINTOMULTIPOINT, "Point-to-MultiPoint" },
{ OSPF_IFTYPE_VIRTUALLINK, "Virtual-Link" },
};
int ospf_network_type_msg_max = OSPF_IFTYPE_MAX;
const int ospf_network_type_msg_max = OSPF_IFTYPE_MAX;
/* Configuration debug option variables. */
unsigned long conf_debug_ospf_packet[5] = {0, 0, 0, 0, 0};

View File

@ -1025,13 +1025,13 @@ ospf_remove_vls_through_area (struct ospf *ospf, struct ospf_area *area)
}
struct message ospf_area_type_msg[] =
static const struct message ospf_area_type_msg[] =
{
{ OSPF_AREA_DEFAULT, "Default" },
{ OSPF_AREA_STUB, "Stub" },
{ OSPF_AREA_NSSA, "NSSA" },
};
int ospf_area_type_msg_max = OSPF_AREA_TYPE_MAX;
static const int ospf_area_type_msg_max = OSPF_AREA_TYPE_MAX;
static void
ospf_area_type_set (struct ospf_area *area, int type)

View File

@ -535,17 +535,17 @@ struct ospf_nbr_nbma
/* Extern variables. */
extern struct ospf_master *om;
extern struct message ospf_ism_state_msg[];
extern struct message ospf_nsm_state_msg[];
extern struct message ospf_lsa_type_msg[];
extern struct message ospf_link_state_id_type_msg[];
extern struct message ospf_network_type_msg[];
extern int ospf_ism_state_msg_max;
extern int ospf_nsm_state_msg_max;
extern int ospf_lsa_type_msg_max;
extern int ospf_link_state_id_type_msg_max;
extern int ospf_redistributed_proto_max;
extern int ospf_network_type_msg_max;
extern const struct message ospf_ism_state_msg[];
extern const struct message ospf_nsm_state_msg[];
extern const struct message ospf_lsa_type_msg[];
extern const struct message ospf_link_state_id_type_msg[];
extern const struct message ospf_network_type_msg[];
extern const int ospf_ism_state_msg_max;
extern const int ospf_nsm_state_msg_max;
extern const int ospf_lsa_type_msg_max;
extern const int ospf_link_state_id_type_msg_max;
extern const int ospf_redistributed_proto_max;
extern const int ospf_network_type_msg_max;
extern struct zclient *zclient;
extern struct thread_master *master;
extern int ospf_zlog;