libextractor

commit 63c1bddc159b5337d3c87ef943e65a51eb1a629e
parent 1867de4ac395ad54da5fde5bd89c8dee62d9b2d9
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri,  3 Aug 2012 12:33:43 +0000

-use void**

Diffstat:
M
src/include/extractor.h
 | 
2
+-
M
src/main/extractor_plugin_main.c
 | 
2
+-
M
src/main/test_extractor.c
 | 
10
+++++-----

3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/include/extractor.h b/src/include/extractor.h
@@ -407,7 +407,7 @@ struct EXTRACTOR_ExtractContext
    *         -1 on error
    */
   ssize_t (*read) (void *cls,
-		   unsigned char **data,
+		   void **data,
 		   size_t size);
 
   
diff --git a/src/main/extractor_plugin_main.c b/src/main/extractor_plugin_main.c
@@ -214,7 +214,7 @@ plugin_env_seek (void *cls,
  */
 static ssize_t
 plugin_env_read (void *cls,
-		 unsigned char **data, size_t count)
+		 void **data, size_t count)
 {
   struct ProcessingContext *pc = cls;
   unsigned char *dp;
diff --git a/src/main/test_extractor.c b/src/main/test_extractor.c
@@ -47,7 +47,7 @@
 void
 EXTRACTOR_test_extract_method (struct EXTRACTOR_ExtractContext *ec)
 {
-  unsigned char *dp;
+  void *dp;
 
   if ((NULL == ec->config) || (0 != strcmp (ec->config, "test")))
     return; /* only run in test mode */
@@ -56,7 +56,7 @@ EXTRACTOR_test_extract_method (struct EXTRACTOR_ExtractContext *ec)
       fprintf (stderr, "Reading at offset 0 failed\n");
       abort (); 
     }
-  if (0 != strncmp ("test", (const char*) dp, 4))
+  if (0 != strncmp ("test", dp, 4))
     {
       fprintf (stderr, "Unexpected data at offset 0\n");
       abort (); 
@@ -77,7 +77,7 @@ EXTRACTOR_test_extract_method (struct EXTRACTOR_ExtractContext *ec)
       fprintf (stderr, "Failure to read at 100k + 4\n");
       abort ();
     }
-  if ((1024 * 100 + 4) % 256 != *dp)
+  if ((1024 * 100 + 4) % 256 != * (unsigned char *) dp)
     {
       fprintf (stderr, "Unexpected data at offset 100k + 4\n");
       abort ();
@@ -94,7 +94,7 @@ EXTRACTOR_test_extract_method (struct EXTRACTOR_ExtractContext *ec)
       fprintf (stderr, "Failure to read at 50k - 3\n");
       abort ();
     }
-  if (((1024 * 100 + 4) + 1 - (1024 * 50 + 7)) % 256 != *dp)
+  if (((1024 * 100 + 4) + 1 - (1024 * 50 + 7)) % 256 != * (unsigned char *) dp)
     {
       fprintf (stderr, "Unexpected data at offset 50k - 3\n");
       abort ();
@@ -121,7 +121,7 @@ EXTRACTOR_test_extract_method (struct EXTRACTOR_ExtractContext *ec)
       fprintf (stderr, "Failure to read at 150k - 3\n");
       abort ();
     }
-  if ((1024 * 150 - 2) % 256 != *dp)
+  if ((1024 * 150 - 2) % 256 != * (unsigned char *) dp)
     {
       fprintf (stderr, "Unexpected data at offset 150k - 3\n");
       abort ();