From 552558894c274dd24248e132ffaa3baefbd76fb5 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Wed, 5 Mar 2014 12:17:20 +0100 Subject: [PATCH] app-layer: cleanups Clean up AppLayerParserThreadCtxAlloc and AppLayerParserThreadCtxFree. Both used confusing variables in loops, with the wrong types. --- src/app-layer-parser.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/app-layer-parser.c b/src/app-layer-parser.c index 858cc7d9bd..e60211bf2f 100644 --- a/src/app-layer-parser.c +++ b/src/app-layer-parser.c @@ -189,8 +189,8 @@ AppLayerParserThreadCtx *AppLayerParserThreadCtxAlloc(void) { SCEnter(); - AppProto i = 0; - int j = 0; + AppProto alproto = 0; + int flow_proto = 0; AppLayerParserThreadCtx *tctx; tctx = SCMalloc(sizeof(*tctx)); @@ -198,10 +198,12 @@ AppLayerParserThreadCtx *AppLayerParserThreadCtxAlloc(void) goto end; memset(tctx, 0, sizeof(*tctx)); - for (i = 0; i < FLOW_PROTO_DEFAULT; i++) { - for (j = 0; j < ALPROTO_MAX; j++) { - tctx->alproto_local_storage[i][j] = - AppLayerParserGetProtocolParserLocalStorage(FlowGetReverseProtoMapping(i), j); + for (flow_proto = 0; flow_proto < FLOW_PROTO_DEFAULT; flow_proto++) { + for (alproto = 0; alproto < ALPROTO_MAX; alproto++) { + uint8_t ipproto = FlowGetReverseProtoMapping(flow_proto); + + tctx->alproto_local_storage[flow_proto][alproto] = + AppLayerParserGetProtocolParserLocalStorage(ipproto, alproto); } } @@ -213,14 +215,15 @@ void AppLayerParserThreadCtxFree(AppLayerParserThreadCtx *tctx) { SCEnter(); - AppProto i = 0; - int j = 0; + AppProto alproto = 0; + int flow_proto = 0; + + for (flow_proto = 0; flow_proto < FLOW_PROTO_DEFAULT; flow_proto++) { + for (alproto = 0; alproto < ALPROTO_MAX; alproto++) { + uint8_t ipproto = FlowGetReverseProtoMapping(flow_proto); - for (i = 0; i < FLOW_PROTO_DEFAULT; i++) { - for (j = 0; j < ALPROTO_MAX; j++) { - AppLayerParserDestroyProtocolParserLocalStorage(FlowGetReverseProtoMapping(i), - j, - tctx->alproto_local_storage[i][j]); + AppLayerParserDestroyProtocolParserLocalStorage(ipproto, alproto, + tctx->alproto_local_storage[flow_proto][alproto]); } }