*: rename zlog_fer -> flog_err

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

15 files changed, 56 insertions, 56 deletions

diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index 96ec35be7..c137fc1f6 100644
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -97,7 +97,7 @@ static int igmp_sock_open(struct in_addr ifaddr, struct interface *ifp,
 	}
 
 	if (!join) {
-		zlog_ferr(LIB_ERR_SOCKET,
+		flog_err(LIB_ERR_SOCKET,
 			  "IGMP socket fd=%d could not join any group on interface address %s",
 			  fd, inet_ntoa(ifaddr));
 		close(fd);
@@ -698,7 +698,7 @@ static void sock_close(struct igmp_sock *igmp)
 	THREAD_OFF(igmp->t_igmp_read);
 
 	if (close(igmp->fd)) {
-		zlog_ferr(
+		flog_err(
 			LIB_ERR_SOCKET,
 			"Failure closing IGMP socket %s fd=%d on interface %s: errno=%d: %s",
 			inet_ntoa(igmp->ifaddr), igmp->fd,
diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c
index 38f26f7ae..7b21376c9 100644
--- a/pimd/pim_igmpv3.c
+++ b/pimd/pim_igmpv3.c
@@ -1584,7 +1584,7 @@ void igmp_v3_send_query(struct igmp_group *group, int fd, const char *ifname,
 
 	msg_size = IGMP_V3_SOURCES_OFFSET + (num_sources << 2);
 	if (msg_size > query_buf_size) {
-		zlog_ferr(
+		flog_err(
 			LIB_ERR_DEVELOPMENT,
 			"%s %s: unable to send: msg_size=%zd larger than query_buf_size=%d",
 			__FILE__, __PRETTY_FUNCTION__, msg_size,
diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index 9b0599caf..6028e5ba1 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -57,7 +57,7 @@ static int pim_mroute_set(struct pim_instance *pim, int enable)
 	 */
 	if (pim->vrf_id != VRF_DEFAULT) {
 		if (pimd_privs.change(ZPRIVS_RAISE))
-			zlog_ferr(
+			flog_err(
 				LIB_ERR_PRIVILEGES,
 				"pim_mroute_socket_enable: could not raise privs, %s",
 				safe_strerror(errno));
@@ -75,7 +75,7 @@ static int pim_mroute_set(struct pim_instance *pim, int enable)
 		}
 
 		if (pimd_privs.change(ZPRIVS_LOWER))
-			zlog_ferr(
+			flog_err(
 				LIB_ERR_PRIVILEGES,
 				"pim_mroute_socket_enable: could not lower privs, %s",
 				safe_strerror(errno));
@@ -712,7 +712,7 @@ int pim_mroute_socket_enable(struct pim_instance *pim)
 	int fd;
 
 	if (pimd_privs.change(ZPRIVS_RAISE))
-		zlog_ferr(LIB_ERR_PRIVILEGES,
+		flog_err(LIB_ERR_PRIVILEGES,
 			  "pim_mroute_socket_enable: could not raise privs, %s",
 			  safe_strerror(errno));
 
@@ -736,7 +736,7 @@ int pim_mroute_socket_enable(struct pim_instance *pim)
 #endif
 
 	if (pimd_privs.change(ZPRIVS_LOWER))
-		zlog_ferr(LIB_ERR_PRIVILEGES,
+		flog_err(LIB_ERR_PRIVILEGES,
 			  "pim_mroute_socket_enable: could not lower privs, %s",
 			  safe_strerror(errno));
 
diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c
index c15b87f92..7fcf42e8c 100644
--- a/pimd/pim_msdp.c
+++ b/pimd/pim_msdp.c
@@ -518,7 +518,7 @@ static void pim_msdp_sa_local_del_on_up_del(struct pim_instance *pim,
 			 * the flow. Accounting for such cases requires lot of
 			 * changes; perhaps
 			 * address this in the next release? - XXX  */
-			zlog_ferr(
+			flog_err(
 				  LIB_ERR_DEVELOPMENT,
 				"MSDP sa %s SPT teardown is causing the local entry to be removed",
 				sa->sg_str);
diff --git a/pimd/pim_msdp_packet.c b/pimd/pim_msdp_packet.c
index 5c950e8dc..2b3f45c70 100644
--- a/pimd/pim_msdp_packet.c
+++ b/pimd/pim_msdp_packet.c
@@ -147,7 +147,7 @@ static void pim_msdp_connect_check(struct pim_msdp_peer *mp)
 
 	/* If getsockopt is fail, this is fatal error. */
 	if (ret < 0) {
-		zlog_ferr(LIB_ERR_SOCKET,
+		flog_err(LIB_ERR_SOCKET,
 			  "can't get sockopt for nonblocking connect");
 		pim_msdp_peer_reset_tcp_conn(mp, "connect-failed");
 		return;
@@ -484,7 +484,7 @@ static void pim_msdp_pkt_sa_rx_one(struct pim_msdp_peer *mp, struct in_addr rp)
 
 	if (prefix_len != 32) {
 		/* ignore SA update if the prefix length is not 32 */
-		zlog_ferr(PIM_ERR_MSDP_PACKET,
+		flog_err(PIM_ERR_MSDP_PACKET,
 			  "rxed sa update with invalid prefix length %d",
 			  prefix_len);
 		return;
diff --git a/pimd/pim_msdp_socket.c b/pimd/pim_msdp_socket.c
index d5bd34557..6f334ca75 100644
--- a/pimd/pim_msdp_socket.c
+++ b/pimd/pim_msdp_socket.c
@@ -43,7 +43,7 @@ static void pim_msdp_update_sock_send_buffer_size(int fd)
 	socklen_t optlen = sizeof(optval);
 
 	if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &optval, &optlen) < 0) {
-		zlog_ferr(LIB_ERR_SOCKET, "getsockopt of SO_SNDBUF failed %s\n",
+		flog_err(LIB_ERR_SOCKET, "getsockopt of SO_SNDBUF failed %s\n",
 			  safe_strerror(errno));
 		return;
 	}
@@ -51,7 +51,7 @@ static void pim_msdp_update_sock_send_buffer_size(int fd)
 	if (optval < size) {
 		if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size))
 		    < 0) {
-			zlog_ferr(LIB_ERR_SOCKET,
+			flog_err(LIB_ERR_SOCKET,
 				  "Couldn't increase send buffer: %s\n",
 				  safe_strerror(errno));
 		}
@@ -73,7 +73,7 @@ static int pim_msdp_sock_accept(struct thread *thread)
 	/* re-register accept thread */
 	accept_sock = THREAD_FD(thread);
 	if (accept_sock < 0) {
-		zlog_ferr(LIB_ERR_DEVELOPMENT,
+		flog_err(LIB_ERR_DEVELOPMENT,
 			  "accept_sock is negative value %d", accept_sock);
 		return -1;
 	}
@@ -84,7 +84,7 @@ static int pim_msdp_sock_accept(struct thread *thread)
 	/* accept client connection. */
 	msdp_sock = sockunion_accept(accept_sock, &su);
 	if (msdp_sock < 0) {
-		zlog_ferr(LIB_ERR_SOCKET, "pim_msdp_sock_accept failed (%s)",
+		flog_err(LIB_ERR_SOCKET, "pim_msdp_sock_accept failed (%s)",
 			  safe_strerror(errno));
 		return -1;
 	}
@@ -94,7 +94,7 @@ static int pim_msdp_sock_accept(struct thread *thread)
 	if (!mp || !PIM_MSDP_PEER_IS_LISTENER(mp)) {
 		++pim->msdp.rejected_accepts;
 		if (PIM_DEBUG_MSDP_EVENTS) {
-			zlog_ferr(PIM_ERR_MSDP_PACKET,
+			flog_err(PIM_ERR_MSDP_PACKET,
 				  "msdp peer connection refused from %s",
 				  sockunion2str(&su, buf, SU_ADDRSTRLEN));
 		}
@@ -140,7 +140,7 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
 
 	sock = socket(AF_INET, SOCK_STREAM, 0);
 	if (sock < 0) {
-		zlog_ferr(LIB_ERR_SOCKET, "socket: %s", safe_strerror(errno));
+		flog_err(LIB_ERR_SOCKET, "socket: %s", safe_strerror(errno));
 		return sock;
 	}
 
@@ -159,14 +159,14 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
 		struct interface *ifp =
 			if_lookup_by_name(pim->vrf->name, pim->vrf_id);
 		if (!ifp) {
-			zlog_ferr(LIB_ERR_INTERFACE,
+			flog_err(LIB_ERR_INTERFACE,
 				  "%s: Unable to lookup vrf interface: %s",
 				  __PRETTY_FUNCTION__, pim->vrf->name);
 			close(sock);
 			return -1;
 		}
 		if (pim_socket_bind(sock, ifp)) {
-			zlog_ferr(LIB_ERR_SOCKET,
+			flog_err(LIB_ERR_SOCKET,
 				  "%s: Unable to bind to socket: %s",
 				  __PRETTY_FUNCTION__, safe_strerror(errno));
 			close(sock);
@@ -175,7 +175,7 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
 	}
 
 	if (pimd_privs.change(ZPRIVS_RAISE)) {
-		zlog_ferr(LIB_ERR_PRIVILEGES,
+		flog_err(LIB_ERR_PRIVILEGES,
 			  "pim_msdp_socket: could not raise privs, %s",
 			  safe_strerror(errno));
 	}
@@ -184,13 +184,13 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
 	rc = bind(sock, (struct sockaddr *)&sin, socklen);
 
 	if (pimd_privs.change(ZPRIVS_LOWER)) {
-		zlog_ferr(LIB_ERR_PRIVILEGES,
+		flog_err(LIB_ERR_PRIVILEGES,
 			  "pim_msdp_socket: could not lower privs, %s",
 			  safe_strerror(errno));
 	}
 
 	if (rc < 0) {
-		zlog_ferr(LIB_ERR_SOCKET, "pim_msdp_socket bind to port %d: %s",
+		flog_err(LIB_ERR_SOCKET, "pim_msdp_socket bind to port %d: %s",
 			  ntohs(sin.sin_port), safe_strerror(errno));
 		close(sock);
 		return rc;
@@ -198,7 +198,7 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
 
 	rc = listen(sock, 3 /* backlog */);
 	if (rc < 0) {
-		zlog_ferr(LIB_ERR_SOCKET, "pim_msdp_socket listen: %s",
+		flog_err(LIB_ERR_SOCKET, "pim_msdp_socket listen: %s",
 			  safe_strerror(errno));
 		close(sock);
 		return rc;
@@ -239,7 +239,7 @@ int pim_msdp_sock_connect(struct pim_msdp_peer *mp)
 	/* Make socket for the peer. */
 	mp->fd = sockunion_socket(&mp->su_peer);
 	if (mp->fd < 0) {
-		zlog_ferr(LIB_ERR_SOCKET, "pim_msdp_socket socket failure: %s",
+		flog_err(LIB_ERR_SOCKET, "pim_msdp_socket socket failure: %s",
 			  safe_strerror(errno));
 		return -1;
 	}
@@ -248,13 +248,13 @@ int pim_msdp_sock_connect(struct pim_msdp_peer *mp)
 		struct interface *ifp =
 			if_lookup_by_name(mp->pim->vrf->name, mp->pim->vrf_id);
 		if (!ifp) {
-			zlog_ferr(LIB_ERR_INTERFACE,
+			flog_err(LIB_ERR_INTERFACE,
 				  "%s: Unable to lookup vrf interface: %s",
 				  __PRETTY_FUNCTION__, mp->pim->vrf->name);
 			return -1;
 		}
 		if (pim_socket_bind(mp->fd, ifp)) {
-			zlog_ferr(LIB_ERR_SOCKET,
+			flog_err(LIB_ERR_SOCKET,
 				  "%s: Unable to bind to socket: %s",
 				  __PRETTY_FUNCTION__, safe_strerror(errno));
 			close(mp->fd);
@@ -273,7 +273,7 @@ int pim_msdp_sock_connect(struct pim_msdp_peer *mp)
 	/* source bind */
 	rc = sockunion_bind(mp->fd, &mp->su_local, 0, &mp->su_local);
 	if (rc < 0) {
-		zlog_ferr(LIB_ERR_SOCKET,
+		flog_err(LIB_ERR_SOCKET,
 			  "pim_msdp_socket connect bind failure: %s",
 			  safe_strerror(errno));
 		close(mp->fd);
diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c
index 0aaf6127d..11d847636 100644
--- a/pimd/pim_neighbor.c
+++ b/pimd/pim_neighbor.c
@@ -800,7 +800,7 @@ void pim_neighbor_update(struct pim_neighbor *neigh,
 
 	if (neigh->prefix_list == addr_list) {
 		if (addr_list) {
-			zlog_ferr(
+			flog_err(
 				LIB_ERR_DEVELOPMENT,
 				"%s: internal error: trying to replace same prefix list=%p",
 				__PRETTY_FUNCTION__, (void *)addr_list);
diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c
index 6fb0b2892..b103da2e1 100644
--- a/pimd/pim_pim.c
+++ b/pimd/pim_pim.c
@@ -116,7 +116,7 @@ void pim_sock_delete(struct interface *ifp, const char *delete_message)
 		  delete_message);
 
 	if (!ifp->info) {
-		zlog_ferr(PIM_ERR_CONFIG,
+		flog_err(PIM_ERR_CONFIG,
 			  "%s: %s: but PIM not enabled on interface %s (!)",
 			  __PRETTY_FUNCTION__, delete_message, ifp->name);
 		return;
diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c
index 77e76c3b0..efcca6599 100644
--- a/pimd/pim_rp.c
+++ b/pimd/pim_rp.c
@@ -111,7 +111,7 @@ void pim_rp_init(struct pim_instance *pim)
 	rp_info = XCALLOC(MTYPE_PIM_RP, sizeof(*rp_info));
 
 	if (!str2prefix("224.0.0.0/4", &rp_info->group)) {
-		zlog_ferr(LIB_ERR_DEVELOPMENT,
+		flog_err(LIB_ERR_DEVELOPMENT,
 			  "Unable to convert 224.0.0.0/4 to prefix");
 		list_delete_and_null(&pim->rp_list);
 		route_table_finish(pim->rp_table);
@@ -233,7 +233,7 @@ static struct rp_info *pim_rp_find_match_group(struct pim_instance *pim,
 
 	rn = route_node_match(pim->rp_table, group);
 	if (!rn) {
-		zlog_ferr(
+		flog_err(
 			LIB_ERR_DEVELOPMENT,
 			"%s: BUG We should have found default group information\n",
 			__PRETTY_FUNCTION__);
@@ -622,7 +622,7 @@ int pim_rp_del(struct pim_instance *pim, const char *rp,
 		rn = route_node_get(pim->rp_table, &rp_info->group);
 		if (rn) {
 			if (rn->info != rp_info)
-				zlog_ferr(
+				flog_err(
 					LIB_ERR_DEVELOPMENT,
 					"Expected rn->info to be equal to rp_info");
 
diff --git a/pimd/pim_sock.c b/pimd/pim_sock.c
index 44e051804..2a93b4ad7 100644
--- a/pimd/pim_sock.c
+++ b/pimd/pim_sock.c
@@ -47,14 +47,14 @@ int pim_socket_raw(int protocol)
 	int fd;
 
 	if (pimd_privs.change(ZPRIVS_RAISE))
-		zlog_ferr(LIB_ERR_PRIVILEGES,
+		flog_err(LIB_ERR_PRIVILEGES,
 			  "pim_sockek_raw: could not raise privs, %s",
 			  safe_strerror(errno));
 
 	fd = socket(AF_INET, SOCK_RAW, protocol);
 
 	if (pimd_privs.change(ZPRIVS_LOWER))
-		zlog_ferr(LIB_ERR_PRIVILEGES,
+		flog_err(LIB_ERR_PRIVILEGES,
 			  "pim_socket_raw: could not lower privs, %s",
 			  safe_strerror(errno));
 
@@ -72,16 +72,16 @@ void pim_socket_ip_hdr(int fd)
 	const int on = 1;
 
 	if (pimd_privs.change(ZPRIVS_RAISE))
-		zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s",
+		flog_err(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s",
 			  __PRETTY_FUNCTION__, safe_strerror(errno));
 
 	if (setsockopt(fd, IPPROTO_IP, IP_HDRINCL, &on, sizeof(on)))
-		zlog_ferr(LIB_ERR_SOCKET,
+		flog_err(LIB_ERR_SOCKET,
 			  "%s: Could not turn on IP_HDRINCL option: %s",
 			  __PRETTY_FUNCTION__, safe_strerror(errno));
 
 	if (pimd_privs.change(ZPRIVS_LOWER))
-		zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s",
+		flog_err(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s",
 			  __PRETTY_FUNCTION__, safe_strerror(errno));
 }
 
@@ -95,14 +95,14 @@ int pim_socket_bind(int fd, struct interface *ifp)
 #ifdef SO_BINDTODEVICE
 
 	if (pimd_privs.change(ZPRIVS_RAISE))
-		zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s",
+		flog_err(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s",
 			  __PRETTY_FUNCTION__, safe_strerror(errno));
 
 	ret = setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, ifp->name,
 			 strlen(ifp->name));
 
 	if (pimd_privs.change(ZPRIVS_LOWER))
-		zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s",
+		flog_err(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s",
 			  __PRETTY_FUNCTION__, safe_strerror(errno));
 
 #endif
@@ -165,7 +165,7 @@ int pim_socket_mcast(int protocol, struct in_addr ifaddr, struct interface *ifp,
 				fd, errno, safe_strerror(errno));
 		}
 #else
-		zlog_ferr(
+		flog_err(
 			LIB_ERR_DEVELOPMENT,
 			"%s %s: Missing IP_PKTINFO and IP_RECVDSTADDR: unable to get dst addr from recvmsg()",
 			__FILE__, __PRETTY_FUNCTION__);
@@ -303,7 +303,7 @@ int pim_socket_join(int fd, struct in_addr group, struct in_addr ifaddr,
 			       sizeof(ifaddr_str)))
 			sprintf(ifaddr_str, "<ifaddr?>");
 
-		zlog_ferr(
+		flog_err(
 			LIB_ERR_SOCKET,
 			"Failure socket joining fd=%d group %s on interface address %s: errno=%d: %s",
 			fd, group_str, ifaddr_str, errno, safe_strerror(errno));
diff --git a/pimd/pim_ssm.c b/pimd/pim_ssm.c
index f10cef9ce..8347878d3 100644
--- a/pimd/pim_ssm.c
+++ b/pimd/pim_ssm.c
@@ -73,7 +73,7 @@ static int pim_is_grp_standard_ssm(struct prefix *group)
 
 	if (first) {
 		if (!str2prefix(PIM_SSM_STANDARD_RANGE, &group_ssm))
-			zlog_ferr(LIB_ERR_DEVELOPMENT,
+			flog_err(LIB_ERR_DEVELOPMENT,
 				  "%s: Failure to Read Group Address: %s",
 				  __PRETTY_FUNCTION__, PIM_SSM_STANDARD_RANGE);
 
diff --git a/pimd/pim_ssmpingd.c b/pimd/pim_ssmpingd.c
index 3cb49079b..6e8542793 100644
--- a/pimd/pim_ssmpingd.c
+++ b/pimd/pim_ssmpingd.c
@@ -83,7 +83,7 @@ static int ssmpingd_socket(struct in_addr addr, int port, int mttl)
 
 	fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 	if (fd < 0) {
-		zlog_ferr(LIB_ERR_SOCKET,
+		flog_err(LIB_ERR_SOCKET,
 			  "%s: could not create socket: errno=%d: %s",
 			  __PRETTY_FUNCTION__, errno, safe_strerror(errno));
 		return -1;
@@ -126,7 +126,7 @@ static int ssmpingd_socket(struct in_addr addr, int port, int mttl)
 				safe_strerror(errno));
 		}
 #else
-		zlog_ferr(
+		flog_err(
 			LIB_ERR_DEVELOPMENT,
 			"%s %s: missing IP_PKTINFO and IP_RECVDSTADDR: unable to get dst addr from recvmsg()",
 			__FILE__, __PRETTY_FUNCTION__);
diff --git a/pimd/pim_time.c b/pimd/pim_time.c
index ed2942d59..a15695c9e 100644
--- a/pimd/pim_time.c
+++ b/pimd/pim_time.c
@@ -35,7 +35,7 @@ static int gettime_monotonic(struct timeval *tv)
 
 	result = gettimeofday(tv, 0);
 	if (result) {
-		zlog_ferr(LIB_ERR_SYSTEM_CALL,
+		flog_err(LIB_ERR_SYSTEM_CALL,
 			  "%s: gettimeofday() failure: errno=%d: %s",
 			  __PRETTY_FUNCTION__, errno, safe_strerror(errno));
 	}
@@ -52,7 +52,7 @@ int64_t pim_time_monotonic_sec()
 	struct timeval now_tv;
 
 	if (gettime_monotonic(&now_tv)) {
-		zlog_ferr(LIB_ERR_SYSTEM_CALL,
+		flog_err(LIB_ERR_SYSTEM_CALL,
 			  "%s: gettime_monotonic() failure: errno=%d: %s",
 			  __PRETTY_FUNCTION__, errno, safe_strerror(errno));
 		return -1;
@@ -71,7 +71,7 @@ int64_t pim_time_monotonic_dsec()
 	int64_t now_dsec;
 
 	if (gettime_monotonic(&now_tv)) {
-		zlog_ferr(LIB_ERR_SYSTEM_CALL,
+		flog_err(LIB_ERR_SYSTEM_CALL,
 			  "%s: gettime_monotonic() failure: errno=%d: %s",
 			  __PRETTY_FUNCTION__, errno, safe_strerror(errno));
 		return -1;
@@ -89,7 +89,7 @@ int64_t pim_time_monotonic_usec(void)
 	int64_t now_dsec;
 
 	if (gettime_monotonic(&now_tv)) {
-		zlog_ferr(LIB_ERR_SYSTEM_CALL,
+		flog_err(LIB_ERR_SYSTEM_CALL,
 			  "%s: gettime_monotonic() failure: errno=%d: %s",
 			  __PRETTY_FUNCTION__, errno, safe_strerror(errno));
 		return -1;
diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c
index 8b67fb7f5..68e50d4b0 100644
--- a/pimd/pim_zlookup.c
+++ b/pimd/pim_zlookup.c
@@ -123,7 +123,7 @@ void zclient_lookup_new(void)
 {
 	zlookup = zclient_new_notify(master, &zclient_options_default);
 	if (!zlookup) {
-		zlog_ferr(LIB_ERR_ZAPI_SOCKET, "%s: zclient_new() failure",
+		flog_err(LIB_ERR_ZAPI_SOCKET, "%s: zclient_new() failure",
 			  __PRETTY_FUNCTION__);
 		return;
 	}
@@ -170,7 +170,7 @@ static int zclient_read_nexthop(struct pim_instance *pim,
 		err = zclient_read_header(s, zlookup->sock, &length, &marker,
 					  &version, &vrf_id, &command);
 		if (err < 0) {
-			zlog_ferr(LIB_ERR_ZAPI_MISSMATCH,
+			flog_err(LIB_ERR_ZAPI_MISSMATCH,
 				  "%s: zclient_read_header() failed",
 				  __PRETTY_FUNCTION__);
 			zclient_lookup_failed(zlookup);
@@ -315,7 +315,7 @@ static int zclient_lookup_nexthop_once(struct pim_instance *pim,
 
 	/* Check socket. */
 	if (zlookup->sock < 0) {
-		zlog_ferr(LIB_ERR_ZAPI_SOCKET,
+		flog_err(LIB_ERR_ZAPI_SOCKET,
 			  "%s: zclient lookup socket is not connected",
 			  __PRETTY_FUNCTION__);
 		zclient_lookup_failed(zlookup);
@@ -337,7 +337,7 @@ static int zclient_lookup_nexthop_once(struct pim_instance *pim,
 
 	ret = writen(zlookup->sock, s->data, stream_get_endp(s));
 	if (ret < 0) {
-		zlog_ferr(
+		flog_err(
 			LIB_ERR_SOCKET,
 			"%s: writen() failure: %d writing to zclient lookup socket",
 			__PRETTY_FUNCTION__, errno);
@@ -345,7 +345,7 @@ static int zclient_lookup_nexthop_once(struct pim_instance *pim,
 		return -2;
 	}
 	if (ret == 0) {
-		zlog_ferr(LIB_ERR_SOCKET,
+		flog_err(LIB_ERR_SOCKET,
 			  "%s: connection closed on zclient lookup socket",
 			  __PRETTY_FUNCTION__);
 		zclient_lookup_failed(zlookup);
@@ -515,7 +515,7 @@ int pim_zlookup_sg_statistics(struct channel_oil *c_oil)
 	count = stream_get_endp(s);
 	ret = writen(zlookup->sock, s->data, count);
 	if (ret <= 0) {
-		zlog_ferr(
+		flog_err(
 			LIB_ERR_SOCKET,
 			"%s: writen() failure: %d writing to zclient lookup socket",
 			__PRETTY_FUNCTION__, errno);
@@ -535,7 +535,7 @@ int pim_zlookup_sg_statistics(struct channel_oil *c_oil)
 		err = zclient_read_header(s, zlookup->sock, &length, &marker,
 					  &version, &vrf_id, &command);
 		if (err < 0) {
-			zlog_ferr(LIB_ERR_ZAPI_MISSMATCH,
+			flog_err(LIB_ERR_ZAPI_MISSMATCH,
 				  "%s: zclient_read_header() failed",
 				  __PRETTY_FUNCTION__);
 			zclient_lookup_failed(zlookup);
@@ -552,7 +552,7 @@ int pim_zlookup_sg_statistics(struct channel_oil *c_oil)
 
 			more.src = c_oil->oil.mfcc_origin;
 			more.grp = c_oil->oil.mfcc_mcastgrp;
-			zlog_ferr(
+			flog_err(
 				LIB_ERR_ZAPI_MISSMATCH,
 				"%s: Received wrong %s(%s) information requested",
 				__PRETTY_FUNCTION__, pim_str_sg_dump(&more),
diff --git a/pimd/pimd.c b/pimd/pimd.c
index f5ec37285..dd0c7e3c2 100644
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@ -85,7 +85,7 @@ static void pim_free()
 void pim_init()
 {
 	if (!inet_aton(PIM_ALL_PIM_ROUTERS, &qpim_all_pim_routers_addr)) {
-		zlog_ferr(
+		flog_err(
 			LIB_ERR_SOCKET,
 			"%s %s: could not solve %s to group address: errno=%d: %s",
 			__FILE__, __PRETTY_FUNCTION__, PIM_ALL_PIM_ROUTERS,