[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libextractor] 01/02: fix misc NULL pointer exceptions
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [libextractor] 01/02: fix misc NULL pointer exceptions |
|
Date: |
Wed, 01 Nov 2017 09:10:34 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository libextractor.
commit 7cc63b001ceaf81143795321379c835486d0c92e
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed Nov 1 09:07:35 2017 +0100
fix misc NULL pointer exceptions
---
ChangeLog | 5 +++++
po/de.po | 20 ++++++++++----------
po/fr.po | 20 ++++++++++----------
po/ga.po | 20 ++++++++++----------
po/it.po | 20 ++++++++++----------
po/libextractor.pot | 20 ++++++++++----------
po/nl.po | 20 ++++++++++----------
po/pl.po | 20 ++++++++++----------
po/ro.po | 20 ++++++++++----------
po/rw.po | 20 ++++++++++----------
po/sr.po | 20 ++++++++++----------
po/sv.po | 20 ++++++++++----------
po/uk.po | 20 ++++++++++----------
po/vi.po | 20 ++++++++++----------
src/include/extractor.h | 2 +-
src/plugins/gif_extractor.c | 16 +++++++++-------
src/plugins/it_extractor.c | 6 +++---
src/plugins/nsfe_extractor.c | 8 ++++----
src/plugins/s3m_extractor.c | 2 +-
src/plugins/sid_extractor.c | 24 ++++++++++++------------
src/plugins/xm_extractor.c | 8 ++++----
21 files changed, 169 insertions(+), 162 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index efad82cb..a659c655 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 1 09:06:07 CET 2017
+ Fixing NULL pointer issues in GIF, IT, NSFE, S3M, SID and XM
+ plugins, caused (except for GIF) by signed/unsigned confusion.
+ Found by Leon Zhao. -CG
+
Sun Oct 15 19:36:41 CEST 2017
Fix potential file descriptor leak (on error handling path).
Fix potential assign-after-free (on IPC error handling path).
diff --git a/po/de.po b/po/de.po
index 4b946df3..4c6028b4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 1.0.0-pre1\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-11 20:53+0200\n"
+"POT-Creation-Date: 2017-10-15 21:38+0200\n"
"PO-Revision-Date: 2014-03-03 19:53+0100\n"
"Last-Translator: Mario Blättermann <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -106,7 +106,7 @@ msgstr "Metadaten aus den Dateien extrahieren."
msgid "Found by `%s' plugin:\n"
msgstr "Gefunden vom »%s«-Plugin:\n"
-#: src/main/extract.c:291 src/main/extract.c:378
+#: src/main/extract.c:291 src/main/extract.c:380
#: src/main/extractor_metatypes.c:145 src/main/extractor_print.c:86
#: src/main/extractor_print.c:96
msgid "unknown"
@@ -117,40 +117,40 @@ msgstr "unbekannt"
msgid "%s - (unknown, %u bytes)\n"
msgstr "%s - (unbekannt, %u Bytes)\n"
-#: src/main/extract.c:325
+#: src/main/extract.c:327
#, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binär, %u Bytes)\n"
-#: src/main/extract.c:809 src/main/extract.c:821
+#: src/main/extract.c:815 src/main/extract.c:827
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
"Unzulässige Kombination der Optionen, mehrere Ausgabestile können nicht "
"gemischt werden.\n"
-#: src/main/extract.c:854
+#: src/main/extract.c:860
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr ""
"Sie müssen ein Argument für die Option »%s« angeben (Option wird "
"ignoriert).\n"
-#: src/main/extract.c:923
+#: src/main/extract.c:929
msgid "Use --help to get a list of options.\n"
msgstr "Verwenden Sie --help, um eine Liste aller Optionen zu sehen.\n"
-#: src/main/extract.c:964
+#: src/main/extract.c:970
#, fuzzy
msgid "% BiBTeX file\n"
msgstr "%% BibTeX-Datei\n"
-#: src/main/extract.c:972
+#: src/main/extract.c:978
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Schlüsserwörter für die Datei %s:\n"
-#: src/main/extractor.c:676
+#: src/main/extractor.c:687
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Initialisierung des Plugin-Mechanismus ist fehlgeschlagen: %s.\n"
@@ -2084,7 +2084,7 @@ msgstr "Serbokroatisch (Kyrillisch)"
msgid "Farsi"
msgstr "Farsi"
-#: src/plugins/ole2_extractor.c:588
+#: src/plugins/ole2_extractor.c:593
#, c-format
msgid "Revision #%u: Author `%s' worked on `%s'"
msgstr "Revision #%u: Autor »%s« arbeitete an »%s«"
diff --git a/po/fr.po b/po/fr.po
index 47d30ca7..1cc2fb46 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 1.0.0-pre1\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-11 20:53+0200\n"
+"POT-Creation-Date: 2017-10-15 21:38+0200\n"
"PO-Revision-Date: 2017-04-29 22:30+0200\n"
"Last-Translator: Stéphane Aulery <address@hidden>\n"
"Language-Team: French <address@hidden>\n"
@@ -104,7 +104,7 @@ msgstr "Extraction des métadonnées des fichiers."
msgid "Found by `%s' plugin:\n"
msgstr "Trouvé par l’extension « %s » :\n"
-#: src/main/extract.c:291 src/main/extract.c:378
+#: src/main/extract.c:291 src/main/extract.c:380
#: src/main/extractor_metatypes.c:145 src/main/extractor_print.c:86
#: src/main/extractor_print.c:96
msgid "unknown"
@@ -115,39 +115,39 @@ msgstr "inconnu"
msgid "%s - (unknown, %u bytes)\n"
msgstr "%s - (inconnu, %u octets)\n"
-#: src/main/extract.c:325
+#: src/main/extract.c:327
#, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binaire, %u octets)\n"
-#: src/main/extract.c:809 src/main/extract.c:821
+#: src/main/extract.c:815 src/main/extract.c:827
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
"Combinaison d’options non permise : impossible de combiner des modes "
"d’impression différent.\n"
-#: src/main/extract.c:854
+#: src/main/extract.c:860
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr ""
"Vous devez préciser un argument pour l’option « %s » (option ignorée).\n"
-#: src/main/extract.c:923
+#: src/main/extract.c:929
msgid "Use --help to get a list of options.\n"
msgstr "Utilisez --help pour obtenir une liste d’options.\n"
-#: src/main/extract.c:964
+#: src/main/extract.c:970
#, fuzzy
msgid "% BiBTeX file\n"
msgstr "%% fichier BiBTeX\n"
-#: src/main/extract.c:972
+#: src/main/extract.c:978
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Mots-clés pour le fichier %s:\n"
-#: src/main/extractor.c:676
+#: src/main/extractor.c:687
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Echec de l’initialisation du module %s !\n"
@@ -2065,7 +2065,7 @@ msgstr "Serbo-Croate (cyrillique)"
msgid "Farsi"
msgstr "Farsi"
-#: src/plugins/ole2_extractor.c:588
+#: src/plugins/ole2_extractor.c:593
#, c-format
msgid "Revision #%u: Author `%s' worked on `%s'"
msgstr "Révision %u : « %s » est l’auteur de « %s »"
diff --git a/po/ga.po b/po/ga.po
index a2440635..ead83f98 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.20\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-11 20:53+0200\n"
+"POT-Creation-Date: 2017-10-15 21:38+0200\n"
"PO-Revision-Date: 2008-03-21 20:46-0700\n"
"Last-Translator: Kevin Scannell <address@hidden>\n"
"Language-Team: Irish <address@hidden>\n"
@@ -98,7 +98,7 @@ msgstr "Bain meiteashonra
msgid "Found by `%s' plugin:\n"
msgstr "Theip ar lucht� an bhreise�in `%s': %s\n"
-#: src/main/extract.c:291 src/main/extract.c:378
+#: src/main/extract.c:291 src/main/extract.c:380
#: src/main/extractor_metatypes.c:145 src/main/extractor_print.c:86
#: src/main/extractor_print.c:96
msgid "unknown"
@@ -109,37 +109,37 @@ msgstr "anaithnid"
msgid "%s - (unknown, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:325
+#: src/main/extract.c:327
#, fuzzy, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (d�n�rtha)\n"
-#: src/main/extract.c:809 src/main/extract.c:821
+#: src/main/extract.c:815 src/main/extract.c:827
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:854
+#: src/main/extract.c:860
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr ""
"N� m�r duit arg�int a thabhairt i ndiaidh na rogha `%s' (� ligean thart).\n"
-#: src/main/extract.c:923
+#: src/main/extract.c:929
msgid "Use --help to get a list of options.\n"
msgstr "Bain �s�id as '--help' le haghaidh n�os m� roghanna.\n"
-#: src/main/extract.c:964
+#: src/main/extract.c:970
#, fuzzy
msgid "% BiBTeX file\n"
msgstr "%% Comhad BiBTeX\n"
-#: src/main/extract.c:972
+#: src/main/extract.c:978
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Lorgfhocail do chomhad %s:\n"
-#: src/main/extractor.c:676
+#: src/main/extractor.c:687
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Theip ar th�s� meicn�ocht na mbreise�n: %s!\n"
@@ -2127,7 +2127,7 @@ msgstr "Seirbea-Chr
msgid "Farsi"
msgstr "Fairsis"
-#: src/plugins/ole2_extractor.c:588
+#: src/plugins/ole2_extractor.c:593
#, fuzzy, c-format
msgid "Revision #%u: Author `%s' worked on `%s'"
msgstr "Leas� #%u: D'oibrigh �dar '%s' ar '%s'"
diff --git a/po/it.po b/po/it.po
index e9f0c023..16bd669a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor-0.6.0\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-11 20:53+0200\n"
+"POT-Creation-Date: 2017-10-15 21:38+0200\n"
"PO-Revision-Date: 2010-09-30 23:41+0200\n"
"Last-Translator: Sergio Zanchetta <address@hidden>\n"
"Language-Team: Italian <address@hidden>\n"
@@ -94,7 +94,7 @@ msgstr ""
msgid "Found by `%s' plugin:\n"
msgstr ""
-#: src/main/extract.c:291 src/main/extract.c:378
+#: src/main/extract.c:291 src/main/extract.c:380
#: src/main/extractor_metatypes.c:145 src/main/extractor_print.c:86
#: src/main/extractor_print.c:96
msgid "unknown"
@@ -105,38 +105,38 @@ msgstr ""
msgid "%s - (unknown, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:325
+#: src/main/extract.c:327
#, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binario, %u bite)\n"
-#: src/main/extract.c:809 src/main/extract.c:821
+#: src/main/extract.c:815 src/main/extract.c:827
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:854
+#: src/main/extract.c:860
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr ""
"Deve essere specificato un argomento per l'opzione \"%s\" (opzione "
"ignorata).\n"
-#: src/main/extract.c:923
+#: src/main/extract.c:929
msgid "Use --help to get a list of options.\n"
msgstr "Usare --help per ottenere un elenco di opzioni.\n"
-#: src/main/extract.c:964
+#: src/main/extract.c:970
#, fuzzy
msgid "% BiBTeX file\n"
msgstr "%% file BiBTeX\n"
-#: src/main/extract.c:972
+#: src/main/extract.c:978
#, c-format
msgid "Keywords for file %s:\n"
msgstr ""
-#: src/main/extractor.c:676
+#: src/main/extractor.c:687
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr ""
@@ -2049,7 +2049,7 @@ msgstr ""
msgid "Farsi"
msgstr "Farsi"
-#: src/plugins/ole2_extractor.c:588
+#: src/plugins/ole2_extractor.c:593
#, c-format
msgid "Revision #%u: Author `%s' worked on `%s'"
msgstr ""
diff --git a/po/libextractor.pot b/po/libextractor.pot
index 4179398a..83301376 100644
--- a/po/libextractor.pot
+++ b/po/libextractor.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-11 20:53+0200\n"
+"POT-Creation-Date: 2017-10-15 21:38+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -92,7 +92,7 @@ msgstr ""
msgid "Found by `%s' plugin:\n"
msgstr ""
-#: src/main/extract.c:291 src/main/extract.c:378
+#: src/main/extract.c:291 src/main/extract.c:380
#: src/main/extractor_metatypes.c:145 src/main/extractor_print.c:86
#: src/main/extractor_print.c:96
msgid "unknown"
@@ -103,35 +103,35 @@ msgstr ""
msgid "%s - (unknown, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:325
+#: src/main/extract.c:327
#, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:809 src/main/extract.c:821
+#: src/main/extract.c:815 src/main/extract.c:827
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:854
+#: src/main/extract.c:860
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr ""
-#: src/main/extract.c:923
+#: src/main/extract.c:929
msgid "Use --help to get a list of options.\n"
msgstr ""
-#: src/main/extract.c:964
+#: src/main/extract.c:970
msgid "% BiBTeX file\n"
msgstr ""
-#: src/main/extract.c:972
+#: src/main/extract.c:978
#, c-format
msgid "Keywords for file %s:\n"
msgstr ""
-#: src/main/extractor.c:676
+#: src/main/extractor.c:687
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr ""
@@ -2019,7 +2019,7 @@ msgstr ""
msgid "Farsi"
msgstr ""
-#: src/plugins/ole2_extractor.c:588
+#: src/plugins/ole2_extractor.c:593
#, c-format
msgid "Revision #%u: Author `%s' worked on `%s'"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 2d4b61ef..776c1267 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor-1.0.0-pre1\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-11 20:53+0200\n"
+"POT-Creation-Date: 2017-10-15 21:38+0200\n"
"PO-Revision-Date: 2013-08-21 22:41+0200\n"
"Last-Translator: Benno Schulenberg <address@hidden>\n"
"Language-Team: Dutch <address@hidden>\n"
@@ -102,7 +102,7 @@ msgstr "Leest metadata uit bestanden."
msgid "Found by `%s' plugin:\n"
msgstr "Gevonden door plugin '%s':\n"
-#: src/main/extract.c:291 src/main/extract.c:378
+#: src/main/extract.c:291 src/main/extract.c:380
#: src/main/extractor_metatypes.c:145 src/main/extractor_print.c:86
#: src/main/extractor_print.c:96
msgid "unknown"
@@ -113,37 +113,37 @@ msgstr "onbekend"
msgid "%s - (unknown, %u bytes)\n"
msgstr "%s - (onbekend, %u bytes)\n"
-#: src/main/extract.c:325
+#: src/main/extract.c:327
#, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binair, %u bytes)\n"
-#: src/main/extract.c:809 src/main/extract.c:821
+#: src/main/extract.c:815 src/main/extract.c:827
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
"Ongeldige combinatie van opties; kan meerdere printstijlen niet combineren.\n"
-#: src/main/extract.c:854
+#: src/main/extract.c:860
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr "Optie '%s' vereist een argument -- optie is genegeerd.\n"
-#: src/main/extract.c:923
+#: src/main/extract.c:929
msgid "Use --help to get a list of options.\n"
msgstr "Gebruik '--help' voor een lijst met mogelijke opties.\n"
-#: src/main/extract.c:964
+#: src/main/extract.c:970
#, fuzzy
msgid "% BiBTeX file\n"
msgstr "%% BiBTeX-bestand\n"
-#: src/main/extract.c:972
+#: src/main/extract.c:978
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Trefwoorden voor bestand %s:\n"
-#: src/main/extractor.c:676
+#: src/main/extractor.c:687
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Initialisatie van plugin-mechanisme is mislukt: %s\n"
@@ -2070,7 +2070,7 @@ msgstr "Servo-Kroatisch (cyrillisch schrift)"
msgid "Farsi"
msgstr "Perzisch"
-#: src/plugins/ole2_extractor.c:588
+#: src/plugins/ole2_extractor.c:593
#, c-format
msgid "Revision #%u: Author `%s' worked on `%s'"
msgstr "Revisie #%u: Auteur '%s' werkte aan '%s'"
diff --git a/po/pl.po b/po/pl.po
index 6c62f1bc..7a935481 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 1.0.0-pre1\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-11 20:53+0200\n"
+"POT-Creation-Date: 2017-10-15 21:38+0200\n"
"PO-Revision-Date: 2012-12-01 15:45+0100\n"
"Last-Translator: Jakub Bogusz <address@hidden>\n"
"Language-Team: Polish <address@hidden>\n"
@@ -97,7 +97,7 @@ msgstr "Wyciąganie metadanych z plików."
msgid "Found by `%s' plugin:\n"
msgstr "Znalezione przez wtyczkę `%s':\n"
-#: src/main/extract.c:291 src/main/extract.c:378
+#: src/main/extract.c:291 src/main/extract.c:380
#: src/main/extractor_metatypes.c:145 src/main/extractor_print.c:86
#: src/main/extractor_print.c:96
msgid "unknown"
@@ -108,37 +108,37 @@ msgstr "nieznany"
msgid "%s - (unknown, %u bytes)\n"
msgstr "%s - (nieznany, bajtów: %u)\n"
-#: src/main/extract.c:325
+#: src/main/extract.c:327
#, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binarny, bajtów: %u)\n"
-#: src/main/extract.c:809 src/main/extract.c:821
+#: src/main/extract.c:815 src/main/extract.c:827
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
"Niedozwolona kombinacja opcji, nie można łączyć wielu styli wypisywania.\n"
-#: src/main/extract.c:854
+#: src/main/extract.c:860
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr "Opcja `%s' wymaga argumentu (zignorowano opcję).\n"
-#: src/main/extract.c:923
+#: src/main/extract.c:929
msgid "Use --help to get a list of options.\n"
msgstr "Opcja --help pozwala uzyskać listę opcji.\n"
-#: src/main/extract.c:964
+#: src/main/extract.c:970
#, fuzzy
msgid "% BiBTeX file\n"
msgstr "%% plik BiBTeX\n"
-#: src/main/extract.c:972
+#: src/main/extract.c:978
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Słowa kluczowe dla pliku %s:\n"
-#: src/main/extractor.c:676
+#: src/main/extractor.c:687
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Inicjalizacja mechanizmu wtyczek nie powiodła się: %s!\n"
@@ -2057,7 +2057,7 @@ msgstr "serbsko-chorwacki (cyrylicki)"
msgid "Farsi"
msgstr "perski"
-#: src/plugins/ole2_extractor.c:588
+#: src/plugins/ole2_extractor.c:593
#, c-format
msgid "Revision #%u: Author `%s' worked on `%s'"
msgstr "Rewizja #%u: Autor `%s' pracował nad `%s'"
diff --git a/po/ro.po b/po/ro.po
index e2024fe8..ff02b548 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.3\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-11 20:53+0200\n"
+"POT-Creation-Date: 2017-10-15 21:38+0200\n"
"PO-Revision-Date: 2005-08-16 12:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <address@hidden>\n"
"Language-Team: Romanian <address@hidden>\n"
@@ -101,7 +101,7 @@ msgstr "Extrage metadata din fi
msgid "Found by `%s' plugin:\n"
msgstr ""
-#: src/main/extract.c:291 src/main/extract.c:378
+#: src/main/extract.c:291 src/main/extract.c:380
#: src/main/extractor_metatypes.c:145 src/main/extractor_print.c:86
#: src/main/extractor_print.c:96
msgid "unknown"
@@ -112,37 +112,37 @@ msgstr "necunoscut"
msgid "%s - (unknown, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:325
+#: src/main/extract.c:327
#, fuzzy, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binar)\n"
-#: src/main/extract.c:809 src/main/extract.c:821
+#: src/main/extract.c:815 src/main/extract.c:827
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:854
+#: src/main/extract.c:860
#, fuzzy, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr ""
"Trebuie s� specifica�i un argument pentru op�iunea '%s' (op�iune ignorat�).\n"
-#: src/main/extract.c:923
+#: src/main/extract.c:929
msgid "Use --help to get a list of options.\n"
msgstr "Folosi�i --help pentru a ob�ine o list� de op�iuni.\n"
-#: src/main/extract.c:964
+#: src/main/extract.c:970
#, fuzzy
msgid "% BiBTeX file\n"
msgstr "%% BiBTeX file\n"
-#: src/main/extract.c:972
+#: src/main/extract.c:978
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Cuvinte cheie pentru fi�ier %s:\n"
-#: src/main/extractor.c:676
+#: src/main/extractor.c:687
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "ini�ializare mecanismului de plugin a e�uat: %s!\n"
@@ -2125,7 +2125,7 @@ msgstr ""
msgid "Farsi"
msgstr ""
-#: src/plugins/ole2_extractor.c:588
+#: src/plugins/ole2_extractor.c:593
#, c-format
msgid "Revision #%u: Author `%s' worked on `%s'"
msgstr ""
diff --git a/po/rw.po b/po/rw.po
index c748b9df..0eca0518 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.4.2\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-11 20:53+0200\n"
+"POT-Creation-Date: 2017-10-15 21:38+0200\n"
"PO-Revision-Date: 2005-04-04 10:55-0700\n"
"Last-Translator: Steven Michael Murphy <address@hidden>\n"
"Language-Team: Kinyarwanda <address@hidden>\n"
@@ -109,7 +109,7 @@ msgstr "Bivuye Idosiye"
msgid "Found by `%s' plugin:\n"
msgstr "Byanze"
-#: src/main/extract.c:291 src/main/extract.c:378
+#: src/main/extract.c:291 src/main/extract.c:380
#: src/main/extractor_metatypes.c:145 src/main/extractor_print.c:86
#: src/main/extractor_print.c:96
msgid "unknown"
@@ -120,36 +120,36 @@ msgstr "itazwi"
msgid "%s - (unknown, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:325
+#: src/main/extract.c:327
#, fuzzy, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s-(Nyabibiri"
-#: src/main/extract.c:809 src/main/extract.c:821
+#: src/main/extract.c:815 src/main/extract.c:827
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:854
+#: src/main/extract.c:860
#, fuzzy, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr "kugirango i Ihitamo Ihitamo"
-#: src/main/extract.c:923
+#: src/main/extract.c:929
#, fuzzy
msgid "Use --help to get a list of options.\n"
msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
-#: src/main/extract.c:964
+#: src/main/extract.c:970
msgid "% BiBTeX file\n"
msgstr ""
-#: src/main/extract.c:972
+#: src/main/extract.c:978
#, fuzzy, c-format
msgid "Keywords for file %s:\n"
msgstr "kugirango IDOSIYE"
-#: src/main/extractor.c:676
+#: src/main/extractor.c:687
#, fuzzy, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Bya Byanze"
@@ -2359,7 +2359,7 @@ msgstr ""
msgid "Farsi"
msgstr ""
-#: src/plugins/ole2_extractor.c:588
+#: src/plugins/ole2_extractor.c:593
#, c-format
msgid "Revision #%u: Author `%s' worked on `%s'"
msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 1928ed81..a3690f2d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor-1.0.0-pre1\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-11 20:53+0200\n"
+"POT-Creation-Date: 2017-10-15 21:38+0200\n"
"PO-Revision-Date: 2017-01-05 06:41+0200\n"
"Last-Translator: Мирослав Николић <address@hidden>\n"
"Language-Team: Serbian <(nothing)>\n"
@@ -98,7 +98,7 @@ msgstr "Извлачи метаподатке из датотеке."
msgid "Found by `%s' plugin:\n"
msgstr "Нађено је прикључком „%s“:\n"
-#: src/main/extract.c:291 src/main/extract.c:378
+#: src/main/extract.c:291 src/main/extract.c:380
#: src/main/extractor_metatypes.c:145 src/main/extractor_print.c:86
#: src/main/extractor_print.c:96
msgid "unknown"
@@ -109,38 +109,38 @@ msgstr "непознато"
msgid "%s - (unknown, %u bytes)\n"
msgstr "%s — (непознато, %u бајта)\n"
-#: src/main/extract.c:325
+#: src/main/extract.c:327
#, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s — (извршна, %u бајта)\n"
-#: src/main/extract.c:809 src/main/extract.c:821
+#: src/main/extract.c:815 src/main/extract.c:827
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
"Неисправна комбинација опција, не могу да комбинујем више стилова "
"исписивања.\n"
-#: src/main/extract.c:854
+#: src/main/extract.c:860
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr "Морате навести аргумент за опцију „%s“ (опција је занемарена).\n"
-#: src/main/extract.c:923
+#: src/main/extract.c:929
msgid "Use --help to get a list of options.\n"
msgstr "Употребите „--help“ да добавите списак опција.\n"
-#: src/main/extract.c:964
+#: src/main/extract.c:970
#, fuzzy
msgid "% BiBTeX file\n"
msgstr "%% БиБТеКс датотека\n"
-#: src/main/extract.c:972
+#: src/main/extract.c:978
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Кључне речи за датотеку „%s“:\n"
-#: src/main/extractor.c:676
+#: src/main/extractor.c:687
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Покретање механизма прикључка није успело: %s!\n"
@@ -2056,7 +2056,7 @@ msgstr "Српски (ћирилица)"
msgid "Farsi"
msgstr "Фарси"
-#: src/plugins/ole2_extractor.c:588
+#: src/plugins/ole2_extractor.c:593
#, c-format
msgid "Revision #%u: Author `%s' worked on `%s'"
msgstr "Ревизија #%u: Аутор „%s“ је радио „%s“"
diff --git a/po/sv.po b/po/sv.po
index 70cbed8d..73dea9b7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.22\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-11 20:53+0200\n"
+"POT-Creation-Date: 2017-10-15 21:38+0200\n"
"PO-Revision-Date: 2009-05-12 17:45+0100\n"
"Last-Translator: Daniel Nylander <address@hidden>\n"
"Language-Team: Swedish <address@hidden>\n"
@@ -96,7 +96,7 @@ msgstr "Extrahera metadata från filer."
msgid "Found by `%s' plugin:\n"
msgstr "Inläsning av instick \"%s\" misslyckades: %s\n"
-#: src/main/extract.c:291 src/main/extract.c:378
+#: src/main/extract.c:291 src/main/extract.c:380
#: src/main/extractor_metatypes.c:145 src/main/extractor_print.c:86
#: src/main/extractor_print.c:96
msgid "unknown"
@@ -107,36 +107,36 @@ msgstr "okänd"
msgid "%s - (unknown, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:325
+#: src/main/extract.c:327
#, fuzzy, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binär)\n"
-#: src/main/extract.c:809 src/main/extract.c:821
+#: src/main/extract.c:815 src/main/extract.c:827
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:854
+#: src/main/extract.c:860
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr "Du måste ange ett argument för flaggan \"%s\" (flagga ignoreras).\n"
-#: src/main/extract.c:923
+#: src/main/extract.c:929
msgid "Use --help to get a list of options.\n"
msgstr "Använd --help för att få en lista på flaggor.\n"
-#: src/main/extract.c:964
+#: src/main/extract.c:970
#, fuzzy
msgid "% BiBTeX file\n"
msgstr "%% BiBTeX-fil\n"
-#: src/main/extract.c:972
+#: src/main/extract.c:978
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Nyckelord för filen %s:\n"
-#: src/main/extractor.c:676
+#: src/main/extractor.c:687
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
@@ -2138,7 +2138,7 @@ msgstr "Serbokroatiska (Kyrillisk)"
msgid "Farsi"
msgstr "Farsi"
-#: src/plugins/ole2_extractor.c:588
+#: src/plugins/ole2_extractor.c:593
#, fuzzy, c-format
msgid "Revision #%u: Author `%s' worked on `%s'"
msgstr "Revision %u: Upphovsmannen \"%s\" arbetade på \"%s\""
diff --git a/po/uk.po b/po/uk.po
index 25b0e8af..1cde0cbd 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 1.0.0-pre1\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-11 20:53+0200\n"
+"POT-Creation-Date: 2017-10-15 21:38+0200\n"
"PO-Revision-Date: 2012-09-05 22:36+0300\n"
"Last-Translator: Yuri Chornoivan <address@hidden>\n"
"Language-Team: Ukrainian <address@hidden>\n"
@@ -105,7 +105,7 @@ msgstr "Видобути метадані з файлів."
msgid "Found by `%s' plugin:\n"
msgstr "Знайдено додатком «%s»:\n"
-#: src/main/extract.c:291 src/main/extract.c:378
+#: src/main/extract.c:291 src/main/extract.c:380
#: src/main/extractor_metatypes.c:145 src/main/extractor_print.c:86
#: src/main/extractor_print.c:96
msgid "unknown"
@@ -116,42 +116,42 @@ msgstr "невідомий"
msgid "%s - (unknown, %u bytes)\n"
msgstr "%s — (невідомий, %u байтів)\n"
-#: src/main/extract.c:325
+#: src/main/extract.c:327
#, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s — (бінарний, %u байтів)\n"
-#: src/main/extract.c:809 src/main/extract.c:821
+#: src/main/extract.c:815 src/main/extract.c:827
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
"Некоректне поєднання параметрів, не можна визначати декілька стилів "
"виведення даних.\n"
-#: src/main/extract.c:854
+#: src/main/extract.c:860
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr ""
"Параметр «%s» можна використовувати лише з додатковим аргументом (параметр "
"проігноровано).\n"
-#: src/main/extract.c:923
+#: src/main/extract.c:929
msgid "Use --help to get a list of options.\n"
msgstr ""
"Скористайтеся параметром --help для отримання списку можливих параметрів "
"командного рядка.\n"
-#: src/main/extract.c:964
+#: src/main/extract.c:970
#, fuzzy
msgid "% BiBTeX file\n"
msgstr "%% файл BiBTeX\n"
-#: src/main/extract.c:972
+#: src/main/extract.c:978
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Ключові слова для файла %s:\n"
-#: src/main/extractor.c:676
+#: src/main/extractor.c:687
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Помилка під час спроби ініціалізації механізму додатків: %s!\n"
@@ -2065,7 +2065,7 @@ msgstr "Сербо-хорватська (кирилиця)"
msgid "Farsi"
msgstr "Фарсі"
-#: src/plugins/ole2_extractor.c:588
+#: src/plugins/ole2_extractor.c:593
#, c-format
msgid "Revision #%u: Author `%s' worked on `%s'"
msgstr "Модифікація %u: автор «%s», співробітник «%s»"
diff --git a/po/vi.po b/po/vi.po
index 7d33b3a9..a92e45c5 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.6.0\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-10-11 20:53+0200\n"
+"POT-Creation-Date: 2017-10-15 21:38+0200\n"
"PO-Revision-Date: 2010-02-11 00:13+0930\n"
"Last-Translator: Clytie Siddall <address@hidden>\n"
"Language-Team: Vietnamese <address@hidden>\n"
@@ -104,7 +104,7 @@ msgstr "Rút siêu dữ liệu ra tập tin."
msgid "Found by `%s' plugin:\n"
msgstr "Tìm bởi phần bổ sung « %s »:\n"
-#: src/main/extract.c:291 src/main/extract.c:378
+#: src/main/extract.c:291 src/main/extract.c:380
#: src/main/extractor_metatypes.c:145 src/main/extractor_print.c:86
#: src/main/extractor_print.c:96
msgid "unknown"
@@ -115,37 +115,37 @@ msgstr "không rõ"
msgid "%s - (unknown, %u bytes)\n"
msgstr "%s - (không rõ, %u byte)\n"
-#: src/main/extract.c:325
+#: src/main/extract.c:327
#, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (nhị phân, %u byte)\n"
-#: src/main/extract.c:809 src/main/extract.c:821
+#: src/main/extract.c:815 src/main/extract.c:827
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr "sai tổ hợp các tuỳ chọn này, không thể kết hợp nhiều cách in.\n"
-#: src/main/extract.c:854
+#: src/main/extract.c:860
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr "Bạn phải ghi rõ một đối số cho tùy chọn « %s » (tùy chọn bị bỏ qua).\n"
-#: src/main/extract.c:923
+#: src/main/extract.c:929
msgid "Use --help to get a list of options.\n"
msgstr ""
"Hãy sử dụng lệnh « --help » (trợ giúp) để xem một danh sách các tùy chọn.\n"
-#: src/main/extract.c:964
+#: src/main/extract.c:970
#, fuzzy
msgid "% BiBTeX file\n"
msgstr "%% tập tin BiBTeX\n"
-#: src/main/extract.c:972
+#: src/main/extract.c:978
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Từ khoá cho tập tin %s:\n"
-#: src/main/extractor.c:676
+#: src/main/extractor.c:687
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Việc khởi động cơ chế cầm phít bị lỗi: %s\n"
@@ -2090,7 +2090,7 @@ msgstr "Xéc-bi Cợ-rô-a-ti-a (Ki-rin)"
msgid "Farsi"
msgstr "Pha-xi"
-#: src/plugins/ole2_extractor.c:588
+#: src/plugins/ole2_extractor.c:593
#, fuzzy, c-format
msgid "Revision #%u: Author `%s' worked on `%s'"
msgstr "Bản sửa đổi #%u: Tác giả « %s » đã làm việc « %s »."
diff --git a/src/include/extractor.h b/src/include/extractor.h
index 0325dc6f..782134ba 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 aae2b828..8ee58079 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 5b8a1368..3d8803f8 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 6a8be86e..7369477c 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 9cd6f8f2..c4789cef 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 571f6774..dface428 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 a1aea276..d0b62bd6 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;
}
--
To stop receiving notification emails like this one, please contact
address@hidden