From fd8f6ebb4c6b9e5364b98d2b5fd345d1dcc08824 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Tue, 3 Mar 2015 08:57:02 +0100 Subject: lib: use const consistently for zserv path The global variable is missing its const, but the accessor function has a meaningless extra const in exchange... Signed-off-by: David Lamparter --- lib/zclient.c | 4 ++-- lib/zclient.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/zclient.c b/lib/zclient.c index 963c7052..1e05d6dd 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -41,7 +41,7 @@ static void zclient_event (enum event, struct zclient *); extern struct thread_master *master; -char *zclient_serv_path = NULL; +const char *zclient_serv_path = NULL; /* This file local debug flag. */ int zclient_debug = 0; @@ -1053,7 +1053,7 @@ zclient_event (enum event event, struct zclient *zclient) } } -const char *const zclient_serv_path_get() +const char *zclient_serv_path_get() { return zclient_serv_path ? zclient_serv_path : ZEBRA_SERV_PATH; } diff --git a/lib/zclient.h b/lib/zclient.h index d0c5450b..a51b3def 100644 --- a/lib/zclient.h +++ b/lib/zclient.h @@ -134,7 +134,7 @@ extern void zclient_free (struct zclient *); extern int zclient_socket_connect (struct zclient *); extern void zclient_serv_path_set (char *path); -extern const char *const zclient_serv_path_get (void); +extern const char *zclient_serv_path_get (void); /* Send redistribute command to zebra daemon. Do not update zclient state. */ extern int zebra_redistribute_send (int command, struct zclient *, int type); -- cgit v1.2.3