[GNUnet-SVN] r21749 - in Extractor/src: main plugins

[gnunet]

Author: grothoff
Date: 2012-06-04 00:31:16 +0200 (Mon, 04 Jun 2012)
New Revision: 21749

Modified:
   Extractor/src/main/extractor.c
   Extractor/src/plugins/id3v2_extractor.c
Log:
-fixing misc. compiler warnings

Modified: Extractor/src/main/extractor.c
===================================================================
--- Extractor/src/main/extractor.c      2012-06-03 22:31:06 UTC (rev 21748)
+++ Extractor/src/main/extractor.c      2012-06-03 22:31:16 UTC (rev 21749)
@@ -366,7 +366,6 @@
   int in, out;
   int read_result1, read_result2, read_result3, read_result4;
   unsigned char code;
-  void *shm_ptr = NULL;
   char *shm_name = NULL;
   size_t shm_name_len;
 
@@ -1658,7 +1657,7 @@
     else
     {
       int64_t ret = count < (bfds->buffer_bytes - bfds->buffer_pos) ? count : 
(bfds->buffer_bytes - bfds->buffer_pos);
-      *buf_ptr = &bfds->data[bfds->buffer_pos];
+      *buf_ptr = (unsigned char*) &bfds->data[bfds->buffer_pos];
       bfds->buffer_pos += ret;
       return ret;
     }
@@ -1668,7 +1667,7 @@
     if (bfds->data == NULL)
       *buf_ptr = &bfds->buffer[bfds->buffer_pos];
     else
-      *buf_ptr = &bfds->data[bfds->buffer_pos];
+      *buf_ptr = (unsigned char*) &bfds->data[bfds->buffer_pos];
     bfds->buffer_pos += count;
     return count;
   }
@@ -1784,7 +1783,7 @@
 #endif
 };
 
-int
+void
 cfs_delete (struct CompressedFileSource *cfs)
 {
 #if WINDOWS
@@ -1829,12 +1828,10 @@
   cfs->shm_pos = 0;
   cfs->shm_buf_size = 0;
 
-#if HAVE_ZLIB
-  z_stream strm;
-#endif
   return 1;
 }
 
+
 static int
 cfs_reset_stream_bz2 (struct CompressedFileSource *cfs)
 {
@@ -1882,7 +1879,6 @@
 
   if (data[3] & 0x8) /* FNAME set */
   {
-    int64_t fp = cfs->fpos;
     int64_t buf_bytes;
     int len;
     unsigned char *buf, *cptr;
@@ -1916,7 +1912,6 @@
 
   if (data[3] & 0x16) /* FCOMMENT set */
   {
-    int64_t fp = cfs->fpos;
     int64_t buf_bytes;
     int len;
     unsigned char *buf, *cptr;
@@ -2037,7 +2032,6 @@
 cfs_new (struct BufferedFileDataSource *bfds, int64_t fsize, enum 
ExtractorCompressionType compression_type, EXTRACTOR_MetaDataProcessor proc, 
void *proc_cls)
 {
   int shm_result;
-  size_t map_size;
   struct CompressedFileSource *cfs;
   cfs = malloc (sizeof (struct CompressedFileSource));
   if (cfs == NULL)
@@ -2488,6 +2482,7 @@
     }
     return 0;
   }
+  return -1;
 }
 
 /**
@@ -3273,9 +3268,6 @@
   struct stat64 fstatbuf;
   int64_t fsize = 0;
   enum ExtractorCompressionType compression_type = -1;
-  void *buffer = NULL;
-  size_t buffer_size;
-  int decompression_result;
   struct CompressedFileSource *cfs = NULL;
 
   /* If data is not given, then we need to read it from the file. Try opening 
it */

Modified: Extractor/src/plugins/id3v2_extractor.c
===================================================================
--- Extractor/src/plugins/id3v2_extractor.c     2012-06-03 22:31:06 UTC (rev 
21748)
+++ Extractor/src/plugins/id3v2_extractor.c     2012-06-03 22:31:16 UTC (rev 
21749)
@@ -255,8 +255,6 @@
 EXTRACTOR_id3v2_extract_method (struct EXTRACTOR_PluginList *plugin,
     EXTRACTOR_MetaDataProcessor proc, void *proc_cls)
 {
-  int64_t file_position;
-  int64_t file_size;
   int64_t offset = 0;
   int64_t size;
   struct id3v2_state *state;