From 951be71f92cd57a560e6195b6e6e5392da98e3fa Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Tue, 27 Apr 2010 14:53:09 +0200 Subject: [PATCH] Fix pm algo's inline errors in gnu99 --- src/util-mpm-b2g.c | 2 +- src/util-mpm-b3g.c | 4 ++-- src/util-mpm-wumanber.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util-mpm-b2g.c b/src/util-mpm-b2g.c index f9b77a9059..dd64df16ad 100644 --- a/src/util-mpm-b2g.c +++ b/src/util-mpm-b2g.c @@ -301,7 +301,7 @@ void B2gFreePattern(MpmCtx *mpm_ctx, B2gPattern *p) { * \param sid signature id (internal id) * \param flags pattern MPM_PATTERN_* flags */ -static inline int B2gAddPattern(MpmCtx *mpm_ctx, uint8_t *pat, uint16_t patlen, uint16_t offset, uint16_t depth, uint32_t pid, uint32_t sid, uint8_t flags) { +static int B2gAddPattern(MpmCtx *mpm_ctx, uint8_t *pat, uint16_t patlen, uint16_t offset, uint16_t depth, uint32_t pid, uint32_t sid, uint8_t flags) { B2gCtx *ctx = (B2gCtx *)mpm_ctx->ctx; SCLogDebug("ctx %p len %"PRIu16" pid %" PRIu32, ctx, patlen, pid); diff --git a/src/util-mpm-b3g.c b/src/util-mpm-b3g.c index 3e99ada008..5bf2b559bd 100644 --- a/src/util-mpm-b3g.c +++ b/src/util-mpm-b3g.c @@ -276,7 +276,7 @@ void B3gFreePattern(MpmCtx *mpm_ctx, B3gPattern *p) { if (p) { SCFree(p); mpm_ctx->memory_cnt--; - mpm_ctx->memory_size -= sizeof(B3gPattern); + mpm_ctx->memory_size -= sizeof(B3gPattern); } } @@ -288,7 +288,7 @@ void B3gFreePattern(MpmCtx *mpm_ctx, B3gPattern *p) { * pid: pattern id * sid: signature id (internal id) */ -static inline int B3gAddPattern(MpmCtx *mpm_ctx, uint8_t *pat, uint16_t patlen, uint16_t offset, uint16_t depth, uint32_t pid, uint32_t sid, uint8_t flags) { +static int B3gAddPattern(MpmCtx *mpm_ctx, uint8_t *pat, uint16_t patlen, uint16_t offset, uint16_t depth, uint32_t pid, uint32_t sid, uint8_t flags) { B3gCtx *ctx = (B3gCtx *)mpm_ctx->ctx; if (patlen == 0) diff --git a/src/util-mpm-wumanber.c b/src/util-mpm-wumanber.c index 5fad8b9a73..d8a5c5d2f9 100644 --- a/src/util-mpm-wumanber.c +++ b/src/util-mpm-wumanber.c @@ -319,7 +319,7 @@ void WmFreePattern(MpmCtx *mpm_ctx, WmPattern *p) { if (p) { SCFree(p); mpm_ctx->memory_cnt--; - mpm_ctx->memory_size -= sizeof(WmPattern); + mpm_ctx->memory_size -= sizeof(WmPattern); } } @@ -331,7 +331,7 @@ void WmFreePattern(MpmCtx *mpm_ctx, WmPattern *p) { * pid: pattern id * sid: signature id (internal id) */ -static inline int WmAddPattern(MpmCtx *mpm_ctx, uint8_t *pat, uint16_t patlen, uint16_t offset, uint16_t depth, uint32_t pid, uint32_t sid, uint8_t flags) { +static int WmAddPattern(MpmCtx *mpm_ctx, uint8_t *pat, uint16_t patlen, uint16_t offset, uint16_t depth, uint32_t pid, uint32_t sid, uint8_t flags) { WmCtx *ctx = (WmCtx *)mpm_ctx->ctx; // printf("WmAddPattern: ctx %p \"", mpm_ctx); prt(pat, patlen);