diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-09-13 19:38:57 +0000 | 
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-09-13 19:38:57 +0000 | 
| commit | 1c50c1c0d683ebfa53c1607c71b8d26547e8f218 (patch) | |
| tree | 0dbb03af253cdcb0abeacaf6a860a4c7600359c5 /pimd | |
| parent | 450971aa994e68f7c62c4d45065223d5cfc4a22f (diff) | |
*: style for EC replacements
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'pimd')
| -rw-r--r-- | pimd/pim_msdp.c | 2 | ||||
| -rw-r--r-- | pimd/pim_msdp_packet.c | 4 | ||||
| -rw-r--r-- | pimd/pim_msdp_socket.c | 19 | ||||
| -rw-r--r-- | pimd/pim_pim.c | 4 | ||||
| -rw-r--r-- | pimd/pim_rp.c | 2 | ||||
| -rw-r--r-- | pimd/pim_ssm.c | 4 | ||||
| -rw-r--r-- | pimd/pim_zlookup.c | 14 | 
7 files changed, 24 insertions, 25 deletions
diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c index 8c6c43edf5..5a75ed329c 100644 --- a/pimd/pim_msdp.c +++ b/pimd/pim_msdp.c @@ -519,7 +519,7 @@ static void pim_msdp_sa_local_del_on_up_del(struct pim_instance *pim,  			 * changes; perhaps  			 * address this in the next release? - XXX  */  			flog_err( -				  EC_LIB_DEVELOPMENT, +				EC_LIB_DEVELOPMENT,  				"MSDP sa %s SPT teardown is causing the local entry to be removed",  				sa->sg_str);  			return; diff --git a/pimd/pim_msdp_packet.c b/pimd/pim_msdp_packet.c index 6208eaef2b..39e39b9557 100644 --- a/pimd/pim_msdp_packet.c +++ b/pimd/pim_msdp_packet.c @@ -485,8 +485,8 @@ 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 */  		flog_err(EC_PIM_MSDP_PACKET, -			  "rxed sa update with invalid prefix length %d", -			  prefix_len); +			 "rxed sa update with invalid prefix length %d", +			 prefix_len);  		return;  	}  	if (PIM_DEBUG_MSDP_PACKETS) { diff --git a/pimd/pim_msdp_socket.c b/pimd/pim_msdp_socket.c index a521ed5686..7997d3138a 100644 --- a/pimd/pim_msdp_socket.c +++ b/pimd/pim_msdp_socket.c @@ -74,8 +74,8 @@ static int pim_msdp_sock_accept(struct thread *thread)  	/* re-register accept thread */  	accept_sock = THREAD_FD(thread);  	if (accept_sock < 0) { -		flog_err(EC_LIB_DEVELOPMENT, -			  "accept_sock is negative value %d", accept_sock); +		flog_err(EC_LIB_DEVELOPMENT, "accept_sock is negative value %d", +			 accept_sock);  		return -1;  	}  	pim->msdp.listener.thread = NULL; @@ -96,8 +96,8 @@ static int pim_msdp_sock_accept(struct thread *thread)  		++pim->msdp.rejected_accepts;  		if (PIM_DEBUG_MSDP_EVENTS) {  			flog_err(EC_PIM_MSDP_PACKET, -				  "msdp peer connection refused from %s", -				  sockunion2str(&su, buf, SU_ADDRSTRLEN)); +				 "msdp peer connection refused from %s", +				 sockunion2str(&su, buf, SU_ADDRSTRLEN));  		}  		close(msdp_sock);  		return -1; @@ -141,8 +141,7 @@ int pim_msdp_sock_listen(struct pim_instance *pim)  	sock = socket(AF_INET, SOCK_STREAM, 0);  	if (sock < 0) { -		flog_err_sys(EC_LIB_SOCKET, "socket: %s", -			     safe_strerror(errno)); +		flog_err_sys(EC_LIB_SOCKET, "socket: %s", safe_strerror(errno));  		return sock;  	} @@ -162,8 +161,8 @@ int pim_msdp_sock_listen(struct pim_instance *pim)  			if_lookup_by_name(pim->vrf->name, pim->vrf_id);  		if (!ifp) {  			flog_err(EC_LIB_INTERFACE, -				  "%s: Unable to lookup vrf interface: %s", -				  __PRETTY_FUNCTION__, pim->vrf->name); +				 "%s: Unable to lookup vrf interface: %s", +				 __PRETTY_FUNCTION__, pim->vrf->name);  			close(sock);  			return -1;  		} @@ -243,8 +242,8 @@ int pim_msdp_sock_connect(struct pim_msdp_peer *mp)  			if_lookup_by_name(mp->pim->vrf->name, mp->pim->vrf_id);  		if (!ifp) {  			flog_err(EC_LIB_INTERFACE, -				  "%s: Unable to lookup vrf interface: %s", -				  __PRETTY_FUNCTION__, mp->pim->vrf->name); +				 "%s: Unable to lookup vrf interface: %s", +				 __PRETTY_FUNCTION__, mp->pim->vrf->name);  			return -1;  		}  		if (pim_socket_bind(mp->fd, ifp)) { diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c index c5410eef2a..0696a680e7 100644 --- a/pimd/pim_pim.c +++ b/pimd/pim_pim.c @@ -117,8 +117,8 @@ void pim_sock_delete(struct interface *ifp, const char *delete_message)  	if (!ifp->info) {  		flog_err(EC_PIM_CONFIG, -			  "%s: %s: but PIM not enabled on interface %s (!)", -			  __PRETTY_FUNCTION__, delete_message, ifp->name); +			 "%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 07b5e32c9f..51ca0945b9 100644 --- a/pimd/pim_rp.c +++ b/pimd/pim_rp.c @@ -114,7 +114,7 @@ void pim_rp_init(struct pim_instance *pim)  	if (!str2prefix("224.0.0.0/4", &rp_info->group)) {  		flog_err(EC_LIB_DEVELOPMENT, -			  "Unable to convert 224.0.0.0/4 to prefix"); +			 "Unable to convert 224.0.0.0/4 to prefix");  		list_delete_and_null(&pim->rp_list);  		route_table_finish(pim->rp_table);  		XFREE(MTYPE_PIM_RP, rp_info); diff --git a/pimd/pim_ssm.c b/pimd/pim_ssm.c index d04d90ac81..dfc7063fd0 100644 --- a/pimd/pim_ssm.c +++ b/pimd/pim_ssm.c @@ -74,8 +74,8 @@ static int pim_is_grp_standard_ssm(struct prefix *group)  	if (first) {  		if (!str2prefix(PIM_SSM_STANDARD_RANGE, &group_ssm))  			flog_err(EC_LIB_DEVELOPMENT, -				  "%s: Failure to Read Group Address: %s", -				  __PRETTY_FUNCTION__, PIM_SSM_STANDARD_RANGE); +				 "%s: Failure to Read Group Address: %s", +				 __PRETTY_FUNCTION__, PIM_SSM_STANDARD_RANGE);  		first = 0;  	} diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c index 5f0b827925..48a228c744 100644 --- a/pimd/pim_zlookup.c +++ b/pimd/pim_zlookup.c @@ -124,7 +124,7 @@ void zclient_lookup_new(void)  	zlookup = zclient_new_notify(master, &zclient_options_default);  	if (!zlookup) {  		flog_err(EC_LIB_ZAPI_SOCKET, "%s: zclient_new() failure", -			  __PRETTY_FUNCTION__); +			 __PRETTY_FUNCTION__);  		return;  	} @@ -171,8 +171,8 @@ static int zclient_read_nexthop(struct pim_instance *pim,  					  &version, &vrf_id, &command);  		if (err < 0) {  			flog_err(EC_LIB_ZAPI_MISSMATCH, -				  "%s: zclient_read_header() failed", -				  __PRETTY_FUNCTION__); +				 "%s: zclient_read_header() failed", +				 __PRETTY_FUNCTION__);  			zclient_lookup_failed(zlookup);  			return -1;  		} @@ -316,8 +316,8 @@ static int zclient_lookup_nexthop_once(struct pim_instance *pim,  	/* Check socket. */  	if (zlookup->sock < 0) {  		flog_err(EC_LIB_ZAPI_SOCKET, -			  "%s: zclient lookup socket is not connected", -			  __PRETTY_FUNCTION__); +			 "%s: zclient lookup socket is not connected", +			 __PRETTY_FUNCTION__);  		zclient_lookup_failed(zlookup);  		return -1;  	} @@ -536,8 +536,8 @@ int pim_zlookup_sg_statistics(struct channel_oil *c_oil)  					  &version, &vrf_id, &command);  		if (err < 0) {  			flog_err(EC_LIB_ZAPI_MISSMATCH, -				  "%s: zclient_read_header() failed", -				  __PRETTY_FUNCTION__); +				 "%s: zclient_read_header() failed", +				 __PRETTY_FUNCTION__);  			zclient_lookup_failed(zlookup);  			return -1;  		}  | 
