zebra: ZEBRA_[ERR|WARN] -> EC_ZEBRA

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

1 files changed, 11 insertions, 11 deletions

diff --git a/zebra/label_manager.c b/zebra/label_manager.c
index 793d6cfa1..442126e6d 100644
--- a/zebra/label_manager.c
+++ b/zebra/label_manager.c
@@ -83,7 +83,7 @@ static int relay_response_back(void)
 	ret = zclient_read_header(src, zclient->sock, &size, &marker, &version,
 				  &vrf_id, &resp_cmd);
 	if (ret < 0 && errno != EAGAIN) {
-		flog_err(ZEBRA_ERR_LM_RESPONSE,
+		flog_err(EC_ZEBRA_LM_RESPONSE,
 			  "Error reading Label Manager response: %s",
 			  strerror(errno));
 		return -1;
@@ -104,7 +104,7 @@ static int relay_response_back(void)
 	zserv = zserv_find_client(proto, instance);
 	if (!zserv) {
 		flog_err(
-			ZEBRA_ERR_LM_NO_SUCH_CLIENT,
+			EC_ZEBRA_LM_NO_SUCH_CLIENT,
 			"Error relaying LM response: can't find client %s, instance %u",
 			proto_str, instance);
 		return -1;
@@ -119,7 +119,7 @@ static int relay_response_back(void)
 	/* send response back */
 	ret = writen(zserv->sock, dst->data, stream_get_endp(dst));
 	if (ret <= 0) {
-		flog_err(ZEBRA_ERR_LM_RELAY_FAILED,
+		flog_err(EC_ZEBRA_LM_RELAY_FAILED,
 			  "Error relaying LM response to %s instance %u: %s",
 			  proto_str, instance, strerror(errno));
 		return -1;
@@ -187,7 +187,7 @@ int zread_relay_label_manager_request(int cmd, struct zserv *zserv,
 	unsigned short instance;
 
 	if (zclient->sock < 0) {
-		flog_err(ZEBRA_ERR_LM_NO_SOCKET,
+		flog_err(EC_ZEBRA_LM_NO_SOCKET,
 			  "Unable to relay LM request: no socket");
 		reply_error(cmd, zserv, vrf_id);
 		return -1;
@@ -209,7 +209,7 @@ int zread_relay_label_manager_request(int cmd, struct zserv *zserv,
 
 	/* check & set client proto if unset */
 	if (zserv->proto && zserv->proto != proto) {
-		flog_warn(ZEBRA_WARNING_LM_PROTO_MISMATCH,
+		flog_warn(EC_ZEBRAING_LM_PROTO_MISMATCH,
 			  "Client proto(%u) != msg proto(%u)", zserv->proto,
 			  proto);
 		return -1;
@@ -217,7 +217,7 @@ int zread_relay_label_manager_request(int cmd, struct zserv *zserv,
 
 	/* check & set client instance if unset */
 	if (zserv->instance && zserv->instance != instance) {
-		flog_err(ZEBRA_ERR_LM_BAD_INSTANCE,
+		flog_err(EC_ZEBRA_LM_BAD_INSTANCE,
 			  "Client instance(%u) != msg instance(%u)",
 			  zserv->instance, instance);
 		return -1;
@@ -240,7 +240,7 @@ int zread_relay_label_manager_request(int cmd, struct zserv *zserv,
 	/* Send request to external label manager */
 	ret = writen(zclient->sock, dst->data, stream_get_endp(dst));
 	if (ret <= 0) {
-		flog_err(ZEBRA_ERR_LM_RELAY_FAILED,
+		flog_err(EC_ZEBRA_LM_RELAY_FAILED,
 			  "Error relaying LM request from %s instance %u: %s",
 			  proto_str, instance, strerror(errno));
 		reply_error(cmd, zserv, vrf_id);
@@ -270,7 +270,7 @@ static int lm_zclient_connect(struct thread *t)
 		return 0;
 
 	if (zclient_socket_connect(zclient) < 0) {
-		flog_err(ZEBRA_ERR_LM_CLIENT_CONNECTION_FAILED,
+		flog_err(EC_ZEBRA_LM_CLIENT_CONNECTION_FAILED,
 			  "Error connecting synchronous zclient!");
 		thread_add_timer(zebrad.master, lm_zclient_connect, zclient,
 				 CONNECTION_DELAY, &zclient->t_connect);
@@ -400,7 +400,7 @@ struct label_manager_chunk *assign_label_chunk(uint8_t proto,
 				     ->end
 			     + 1;
 	if (lmc->start > MPLS_LABEL_UNRESERVED_MAX - size + 1) {
-		flog_err(ZEBRA_ERR_LM_EXHAUSTED_LABELS,
+		flog_err(EC_ZEBRA_LM_EXHAUSTED_LABELS,
 			  "Reached max labels. Start: %u, size: %u", lmc->start,
 			  size);
 		XFREE(MTYPE_LM_CHUNK, lmc);
@@ -440,7 +440,7 @@ int release_label_chunk(uint8_t proto, unsigned short instance, uint32_t start,
 		if (lmc->end != end)
 			continue;
 		if (lmc->proto != proto || lmc->instance != instance) {
-			flog_err(ZEBRA_ERR_LM_DAEMON_MISMATCH,
+			flog_err(EC_ZEBRA_LM_DAEMON_MISMATCH,
 				  "%s: Daemon mismatch!!", __func__);
 			continue;
 		}
@@ -451,7 +451,7 @@ int release_label_chunk(uint8_t proto, unsigned short instance, uint32_t start,
 		break;
 	}
 	if (ret != 0)
-		flog_err(ZEBRA_ERR_LM_UNRELEASED_CHUNK,
+		flog_err(EC_ZEBRA_LM_UNRELEASED_CHUNK,
 			  "%s: Label chunk not released!!", __func__);
 
 	return ret;