diff options
| author | David Lamparter <equinox@diac24.net> | 2019-11-20 17:26:59 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2019-12-02 15:01:29 +0100 |
| commit | 2b64873d24730882af68bdf2881aa380a3a8d17f (patch) | |
| tree | 7bb835e81d96fc17ec5d1bed8bb5f5857a9673ad /vrrpd | |
| parent | 0d8c7a26a1e5dbbd36df79751b2468276bd7ec20 (diff) | |
*: generously apply const
const const const your boat, merrily down the stream...
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'vrrpd')
| -rw-r--r-- | vrrpd/vrrp.c | 8 | ||||
| -rw-r--r-- | vrrpd/vrrp.h | 3 | ||||
| -rw-r--r-- | vrrpd/vrrp_packet.c | 2 | ||||
| -rw-r--r-- | vrrpd/vrrp_packet.h | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c index eed0e8a31a..42bb154f98 100644 --- a/vrrpd/vrrp.c +++ b/vrrpd/vrrp.c @@ -50,13 +50,13 @@ int vrrp_autoconfig_version; struct vrrp_defaults vd; -const char *vrrp_state_names[3] = { +const char *const vrrp_state_names[3] = { [VRRP_STATE_INITIALIZE] = "Initialize", [VRRP_STATE_MASTER] = "Master", [VRRP_STATE_BACKUP] = "Backup", }; -const char *vrrp_event_names[2] = { +static const char *const vrrp_event_names[2] = { [VRRP_EVENT_STARTUP] = "Startup", [VRRP_EVENT_SHUTDOWN] = "Shutdown", }; @@ -1414,7 +1414,7 @@ static void vrrp_change_state_initialize(struct vrrp_router *r) vrrp_zebra_radv_set(r, false); } -void (*vrrp_change_state_handlers[])(struct vrrp_router *vr) = { +void (*const vrrp_change_state_handlers[])(struct vrrp_router *vr) = { [VRRP_STATE_MASTER] = vrrp_change_state_master, [VRRP_STATE_BACKUP] = vrrp_change_state_backup, [VRRP_STATE_INITIALIZE] = vrrp_change_state_initialize, @@ -1639,7 +1639,7 @@ static int vrrp_shutdown(struct vrrp_router *r) return 0; } -static int (*vrrp_event_handlers[])(struct vrrp_router *r) = { +static int (*const vrrp_event_handlers[])(struct vrrp_router *r) = { [VRRP_EVENT_STARTUP] = vrrp_startup, [VRRP_EVENT_SHUTDOWN] = vrrp_shutdown, }; diff --git a/vrrpd/vrrp.h b/vrrpd/vrrp.h index 5d355d04b5..79283bbb10 100644 --- a/vrrpd/vrrp.h +++ b/vrrpd/vrrp.h @@ -465,8 +465,7 @@ int vrrp_del_ipv6(struct vrrp_vrouter *vr, struct in6_addr v6); #define VRRP_EVENT_STARTUP 0 #define VRRP_EVENT_SHUTDOWN 1 -extern const char *vrrp_state_names[3]; -extern const char *vrrp_event_names[2]; +extern const char *const vrrp_state_names[3]; /* * This hook called whenever the state of a Virtual Router changes, after the diff --git a/vrrpd/vrrp_packet.c b/vrrpd/vrrp_packet.c index 461310c1e5..e4fee2d792 100644 --- a/vrrpd/vrrp_packet.c +++ b/vrrpd/vrrp_packet.c @@ -33,7 +33,7 @@ DEFINE_MTYPE_STATIC(VRRPD, VRRP_PKT, "VRRP packet") /* clang-format off */ -const char *vrrp_packet_names[16] = { +static const char *const vrrp_packet_names[16] = { [0] = "Unknown", [VRRP_TYPE_ADVERTISEMENT] = "ADVERTISEMENT", [2] = "Unknown", diff --git a/vrrpd/vrrp_packet.h b/vrrpd/vrrp_packet.h index c2ce22f008..082935f080 100644 --- a/vrrpd/vrrp_packet.h +++ b/vrrpd/vrrp_packet.h @@ -28,8 +28,6 @@ #define VRRP_TYPE_ADVERTISEMENT 1 -extern const char *vrrp_packet_names[16]; - /* * Shared header for VRRPv2/v3 packets. */ |