diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-08-03 12:33:43 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-08-03 12:33:43 +0000 |
commit | 63c1bddc159b5337d3c87ef943e65a51eb1a629e (patch) | |
tree | 7f5d2a7ba8917a7c77adf91e6fd805d99e472ebc | |
parent | 1867de4ac395ad54da5fde5bd89c8dee62d9b2d9 (diff) | |
download | libextractor-63c1bddc159b5337d3c87ef943e65a51eb1a629e.tar.gz libextractor-63c1bddc159b5337d3c87ef943e65a51eb1a629e.zip |
-use void**
-rw-r--r-- | src/include/extractor.h | 2 | ||||
-rw-r--r-- | src/main/extractor_plugin_main.c | 2 | ||||
-rw-r--r-- | 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 index a227ea5..77f0e63 100644 --- a/src/include/extractor.h +++ b/src/include/extractor.h | |||
@@ -407,7 +407,7 @@ struct EXTRACTOR_ExtractContext | |||
407 | * -1 on error | 407 | * -1 on error |
408 | */ | 408 | */ |
409 | ssize_t (*read) (void *cls, | 409 | ssize_t (*read) (void *cls, |
410 | unsigned char **data, | 410 | void **data, |
411 | size_t size); | 411 | size_t size); |
412 | 412 | ||
413 | 413 | ||
diff --git a/src/main/extractor_plugin_main.c b/src/main/extractor_plugin_main.c index 0e09438..f9eed28 100644 --- a/src/main/extractor_plugin_main.c +++ b/src/main/extractor_plugin_main.c | |||
@@ -214,7 +214,7 @@ plugin_env_seek (void *cls, | |||
214 | */ | 214 | */ |
215 | static ssize_t | 215 | static ssize_t |
216 | plugin_env_read (void *cls, | 216 | plugin_env_read (void *cls, |
217 | unsigned char **data, size_t count) | 217 | void **data, size_t count) |
218 | { | 218 | { |
219 | struct ProcessingContext *pc = cls; | 219 | struct ProcessingContext *pc = cls; |
220 | unsigned char *dp; | 220 | unsigned char *dp; |
diff --git a/src/main/test_extractor.c b/src/main/test_extractor.c index 13aa1c8..ca3b737 100644 --- a/src/main/test_extractor.c +++ b/src/main/test_extractor.c | |||
@@ -47,7 +47,7 @@ | |||
47 | void | 47 | void |
48 | EXTRACTOR_test_extract_method (struct EXTRACTOR_ExtractContext *ec) | 48 | EXTRACTOR_test_extract_method (struct EXTRACTOR_ExtractContext *ec) |
49 | { | 49 | { |
50 | unsigned char *dp; | 50 | void *dp; |
51 | 51 | ||
52 | if ((NULL == ec->config) || (0 != strcmp (ec->config, "test"))) | 52 | if ((NULL == ec->config) || (0 != strcmp (ec->config, "test"))) |
53 | return; /* only run in test mode */ | 53 | return; /* only run in test mode */ |
@@ -56,7 +56,7 @@ EXTRACTOR_test_extract_method (struct EXTRACTOR_ExtractContext *ec) | |||
56 | fprintf (stderr, "Reading at offset 0 failed\n"); | 56 | fprintf (stderr, "Reading at offset 0 failed\n"); |
57 | abort (); | 57 | abort (); |
58 | } | 58 | } |
59 | if (0 != strncmp ("test", (const char*) dp, 4)) | 59 | if (0 != strncmp ("test", dp, 4)) |
60 | { | 60 | { |
61 | fprintf (stderr, "Unexpected data at offset 0\n"); | 61 | fprintf (stderr, "Unexpected data at offset 0\n"); |
62 | abort (); | 62 | abort (); |
@@ -77,7 +77,7 @@ EXTRACTOR_test_extract_method (struct EXTRACTOR_ExtractContext *ec) | |||
77 | fprintf (stderr, "Failure to read at 100k + 4\n"); | 77 | fprintf (stderr, "Failure to read at 100k + 4\n"); |
78 | abort (); | 78 | abort (); |
79 | } | 79 | } |
80 | if ((1024 * 100 + 4) % 256 != *dp) | 80 | if ((1024 * 100 + 4) % 256 != * (unsigned char *) dp) |
81 | { | 81 | { |
82 | fprintf (stderr, "Unexpected data at offset 100k + 4\n"); | 82 | fprintf (stderr, "Unexpected data at offset 100k + 4\n"); |
83 | abort (); | 83 | abort (); |
@@ -94,7 +94,7 @@ EXTRACTOR_test_extract_method (struct EXTRACTOR_ExtractContext *ec) | |||
94 | fprintf (stderr, "Failure to read at 50k - 3\n"); | 94 | fprintf (stderr, "Failure to read at 50k - 3\n"); |
95 | abort (); | 95 | abort (); |
96 | } | 96 | } |
97 | if (((1024 * 100 + 4) + 1 - (1024 * 50 + 7)) % 256 != *dp) | 97 | if (((1024 * 100 + 4) + 1 - (1024 * 50 + 7)) % 256 != * (unsigned char *) dp) |
98 | { | 98 | { |
99 | fprintf (stderr, "Unexpected data at offset 50k - 3\n"); | 99 | fprintf (stderr, "Unexpected data at offset 50k - 3\n"); |
100 | abort (); | 100 | abort (); |
@@ -121,7 +121,7 @@ EXTRACTOR_test_extract_method (struct EXTRACTOR_ExtractContext *ec) | |||
121 | fprintf (stderr, "Failure to read at 150k - 3\n"); | 121 | fprintf (stderr, "Failure to read at 150k - 3\n"); |
122 | abort (); | 122 | abort (); |
123 | } | 123 | } |
124 | if ((1024 * 150 - 2) % 256 != *dp) | 124 | if ((1024 * 150 - 2) % 256 != * (unsigned char *) dp) |
125 | { | 125 | { |
126 | fprintf (stderr, "Unexpected data at offset 150k - 3\n"); | 126 | fprintf (stderr, "Unexpected data at offset 150k - 3\n"); |
127 | abort (); | 127 | abort (); |