From 9d3a9273dd6805f6b9258da395841698a1b6af77 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Wed, 20 Jan 2010 21:06:16 +0100
Subject: [PATCH] Rename fmem_t to SCFmem and make sure it's not exported.

---
 src/util-fmemopen.c | 16 +++++++++++-----
 src/util-fmemopen.h |  7 -------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/util-fmemopen.c b/src/util-fmemopen.c
index a1b08e15cb..af32aa9d3f 100644
--- a/src/util-fmemopen.c
+++ b/src/util-fmemopen.c
@@ -22,6 +22,12 @@
 
 #ifdef USE_FMEM_WRAPPER
 
+typedef struct SCFmem_ {
+    size_t pos;
+    size_t size;
+    char *buffer;
+} SCFmem;
+
 /**
  * \brief Seek the mem file from offset and whence
  * \param handler pointer to the memfile
@@ -31,7 +37,7 @@
  */
 static fpos_t SeekFn(void *handler, fpos_t offset, int whence) {
     size_t pos = 0;
-    fmem_t *mem = handler;
+    SCFmem *mem = handler;
 
     switch (whence) {
         case SEEK_SET:
@@ -61,7 +67,7 @@ static fpos_t SeekFn(void *handler, fpos_t offset, int whence) {
  */
 static int ReadFn(void *handler, char *buf, int size) {
     size_t count = 0;
-    fmem_t *mem = handler;
+    SCFmem *mem = handler;
     size_t available = mem->size - mem->pos;
 
     if (size < 0) return - 1;
@@ -84,7 +90,7 @@ static int ReadFn(void *handler, char *buf, int size) {
  */
 static int WriteFn(void *handler, const char *buf, int size) {
     size_t count = 0;
-    fmem_t *mem = handler;
+    SCFmem *mem = handler;
     size_t available = mem->size - mem->pos;
 
     if (size < 0) return - 1;
@@ -116,9 +122,9 @@ static int CloseFn(void *handler) {
  * \retval pointer to the file; NULL if something is wrong
  */
 FILE *SCFmemopen(void *buf, size_t size, const char *mode) {
-    fmem_t *mem = (fmem_t *) malloc(sizeof(fmem_t));
+    SCFmem *mem = (fmem_t *) malloc(sizeof(fmem_t));
 
-    memset(mem, 0, sizeof(fmem_t));
+    memset(mem, 0, sizeof(SCFmem));
     mem->size = size, mem->buffer = buf;
 
     return funopen(mem, ReadFn, WriteFn, SeekFn, CloseFn);
diff --git a/src/util-fmemopen.h b/src/util-fmemopen.h
index 06533a155e..299b27feae 100644
--- a/src/util-fmemopen.h
+++ b/src/util-fmemopen.h
@@ -14,13 +14,6 @@
 #endif
 
 #ifdef USE_FMEM_WRAPPER
-struct fmem {
-    size_t pos;
-    size_t size;
-    char *buffer;
-};
-typedef struct fmem fmem_t;
-
 FILE *SCFmemopen(void *, size_t, const char *);
 #else
 /* Else use the normal fmemopen */