*: rename ferr_zlog -> flog_err_sys

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

3 files changed, 20 insertions, 18 deletions

diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index d90e6983a1..14d692ebf0 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -1294,9 +1294,9 @@ static int bgp_connect_success(struct peer *peer)
 	}
 
 	if (bgp_getsockname(peer) < 0) {
-		flog_err(LIB_ERR_SOCKET,
-			  "%s: bgp_getsockname(): failed for peer %s, fd %d",
-			  __FUNCTION__, peer->host, peer->fd);
+		flog_err_sys(LIB_ERR_SOCKET,
+			     "%s: bgp_getsockname(): failed for peer %s, fd %d",
+			     __FUNCTION__, peer->host, peer->fd);
 		bgp_notify_send(peer, BGP_NOTIFY_FSM_ERR,
 				0); /* internal error */
 		bgp_writes_on(peer);
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index db50ae828f..666cc5bb86 100644
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -296,8 +296,8 @@ static int bgp_accept(struct thread *thread)
 	/* Register accept thread. */
 	accept_sock = THREAD_FD(thread);
 	if (accept_sock < 0) {
-		flog_err(LIB_ERR_SOCKET, "accept_sock is nevative value %d",
-			  accept_sock);
+		flog_err_sys(LIB_ERR_SOCKET, "accept_sock is nevative value %d",
+			     accept_sock);
 		return -1;
 	}
 	listener->thread = NULL;
@@ -308,9 +308,9 @@ static int bgp_accept(struct thread *thread)
 	/* Accept client connection. */
 	bgp_sock = sockunion_accept(accept_sock, &su);
 	if (bgp_sock < 0) {
-		flog_err(LIB_ERR_SOCKET,
-			  "[Error] BGP socket accept failed (%s)",
-			  safe_strerror(errno));
+		flog_err_sys(LIB_ERR_SOCKET,
+			     "[Error] BGP socket accept failed (%s)",
+			     safe_strerror(errno));
 		return -1;
 	}
 	set_nonblocking(bgp_sock);
@@ -681,13 +681,14 @@ static int bgp_listener(int sock, struct sockaddr *sa, socklen_t salen,
 			  __func__);
 
 	if (ret < 0) {
-		flog_err(LIB_ERR_SOCKET, "bind: %s", safe_strerror(en));
+		flog_err_sys(LIB_ERR_SOCKET, "bind: %s", safe_strerror(en));
 		return ret;
 	}
 
 	ret = listen(sock, SOMAXCONN);
 	if (ret < 0) {
-		flog_err(LIB_ERR_SOCKET, "listen: %s", safe_strerror(errno));
+		flog_err_sys(LIB_ERR_SOCKET, "listen: %s",
+			     safe_strerror(errno));
 		return ret;
 	}
 
@@ -730,7 +731,8 @@ int bgp_socket(struct bgp *bgp, unsigned short port, const char *address)
 	if (bgpd_privs.change(ZPRIVS_LOWER))
 		flog_err(LIB_ERR_PRIVILEGES, "Can't lower privileges");
 	if (ret != 0) {
-		flog_err(LIB_ERR_SOCKET, "getaddrinfo: %s", gai_strerror(ret));
+		flog_err_sys(LIB_ERR_SOCKET, "getaddrinfo: %s",
+			     gai_strerror(ret));
 		return -1;
 	}
 
@@ -750,8 +752,8 @@ int bgp_socket(struct bgp *bgp, unsigned short port, const char *address)
 		if (bgpd_privs.change(ZPRIVS_LOWER))
 			flog_err(LIB_ERR_PRIVILEGES, "Can't lower privileges");
 		if (sock < 0) {
-			flog_err(LIB_ERR_SOCKET, "socket: %s",
-				  safe_strerror(errno));
+			flog_err_sys(LIB_ERR_SOCKET, "socket: %s",
+				     safe_strerror(errno));
 			continue;
 		}
 
@@ -772,8 +774,8 @@ int bgp_socket(struct bgp *bgp, unsigned short port, const char *address)
 			LIB_ERR_SOCKET,
 			"%s: no usable addresses please check other programs usage of specified port %d",
 			__func__, port);
-		flog_err(LIB_ERR_SOCKET, "%s: Program cannot continue",
-			  __func__);
+		flog_err_sys(LIB_ERR_SOCKET, "%s: Program cannot continue",
+			     __func__);
 		exit(-1);
 	}
 
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index 3c49b9692d..bb474b9e20 100644
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -1304,9 +1304,9 @@ static int bgp_open_receive(struct peer *peer, bgp_size_t size)
 
 	/* Get sockname. */
 	if ((ret = bgp_getsockname(peer)) < 0) {
-		flog_err(LIB_ERR_SOCKET,
-			  "%s: bgp_getsockname() failed for peer: %s",
-			  __FUNCTION__, peer->host);
+		flog_err_sys(LIB_ERR_SOCKET,
+			     "%s: bgp_getsockname() failed for peer: %s",
+			     __FUNCTION__, peer->host);
 		return BGP_Stop;
 	}