ospfd: Convert `enum event` to `enum ospf_apiserver_event`

Let's name this something more appropriate to
what is being done.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c
index 93e3b9a8e241349767383ae00661cce1355d59eb..a624f4ce1ee717d59d031960b861c20034020ba7 100644 (file)
--- a/ospfd/ospf_apiserver.c
+++ b/ospfd/ospf_apiserver.c
@@ -278,7 +278,7 @@ struct ospf_apiserver *ospf_apiserver_new(int fd_sync, int fd_async)
        return new;
 }
 
-void ospf_apiserver_event(enum event event, int fd,
+void ospf_apiserver_event(enum ospf_apiserver_event event, int fd,
                          struct ospf_apiserver *apiserv)
 {
        switch (event) {
@@ -367,7 +367,7 @@ void ospf_apiserver_read(struct thread *thread)
        struct ospf_apiserver *apiserv;
        struct msg *msg;
        int fd;
-       enum event event;
+       enum ospf_apiserver_event event;
 
        apiserv = THREAD_ARG(thread);
        fd = THREAD_FD(thread);
@@ -710,7 +710,7 @@ static int ospf_apiserver_send_msg(struct ospf_apiserver *apiserv,
 {
        struct msg_fifo *fifo;
        struct msg *msg2;
-       enum event event;
+       enum ospf_apiserver_event event;
        int fd;
 
        switch (msg->hdr.msgtype) {

diff --git a/ospfd/ospf_apiserver.h b/ospfd/ospf_apiserver.h
index 3994c8d5036415be5e054b67a6e938bace7999f6..3d57737080ad765a3d580cc98e6270f38d90ea58 100644 (file)
--- a/ospfd/ospf_apiserver.h
+++ b/ospfd/ospf_apiserver.h
@@ -68,7 +68,7 @@ struct ospf_apiserver {
        struct thread *t_async_write;
 };
 
-enum event {
+enum ospf_apiserver_event {
        OSPF_APISERVER_ACCEPT,
        OSPF_APISERVER_SYNC_READ,
 #ifdef USE_ASYNC_READ
@@ -88,7 +88,7 @@ extern int ospf_apiserver_init(void);
 extern void ospf_apiserver_term(void);
 extern struct ospf_apiserver *ospf_apiserver_new(int fd_sync, int fd_async);
 extern void ospf_apiserver_free(struct ospf_apiserver *apiserv);
-extern void ospf_apiserver_event(enum event event, int fd,
+extern void ospf_apiserver_event(enum ospf_apiserver_event event, int fd,
                                 struct ospf_apiserver *apiserv);
 extern int ospf_apiserver_serv_sock_family(unsigned short port, int family);
 extern void ospf_apiserver_accept(struct thread *thread);