Merge pull request #5793 from ton31337/fix/formatting_show_bgp_summary_failed

[mirror_frr.git] / lib / buffer.c

diff --git a/lib/buffer.c b/lib/buffer.c
index bed42f047f3cc415b824f57438e258997e4b1516..766b9791a5d5034e5856239bb3e2e3ba2bd6ea94 100644 (file)
--- a/lib/buffer.c
+++ b/lib/buffer.c
@@ -114,12 +114,6 @@ char *buffer_getstr(struct buffer *b)
        return s;
 }
 
-/* Return 1 if buffer is empty. */
-int buffer_empty(struct buffer *b)
-{
-       return (b->head == NULL);
-}
-
 /* Clear and free all allocated data. */
 void buffer_reset(struct buffer *b)
 {
@@ -332,7 +326,7 @@ buffer_status_t buffer_flush_window(struct buffer *b, int fd, int width,
                        } else {
                                /* This should absolutely never occur. */
                                flog_err_sys(
-                                       LIB_ERR_SYSTEM_CALL,
+                                       EC_LIB_SYSTEM_CALL,
                                        "%s: corruption detected: iov_small overflowed; "
                                        "head %p, tail %p, head->next %p",
                                        __func__, (void *)b->head,
@@ -365,7 +359,7 @@ buffer_status_t buffer_flush_window(struct buffer *b, int fd, int width,
                        iov_size =
                                ((iov_index > IOV_MAX) ? IOV_MAX : iov_index);
                        if ((nbytes = writev(fd, c_iov, iov_size)) < 0) {
-                               flog_err(LIB_ERR_SOCKET,
+                               flog_err(EC_LIB_SOCKET,
                                         "%s: writev to fd %d failed: %s",
                                         __func__, fd, safe_strerror(errno));
                                break;
@@ -378,9 +372,8 @@ buffer_status_t buffer_flush_window(struct buffer *b, int fd, int width,
        }
 #else  /* IOV_MAX */
        if ((nbytes = writev(fd, iov, iov_index)) < 0)
-               flog_err(LIB_ERR_SOCKET,
-                        "%s: writev to fd %d failed: %s", __func__, fd,
-                        safe_strerror(errno));
+               flog_err(EC_LIB_SOCKET, "%s: writev to fd %d failed: %s",
+                        __func__, fd, safe_strerror(errno));
 #endif /* IOV_MAX */
 
        /* Free printed buffer data. */
@@ -440,18 +433,16 @@ in one shot. */
                if (ERRNO_IO_RETRY(errno))
                        /* Calling code should try again later. */
                        return BUFFER_PENDING;
-               flog_err(LIB_ERR_SOCKET,
-                        "%s: write error on fd %d: %s", __func__, fd,
-                         safe_strerror(errno));
+               flog_err(EC_LIB_SOCKET, "%s: write error on fd %d: %s",
+                        __func__, fd, safe_strerror(errno));
                return BUFFER_ERROR;
        }
 
        /* Free printed buffer data. */
        while (written > 0) {
-               struct buffer_data *d;
                if (!(d = b->head)) {
                        flog_err(
-                               LIB_ERR_DEVELOPMENT,
+                               EC_LIB_DEVELOPMENT,
                                "%s: corruption detected: buffer queue empty, but written is %lu",
                                __func__, (unsigned long)written);
                        break;
@@ -496,9 +487,8 @@ buffer_status_t buffer_write(struct buffer *b, int fd, const void *p,
                if (ERRNO_IO_RETRY(errno))
                        nbytes = 0;
                else {
-                       flog_err(LIB_ERR_SOCKET,
-                                "%s: write error on fd %d: %s", __func__, fd,
-                                safe_strerror(errno));
+                       flog_err(EC_LIB_SOCKET, "%s: write error on fd %d: %s",
+                                __func__, fd, safe_strerror(errno));
                        return BUFFER_ERROR;
                }
        }