From: Victor Julien Date: Mon, 24 Oct 2022 11:08:25 +0000 (+0200) Subject: error: remove unused alloc error code X-Git-Tag: suricata-7.0.0-rc1~230 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e855fa0fe72d345aa3617c07bdeccba81ca06d6b;p=thirdparty%2Fsuricata.git error: remove unused alloc error code --- diff --git a/src/util-error.c b/src/util-error.c index a2c2b55eef..65e50b4117 100644 --- a/src/util-error.c +++ b/src/util-error.c @@ -46,7 +46,6 @@ const char * SCErrorToString(SCError err) CASE_CODE(SC_ENOMEM); CASE_CODE(SC_EINVAL); - CASE_CODE (SC_ERR_MEM_ALLOC); CASE_CODE (SC_ERR_ACTION_ORDER); CASE_CODE (SC_ERR_PCRE_MATCH); CASE_CODE (SC_ERR_PCRE_GET_SUBSTRING); diff --git a/src/util-error.h b/src/util-error.h index 20f9b873c7..be7a480817 100644 --- a/src/util-error.h +++ b/src/util-error.h @@ -31,7 +31,6 @@ typedef enum { SC_ENOMEM, SC_EINVAL, - SC_ERR_MEM_ALLOC, SC_ERR_PCRE_MATCH, SC_ERR_ACTION_ORDER, SC_ERR_PCRE_GET_SUBSTRING, diff --git a/src/util-streaming-buffer.c b/src/util-streaming-buffer.c index b4bb890d91..f9c9c399a7 100644 --- a/src/util-streaming-buffer.c +++ b/src/util-streaming-buffer.c @@ -448,7 +448,7 @@ GrowToSize(StreamingBuffer *sb, uint32_t size) DEBUG_VALIDATE_BUG_ON(sb->buf_size > BIT_U32(30)); if (size > BIT_U32(30)) { // 1GiB if (!g2s_warn_once) { - SCLogWarning(SC_ERR_MEM_ALLOC, + SCLogWarning(SC_ENOMEM, "StreamingBuffer::GrowToSize() tried to alloc %u bytes, exceeds limit of %lu", size, BIT_U32(30)); g2s_warn_once = true; @@ -495,7 +495,7 @@ static int WARN_UNUSED Grow(StreamingBuffer *sb) uint32_t grow = sb->buf_size * 2; if (grow > BIT_U32(30)) { // 1GiB if (!grow_warn_once) { - SCLogWarning(SC_ERR_MEM_ALLOC, + SCLogWarning(SC_ENOMEM, "StreamingBuffer::Grow() tried to alloc %u bytes, exceeds limit of %lu", grow, BIT_U32(30)); grow_warn_once = true;