From: Ken Steele <ken@tilera.com>
Date: Wed, 26 Feb 2014 21:42:22 +0000 (-0500)
Subject: Move memcpy_lower() into new util-memcpy.h
X-Git-Tag: suricata-2.0rc2~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=970f22c752b692e585ec0e05b964ce62372c05d1;p=thirdparty%2Fsuricata.git

Move memcpy_lower() into new util-memcpy.h

Remove local copies from each MPM file and use include file instead.
Might be better to also add util-memcpy.c rather than inlining it each time,
to get smaller code, since only seems to be used at initialization.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 60037fe48c..834162cd23 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -312,6 +312,7 @@ util-logopenfile.h util-logopenfile.c \
 util-logopenfile-tile.h util-logopenfile-tile.c \
 util-magic.c util-magic.h \
 util-memcmp.c util-memcmp.h \
+util-memcpy.h \
 util-mem.h \
 util-memrchr.c util-memrchr.h \
 util-misc.c util-misc.h \
diff --git a/src/detect-engine-mpm.c b/src/detect-engine-mpm.c
index 5af9109781..266a734a13 100644
--- a/src/detect-engine-mpm.c
+++ b/src/detect-engine-mpm.c
@@ -37,6 +37,8 @@
 #include "detect-engine-iponly.h"
 #include "detect-parse.h"
 #include "util-mpm.h"
+#include "util-memcmp.h"
+#include "util-memcpy.h"
 #include "conf.h"
 #include "detect-fast-pattern.h"
 
diff --git a/src/util-memcpy.h b/src/util-memcpy.h
new file mode 100644
index 0000000000..bdb80242b7
--- /dev/null
+++ b/src/util-memcpy.h
@@ -0,0 +1,47 @@
+/* Copyright (C) 2014 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+/**
+ * \file
+ *
+ * \author Ken Steele <suricata@tilera.com>
+ *
+ * Memcpy_tolower()
+ *
+ */
+
+#ifndef __UTIL_MEMCPY_H__
+#define __UTIL_MEMCPY_H__
+
+/**
+ * \internal
+ * \brief Does a memcpy of the input string to lowercase.
+ *
+ * \param d   Pointer to the target area for memcpy.
+ * \param s   Pointer to the src string for memcpy.
+ * \param len len of the string sent in s.
+ */
+static inline void memcpy_tolower(uint8_t *d, uint8_t *s, uint16_t len)
+{
+    uint16_t i;
+    for (i = 0; i < len; i++)
+        d[i] = u8_tolower(s[i]);
+
+    return;
+}
+
+#endif /* __UTIL_MEMCPY_H__ */
diff --git a/src/util-mpm-ac-bs.c b/src/util-mpm-ac-bs.c
index b247eb73ac..faec5b2a59 100644
--- a/src/util-mpm-ac-bs.c
+++ b/src/util-mpm-ac-bs.c
@@ -58,6 +58,7 @@
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-memcmp.h"
+#include "util-memcpy.h"
 
 void SCACBSInitCtx(MpmCtx *);
 void SCACBSInitThreadCtx(MpmCtx *, MpmThreadCtx *, uint32_t);
@@ -238,23 +239,6 @@ static inline void SCACBSFreePattern(MpmCtx *mpm_ctx, SCACBSPattern *p)
     return;
 }
 
-/**
- * \internal
- * \brief Does a memcpy of the input string to lowercase.
- *
- * \param d   Pointer to the target area for memcpy.
- * \param s   Pointer to the src string for memcpy.
- * \param len len of the string sent in s.
- */
-static inline void memcpy_tolower(uint8_t *d, uint8_t *s, uint16_t len)
-{
-    uint16_t i;
-    for (i = 0; i < len; i++)
-        d[i] = u8_tolower(s[i]);
-
-    return;
-}
-
 static inline uint32_t SCACBSInitHash(SCACBSPattern *p)
 {
     uint32_t hash = p->len * p->original_pat[0];
diff --git a/src/util-mpm-ac-gfbs.c b/src/util-mpm-ac-gfbs.c
index eb91d4e158..28b1fc2b3d 100644
--- a/src/util-mpm-ac-gfbs.c
+++ b/src/util-mpm-ac-gfbs.c
@@ -49,6 +49,7 @@
 
 #include "conf.h"
 #include "util-memcmp.h"
+#include "util-memcpy.h"
 #include "util-debug.h"
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
@@ -231,23 +232,6 @@ static inline void SCACGfbsFreePattern(MpmCtx *mpm_ctx, SCACGfbsPattern *p)
     return;
 }
 
-/**
- * \internal
- * \brief Does a memcpy of the input string to lowercase.
- *
- * \param d   Pointer to the target area for memcpy.
- * \param s   Pointer to the src string for memcpy.
- * \param len len of the string sent in s.
- */
-static inline void memcpy_tolower(uint8_t *d, uint8_t *s, uint16_t len)
-{
-    uint16_t i;
-    for (i = 0; i < len; i++)
-        d[i] = u8_tolower(s[i]);
-
-    return;
-}
-
 static inline uint32_t SCACGfbsInitHash(SCACGfbsPattern *p)
 {
     uint32_t hash = p->len * p->original_pat[0];
diff --git a/src/util-mpm-ac-tile.c b/src/util-mpm-ac-tile.c
index cf32200394..6851143819 100644
--- a/src/util-mpm-ac-tile.c
+++ b/src/util-mpm-ac-tile.c
@@ -77,6 +77,7 @@
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-memcmp.h"
+#include "util-memcpy.h"
 #include "util-mpm-ac-tile.h"
 
 #ifndef __tile__
@@ -320,21 +321,6 @@ static void SCACTileFreePattern(MpmCtx *mpm_ctx, SCACTilePattern *p)
     }
 }
 
-/**
- * \internal
- * \brief Does a memcpy of the input string to lowercase.
- *
- * \param d   Pointer to the target area for memcpy.
- * \param s   Pointer to the src string for memcpy.
- * \param len len of the string sent in s.
- */
-static inline void memcpy_tolower(uint8_t *d, uint8_t *s, uint16_t len)
-{
-    uint16_t i;
-    for (i = 0; i < len; i++)
-        d[i] = u8_tolower(s[i]);
-}
-
 static inline uint32_t SCACTileInitHash(SCACTilePattern *p)
 {
     uint32_t hash = p->len * p->original_pat[0];
diff --git a/src/util-mpm-ac.c b/src/util-mpm-ac.c
index 7f081a247b..800e3db9f3 100644
--- a/src/util-mpm-ac.c
+++ b/src/util-mpm-ac.c
@@ -58,12 +58,12 @@
 #include "util-unittest-helper.h"
 #include "util-memcmp.h"
 #include "util-mpm-ac.h"
+#include "util-memcpy.h"
 
 #ifdef __SC_CUDA_SUPPORT__
 
 #include "util-mpm.h"
 #include "tm-threads.h"
-#include "util-mpm.h"
 #include "detect-engine-mpm.h"
 #include "util-cuda.h"
 #include "util-cuda-handlers.h"
@@ -226,23 +226,6 @@ static inline void SCACFreePattern(MpmCtx *mpm_ctx, SCACPattern *p)
     return;
 }
 
-/**
- * \internal
- * \brief Does a memcpy of the input string to lowercase.
- *
- * \param d   Pointer to the target area for memcpy.
- * \param s   Pointer to the src string for memcpy.
- * \param len len of the string sent in s.
- */
-static inline void memcpy_tolower(uint8_t *d, uint8_t *s, uint16_t len)
-{
-    uint16_t i;
-    for (i = 0; i < len; i++)
-        d[i] = u8_tolower(s[i]);
-
-    return;
-}
-
 static inline uint32_t SCACInitHash(SCACPattern *p)
 {
     uint32_t hash = p->len * p->original_pat[0];
diff --git a/src/util-mpm-b2g.c b/src/util-mpm-b2g.c
index 970268a2cf..70830976d7 100644
--- a/src/util-mpm-b2g.c
+++ b/src/util-mpm-b2g.c
@@ -42,6 +42,7 @@
 #include "util-debug.h"
 #include "util-unittest.h"
 #include "util-memcmp.h"
+#include "util-memcpy.h"
 #include "conf.h"
 
 #define INIT_HASH_SIZE 65536
@@ -166,13 +167,6 @@ static void B2gHashFree(MpmCtx *mpm_ctx, B2gPattern *hi) {
     B2gHashFree(mpm_ctx, t);
 }
 
-static inline void memcpy_tolower(uint8_t *d, uint8_t *s, uint16_t len) {
-    uint16_t i;
-    for (i = 0; i < len; i++) {
-        d[i] = u8_tolower(s[i]);
-    }
-}
-
 /*
  * INIT HASH START
  */
diff --git a/src/util-mpm-b3g.c b/src/util-mpm-b3g.c
index 5fde65cba6..1fa5d210b9 100644
--- a/src/util-mpm-b3g.c
+++ b/src/util-mpm-b3g.c
@@ -37,6 +37,7 @@
 #include "util-unittest.h"
 #include "conf.h"
 #include "util-debug.h"
+#include "util-memcpy.h"
 
 #define INIT_HASH_SIZE 65536
 
@@ -138,13 +139,6 @@ static void B3gHashFree(MpmCtx *mpm_ctx, B3gHashItem *hi) {
     SCFree(hi);
 }
 
-static inline void memcpy_tolower(uint8_t *d, uint8_t *s, uint16_t len) {
-    uint16_t i;
-    for (i = 0; i < len; i++) {
-        d[i] = u8_tolower(s[i]);
-    }
-}
-
 /*
  * INIT HASH START
  */