From 99fca03810a5aacbbc3ba70b9d94385c4e5691d0 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Tue, 22 Mar 2011 12:24:26 +0100 Subject: [PATCH] Move unittest code into UNITTESTS ifdefs in the HTP parser. Fixes a compiler warning. --- src/app-layer-htp.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/app-layer-htp.c b/src/app-layer-htp.c index f73be7fc59..c2a760823b 100644 --- a/src/app-layer-htp.c +++ b/src/app-layer-htp.c @@ -73,7 +73,6 @@ typedef struct HTPCfgRec_ { static SCRadixTree *cfgtree; /** List of HTP configurations. */ static HTPCfgRec cfglist; -static HTPCfgRec cfglist_backup; #ifdef DEBUG static SCMutex htp_state_mem_lock = PTHREAD_MUTEX_INITIALIZER; @@ -1104,24 +1103,6 @@ void AppLayerHtpPrintStats(void) { #endif } -static void HtpConfigCreateBackup(void) -{ - cfglist_backup.cfg = cfglist.cfg; - cfglist_backup.next = cfglist.next; - cfglist_backup.request_body_limit = cfglist.request_body_limit; - - return; -} - -static void HtpConfigRestoreBackup(void) -{ - cfglist.cfg = cfglist_backup.cfg; - cfglist.next = cfglist_backup.next; - cfglist.request_body_limit = cfglist_backup.request_body_limit; - - return; -} - /** * \brief Register the HTTP protocol and state handling functions to APP layer * of the engine. @@ -1161,6 +1142,25 @@ void AppLayerHtpRegisterExtraCallbacks(void) { #ifdef UNITTESTS +static HTPCfgRec cfglist_backup; + +static void HtpConfigCreateBackup(void) +{ + cfglist_backup.cfg = cfglist.cfg; + cfglist_backup.next = cfglist.next; + cfglist_backup.request_body_limit = cfglist.request_body_limit; + + return; +} + +static void HtpConfigRestoreBackup(void) +{ + cfglist.cfg = cfglist_backup.cfg; + cfglist.next = cfglist_backup.next; + cfglist.request_body_limit = cfglist_backup.request_body_limit; + + return; +} /** \test Test case where chunks are sent in smaller chunks and check the * response of the parser from HTP library. */