diff --git a/src/include/extractor.h b/src/include/extractor.h
index 0325dc6..782134b 100644
--- a/src/include/extractor.h
+++ b/src/include/extractor.h
@@ -35,7 +35,7 @@ extern "C" {
* 0.2.6-1 => 0x00020601
* 4.5.2-0 => 0x04050200
*/
-#define EXTRACTOR_VERSION 0x01060000
+#define EXTRACTOR_VERSION 0x01060001
#include <stdio.h>
diff --git a/src/plugins/gif_extractor.c b/src/plugins/gif_extractor.c
index aae2b82..8ee5807 100644
--- a/src/plugins/gif_extractor.c
+++ b/src/plugins/gif_extractor.c
@@ -43,7 +43,7 @@ gif_read_func (GifFileType *ft,
struct EXTRACTOR_ExtractContext *ec = ft->UserData;
void *data;
ssize_t ret;
-
+
ret = ec->read (ec->cls,
&data,
arg);
@@ -55,7 +55,7 @@ gif_read_func (GifFileType *ft,
/**
- * Main entry method for the 'image/gif' extraction plugin.
+ * Main entry method for the 'image/gif' extraction plugin.
*
* @param ec extraction context provided to the plugin
*/
@@ -72,7 +72,7 @@ EXTRACTOR_gif_extract_method (struct EXTRACTOR_ExtractContext *ec)
return; /* not a GIF */
#else
int gif_error;
-
+
gif_error = 0;
gif_file = DGifOpen (ec, &gif_read_func, &gif_error);
if (gif_file == NULL || gif_error != 0)
@@ -97,8 +97,8 @@ EXTRACTOR_gif_extract_method (struct EXTRACTOR_ExtractContext *ec)
return;
snprintf (dims,
sizeof (dims),
- "%dx%d",
- gif_file->SHeight,
+ "%dx%d",
+ gif_file->SHeight,
gif_file->SWidth);
if (0 !=
ec->proc (ec->cls,
@@ -111,7 +111,7 @@ EXTRACTOR_gif_extract_method (struct EXTRACTOR_ExtractContext *ec)
return;
while (1)
{
- if (GIF_OK !=
+ if (GIF_OK !=
DGifGetRecordType (gif_file,
&gif_type))
break;
@@ -122,6 +122,8 @@ EXTRACTOR_gif_extract_method (struct EXTRACTOR_ExtractContext *ec)
if (GIF_OK !=
DGifGetExtension (gif_file, &et, &ext))
continue;
+ if (NULL == ext)
+ continue;
if (COMMENT_EXT_FUNC_CODE == et)
{
ec->proc (ec->cls,
@@ -133,7 +135,7 @@ EXTRACTOR_gif_extract_method (struct EXTRACTOR_ExtractContext *ec)
(uint8_t) ext[0]);
break;
}
- while ( (GIF_ERROR !=
+ while ( (GIF_ERROR !=
DGifGetExtensionNext(gif_file, &ext)) &&
(NULL != ext) ) ; /* keep going */
}
diff --git a/src/plugins/it_extractor.c b/src/plugins/it_extractor.c
index 5b8a136..3d8803f 100644
--- a/src/plugins/it_extractor.c
+++ b/src/plugins/it_extractor.c
@@ -70,7 +70,7 @@ EXTRACTOR_it_extract_method (struct EXTRACTOR_ExtractContext *ec)
char itversion[8];
const struct Header *head;
- if (HEADER_SIZE >
+ if ((ssize_t) HEADER_SIZE >
ec->read (ec->cls,
&data,
HEADER_SIZE))
@@ -90,9 +90,9 @@ EXTRACTOR_it_extract_method (struct EXTRACTOR_ExtractContext *ec)
return;
/* Version of Tracker */
- snprintf (itversion,
+ snprintf (itversion,
sizeof (itversion),
- "%d.%d",
+ "%d.%d",
(head->version[0] & 0x01),
head->version[1]);
if (0 != ec->proc (ec->cls,
diff --git a/src/plugins/nsfe_extractor.c b/src/plugins/nsfe_extractor.c
index 6a8be86..7369477 100644
--- a/src/plugins/nsfe_extractor.c
+++ b/src/plugins/nsfe_extractor.c
@@ -175,7 +175,7 @@ info_extract (struct EXTRACTOR_ExtractContext *ec,
if (size < 8)
return 0;
- if (size >
+ if ((ssize_t) size >
ec->read (ec->cls,
&data,
size))
@@ -243,7 +243,7 @@ tlbl_extract (struct EXTRACTOR_ExtractContext *ec,
void *data;
const char *cdata;
- if (size >
+ if ((ssize_t) size >
ec->read (ec->cls,
&data,
size))
@@ -285,7 +285,7 @@ auth_extract (struct EXTRACTOR_ExtractContext *ec,
if (left < 1)
return 0;
- if (size >
+ if ((ssize_t) size >
ec->read (ec->cls,
&data,
size))
@@ -342,7 +342,7 @@ EXTRACTOR_nsfe_extract_method (struct EXTRACTOR_ExtractContext *ec)
uint32_t chunksize;
int ret;
- if (sizeof (struct header) >
+ if ((ssize_t) sizeof (struct header) >
ec->read (ec->cls,
&data,
sizeof (struct header)))
diff --git a/src/plugins/s3m_extractor.c b/src/plugins/s3m_extractor.c
index 9cd6f8f..c4789ce 100644
--- a/src/plugins/s3m_extractor.c
+++ b/src/plugins/s3m_extractor.c
@@ -80,7 +80,7 @@ EXTRACTOR_s3m_extract_method (struct EXTRACTOR_ExtractContext *ec)
struct S3MHeader header;
char song_name_NT[29];
- if (sizeof (header) >
+ if ((ssize_t) sizeof (header) >
ec->read (ec->cls,
&data,
sizeof (header)))
diff --git a/src/plugins/sid_extractor.c b/src/plugins/sid_extractor.c
index 571f677..dface42 100644
--- a/src/plugins/sid_extractor.c
+++ b/src/plugins/sid_extractor.c
@@ -116,7 +116,7 @@ struct header
/**
* Flags
*/
- sidwrd flags;
+ sidwrd flags;
/**
* Unknown.
@@ -176,7 +176,7 @@ EXTRACTOR_sid_extract_method (struct EXTRACTOR_ExtractContext *ec)
const struct header *head;
void *data;
- if (sizeof (struct header) >
+ if ((ssize_t) sizeof (struct header) >
ec->read (ec->cls,
&data,
sizeof (struct header)))
@@ -193,7 +193,7 @@ EXTRACTOR_sid_extract_method (struct EXTRACTOR_ExtractContext *ec)
/* Version of SID format */
version = sidword (head->sidversion);
- snprintf (sidversion,
+ snprintf (sidversion,
sizeof (sidversion),
"%d",
version);
@@ -208,7 +208,7 @@ EXTRACTOR_sid_extract_method (struct EXTRACTOR_ExtractContext *ec)
/* Get number of the first song to be played */
snprintf (startingsong,
sizeof (startingsong),
- "%d",
+ "%d",
sidword (head->firstsong));
ADD (startingsong, EXTRACTOR_METATYPE_STARTING_SONG);
@@ -218,9 +218,9 @@ EXTRACTOR_sid_extract_method (struct EXTRACTOR_ExtractContext *ec)
ADD (album, EXTRACTOR_METATYPE_ALBUM);
memcpy (&artist, head->artist, 32);
- artist[32] = '\0';
+ artist[32] = '\0';
ADD (artist, EXTRACTOR_METATYPE_ARTIST);
-
+
memcpy (©right, head->copyright, 32);
copyright[32] = '\0';
ADD (copyright, EXTRACTOR_METATYPE_COPYRIGHT);
@@ -236,24 +236,24 @@ EXTRACTOR_sid_extract_method (struct EXTRACTOR_ExtractContext *ec)
flags = sidword (head->flags);
/* MUS data */
if (0 != (flags & MUSPLAYER_FLAG))
- ADD ("Compute!'s Sidplayer", EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE);
+ ADD ("Compute!'s Sidplayer", EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE);
/* PlaySID data */
if (0 != (flags & PLAYSID_FLAG))
- ADD ("PlaySID", EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE);
+ ADD ("PlaySID", EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE);
/* PAL or NTSC */
if (0 != (flags & NTSC_FLAG))
- ADD ("PAL/NTSC", EXTRACTOR_METATYPE_BROADCAST_TELEVISION_SYSTEM);
+ ADD ("PAL/NTSC", EXTRACTOR_METATYPE_BROADCAST_TELEVISION_SYSTEM);
else if (0 != (flags & PAL_FLAG))
- ADD ("PAL", EXTRACTOR_METATYPE_BROADCAST_TELEVISION_SYSTEM);
+ ADD ("PAL", EXTRACTOR_METATYPE_BROADCAST_TELEVISION_SYSTEM);
/* Detect SID Chips suitable for play the files */
if (0 != (flags & MOS8580_FLAG))
- ADD ("MOS6581/MOS8580", EXTRACTOR_METATYPE_TARGET_ARCHITECTURE);
+ ADD ("MOS6581/MOS8580", EXTRACTOR_METATYPE_TARGET_ARCHITECTURE);
else if (0 != (flags & MOS6581_FLAG))
- ADD ("MOS6581", EXTRACTOR_METATYPE_TARGET_ARCHITECTURE);
+ ADD ("MOS6581", EXTRACTOR_METATYPE_TARGET_ARCHITECTURE);
}
/* end of sid_extractor.c */
diff --git a/src/plugins/xm_extractor.c b/src/plugins/xm_extractor.c
index a1aea27..d0b62bd 100644
--- a/src/plugins/xm_extractor.c
+++ b/src/plugins/xm_extractor.c
@@ -70,7 +70,7 @@ EXTRACTOR_xm_extract_method (struct EXTRACTOR_ExtractContext *ec)
char xmversion[8];
size_t n;
- if (sizeof (struct Header) >
+ if ((ssize_t) sizeof (struct Header) >
ec->read (ec->cls,
&data,
sizeof (struct Header)))
@@ -81,9 +81,9 @@ EXTRACTOR_xm_extract_method (struct EXTRACTOR_ExtractContext *ec)
return;
ADD("audio/x-xm", EXTRACTOR_METATYPE_MIMETYPE);
/* Version of Tracker */
- snprintf (xmversion,
+ snprintf (xmversion,
sizeof (xmversion),
- "%d.%d",
+ "%d.%d",
head->version[1],
head->version[0]);
ADD (xmversion, EXTRACTOR_METATYPE_FORMAT_VERSION);
@@ -99,7 +99,7 @@ EXTRACTOR_xm_extract_method (struct EXTRACTOR_ExtractContext *ec)
n = 19;
while ( (n > 0) && isspace ((unsigned char) tracker[n]))
n--;
- tracker[n + 1] = '\0';
+ tracker[n + 1] = '\0';
ADD (tracker, EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE);
return;
}
--
cgit v1.1