diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-08-03 20:03:29 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-08-14 22:02:05 +0200 |
| commit | af4c27286d8eb3f347ff431a17a47a8d07cd8976 (patch) | |
| tree | caf5eae55c21f72baec4945cdb2cbc333d99f916 /pimd/pim_zlookup.c | |
| parent | lib: remove still reachable blocks in ferr.c (diff) | |
| download | frr-af4c27286d8eb3f347ff431a17a47a8d07cd8976.tar.xz frr-af4c27286d8eb3f347ff431a17a47a8d07cd8976.zip | |
*: rename zlog_fer -> flog_err
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_zlookup.c')
| -rw-r--r-- | pimd/pim_zlookup.c | 16 |
1 files changed, 8 insertions, 8 deletions
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), |