From f0132ab5a76ccd04398c413635699d08b8e24a75 Mon Sep 17 00:00:00 2001
From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Thu, 13 Sep 2018 19:04:11 +0000
Subject: [PATCH] eigrpd: EIGRP_[ERR|WARN] -> EC_EIGRP

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---
 eigrpd/eigrp_errors.c   | 4 ++--
 eigrpd/eigrp_errors.h   | 4 ++--
 eigrpd/eigrp_hello.c    | 2 +-
 eigrpd/eigrp_neighbor.c | 2 +-
 eigrpd/eigrp_packet.c   | 2 +-
 eigrpd/eigrp_reply.c    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/eigrpd/eigrp_errors.c b/eigrpd/eigrp_errors.c
index 3db0ec8545..75cf953557 100644
--- a/eigrpd/eigrp_errors.c
+++ b/eigrpd/eigrp_errors.c
@@ -26,13 +26,13 @@
 /* clang-format off */
 static struct log_ref ferr_eigrp_err[] = {
 	{
-		.code = EIGRP_ERR_PACKET,
+		.code = EC_EIGRP_PACKET,
 		.title = "EIGRP Packet Error",
 		.description = "EIGRP has a packet that does not correctly decode or encode",
 		.suggestion = "Gather log files from both sides of the neighbor relationship and open an issue"
 	},
 	{
-		.code = EIGRP_ERR_CONFIG,
+		.code = EC_EIGRP_CONFIG,
 		.title = "EIGRP Configuration Error",
 		.description = "EIGRP has detected a configuration error",
 		.suggestion = "Correct the configuration issue, if it still persists open an Issue"
diff --git a/eigrpd/eigrp_errors.h b/eigrpd/eigrp_errors.h
index e1ace8ab49..3270e65138 100644
--- a/eigrpd/eigrp_errors.h
+++ b/eigrpd/eigrp_errors.h
@@ -24,8 +24,8 @@
 #include "lib/ferr.h"
 
 enum eigrp_log_refs {
-	EIGRP_ERR_PACKET = EIGRP_FERR_START,
-	EIGRP_ERR_CONFIG,
+	EC_EIGRP_PACKET = EIGRP_FERR_START,
+	EC_EIGRP_CONFIG,
 };
 
 extern void eigrp_error_init(void);
diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c
index d438db28d6..acbd399537 100644
--- a/eigrpd/eigrp_hello.c
+++ b/eigrpd/eigrp_hello.c
@@ -421,7 +421,7 @@ void eigrp_sw_version_initialize(void)
 	ret = sscanf(ver_string, "%" SCNu32 ".%" SCNu32, &FRR_MAJOR,
 		     &FRR_MINOR);
 	if (ret != 2)
-		flog_err(EIGRP_ERR_PACKET,
+		flog_err(EC_EIGRP_PACKET,
 			  "Did not Properly parse %s, please fix VERSION string",
 			  VERSION);
 }
diff --git a/eigrpd/eigrp_neighbor.c b/eigrpd/eigrp_neighbor.c
index b10673d9e4..fc05b956b9 100644
--- a/eigrpd/eigrp_neighbor.c
+++ b/eigrpd/eigrp_neighbor.c
@@ -336,7 +336,7 @@ int eigrp_nbr_count_get(void)
 void eigrp_nbr_hard_restart(struct eigrp_neighbor *nbr, struct vty *vty)
 {
 	if (nbr == NULL) {
-		flog_err(EIGRP_ERR_CONFIG,
+		flog_err(EC_EIGRP_CONFIG,
 			  "Nbr Hard restart: Neighbor not specified.");
 		return;
 	}
diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c
index 6338e5cf74..2ace1e2ea9 100644
--- a/eigrpd/eigrp_packet.c
+++ b/eigrpd/eigrp_packet.c
@@ -354,7 +354,7 @@ int eigrp_write(struct thread *thread)
 		goto out;
 	}
 	if (ep->length < EIGRP_HEADER_LEN) {
-		flog_err(EIGRP_ERR_PACKET,
+		flog_err(EC_EIGRP_PACKET,
 			  "%s: Packet just has a header?", __PRETTY_FUNCTION__);
 		eigrp_header_dump((struct eigrp_header *)ep->s->data);
 		eigrp_packet_delete(ei);
diff --git a/eigrpd/eigrp_reply.c b/eigrpd/eigrp_reply.c
index b6e6352def..88b14b6021 100644
--- a/eigrpd/eigrp_reply.c
+++ b/eigrpd/eigrp_reply.c
@@ -170,7 +170,7 @@ void eigrp_reply_receive(struct eigrp *eigrp, struct ip *iph,
 		if (!dest) {
 			char buf[PREFIX_STRLEN];
 
-			flog_err(EIGRP_ERR_PACKET,
+			flog_err(EC_EIGRP_PACKET,
 				  "%s: Received prefix %s which we do not know about",
 				  __PRETTY_FUNCTION__,
 				  prefix2str(&dest_addr, buf, sizeof(buf)));
-- 
2.39.5