Fix pm algo's inline errors in gnu99

remotes/origin/master-1.0.x
Victor Julien 16 years ago
parent 0fa1936923
commit 951be71f92

@ -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);

@ -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)

@ -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);

Loading…
Cancel
Save