diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-09-13 21:34:28 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-09-13 21:34:28 +0200 |
| commit | 450971aa994e68f7c62c4d45065223d5cfc4a22f (patch) | |
| tree | 0128a1e596823272333d8a6616dd2575e8d7c46b /lib/stream.c | |
| parent | zebra: ZEBRA_[ERR|WARN] -> EC_ZEBRA (diff) | |
| download | frr-450971aa994e68f7c62c4d45065223d5cfc4a22f.tar.xz frr-450971aa994e68f7c62c4d45065223d5cfc4a22f.zip | |
*: LIB_[ERR|WARN] -> EC_LIB
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'lib/stream.c')
| -rw-r--r-- | lib/stream.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/stream.c b/lib/stream.c index 8424a941d..21c02a5f5 100644 --- a/lib/stream.c +++ b/lib/stream.c @@ -54,7 +54,7 @@ DEFINE_MTYPE_STATIC(LIB, STREAM_FIFO, "Stream FIFO") * using stream_put..._at() functions. */ #define STREAM_WARN_OFFSETS(S) \ - flog_warn(LIB_WARN_STREAM, \ + flog_warn(EC_LIB_STREAM, \ "&(struct stream): %p, size: %lu, getp: %lu, endp: %lu\n", \ (void *)(S), (unsigned long)(S)->size, \ (unsigned long)(S)->getp, (unsigned long)(S)->endp) @@ -69,7 +69,7 @@ DEFINE_MTYPE_STATIC(LIB, STREAM_FIFO, "Stream FIFO") #define STREAM_BOUND_WARN(S, WHAT) \ do { \ - flog_warn(LIB_WARN_STREAM, "%s: Attempt to %s out of bounds", \ + flog_warn(EC_LIB_STREAM, "%s: Attempt to %s out of bounds", \ __func__, (WHAT)); \ STREAM_WARN_OFFSETS(S); \ assert(0); \ @@ -77,7 +77,7 @@ DEFINE_MTYPE_STATIC(LIB, STREAM_FIFO, "Stream FIFO") #define STREAM_BOUND_WARN2(S, WHAT) \ do { \ - flog_warn(LIB_WARN_STREAM, "%s: Attempt to %s out of bounds", \ + flog_warn(EC_LIB_STREAM, "%s: Attempt to %s out of bounds", \ __func__, (WHAT)); \ STREAM_WARN_OFFSETS(S); \ } while (0) @@ -87,7 +87,7 @@ DEFINE_MTYPE_STATIC(LIB, STREAM_FIFO, "Stream FIFO") do { \ if (((S)->endp + (Z)) > (S)->size) { \ flog_warn( \ - LIB_WARN_STREAM, \ + EC_LIB_STREAM, \ "CHECK_SIZE: truncating requested size %lu\n", \ (unsigned long)(Z)); \ STREAM_WARN_OFFSETS(S); \ @@ -968,7 +968,7 @@ ssize_t stream_read_try(struct stream *s, int fd, size_t size) /* Error: was it transient (return -2) or fatal (return -1)? */ if (ERRNO_IO_RETRY(errno)) return -2; - flog_err(LIB_ERR_SOCKET, "%s: read failed on fd %d: %s", __func__, fd, + flog_err(EC_LIB_SOCKET, "%s: read failed on fd %d: %s", __func__, fd, safe_strerror(errno)); return -1; } @@ -999,7 +999,7 @@ ssize_t stream_recvfrom(struct stream *s, int fd, size_t size, int flags, /* Error: was it transient (return -2) or fatal (return -1)? */ if (ERRNO_IO_RETRY(errno)) return -2; - flog_err(LIB_ERR_SOCKET, "%s: read failed on fd %d: %s", __func__, fd, + flog_err(EC_LIB_SOCKET, "%s: read failed on fd %d: %s", __func__, fd, safe_strerror(errno)); return -1; } |