summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2013-01-20 15:04:52 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2013-01-20 15:04:52 (GMT)
commit5090dd980ff30e7388e1a70f64c0b6a26ea6244e (patch)
tree1bd634a79857a08c48f0f4df4f347016326e4a07
parent37fd2f1329c56078bc8a8b2fc955aa001c109c01 (diff)
Fixed some GCC warnings.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@327 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
-rw-r--r--ChangeLog9
-rw-r--r--src/arch/dalvik/operands/args.c3
-rw-r--r--src/format/format.c2
-rw-r--r--src/format/format.h2
-rw-r--r--src/gui/panels/log.c4
-rw-r--r--src/plugins/plugin.c7
6 files changed, 16 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index b5b4590..0b5c819 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
13-01-20 Cyrille Bagard <nocbos@gmail.com>
+ * src/arch/dalvik/operands/args.c:
+ * src/format/format.c:
+ * src/format/format.h:
+ * src/gui/panels/log.c:
+ * src/plugins/plugin.c:
+ Fix some GCC warnings.
+
+13-01-20 Cyrille Bagard <nocbos@gmail.com>
+
* src/analysis/blocks/raccess.c:
* src/analysis/blocks/raccess.h:
Typo: constify the source list when merging two lists.
diff --git a/src/arch/dalvik/operands/args.c b/src/arch/dalvik/operands/args.c
index 16d995c..35f6a90 100644
--- a/src/arch/dalvik/operands/args.c
+++ b/src/arch/dalvik/operands/args.c
@@ -24,6 +24,9 @@
#include "args.h"
+#include <malloc.h>
+
+
#include "../../operand-int.h"
diff --git a/src/format/format.c b/src/format/format.c
index b7ec199..846d038 100644
--- a/src/format/format.c
+++ b/src/format/format.c
@@ -486,7 +486,7 @@ bool init_all_formats(void)
* *
******************************************************************************/
-GBinFormat *load_new_format(FormatType type, char *filename, bin_t **content, off_t *length)
+GBinFormat *load_new_format(FormatType type, const char *filename, bin_t **content, off_t *length)
{
GBinFormat *result; /* Adresse à retourner */
char *tmp; /* Nom de fichier modifiable */
diff --git a/src/format/format.h b/src/format/format.h
index f0489e9..2fc1db0 100644
--- a/src/format/format.h
+++ b/src/format/format.h
@@ -120,7 +120,7 @@ typedef GBinFormat * (* format_load_fc) (const bin_t *, off_t);
bool init_all_formats(void);
/* Charge si possible un nouveau format binaire. */
-GBinFormat *load_new_format(FormatType, char *filename, bin_t **, off_t *);
+GBinFormat *load_new_format(FormatType, const char *filename, bin_t **, off_t *);
diff --git a/src/gui/panels/log.c b/src/gui/panels/log.c
index e0be732..e5745ee 100644
--- a/src/gui/panels/log.c
+++ b/src/gui/panels/log.c
@@ -28,9 +28,7 @@
#include <malloc.h>
#include <stdarg.h>
#include <stdio.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
diff --git a/src/plugins/plugin.c b/src/plugins/plugin.c
index 968cf65..832b969 100644
--- a/src/plugins/plugin.c
+++ b/src/plugins/plugin.c
@@ -163,7 +163,7 @@ GPluginModule *g_plugin_module_new(const gchar *filename)
{
GPluginModule *result; /* Structure à retourner */
get_plugin_name_fc get_name; /* Nom du greffon */
- get_plugin_action_fc __get_type; /* Type(s) de greffon */
+ //get_plugin_action_fc __get_type; /* Type(s) de greffon */
get_plugin_action_fc get_action; /* Actions du greffon */
char *dir; /* Répertoire modifiable */
@@ -403,15 +403,10 @@ PluginAction g_plugin_module_get_action(const GPluginModule *plugin)
MatchingFormatAction g_plugin_module_is_matching(const GPluginModule *plugin, char **filename, bin_t **data, off_t *length)
{
MatchingFormatAction result; /* Valeur à retourner */
- char *old_filename; /* Ancien nom de fichier */
- bin_t *old_data; /* Ancien contenu binaire */
if (plugin->is_matching == NULL)
return MFA_NONE;
- old_filename = *filename;
- old_data = *data;
-
result = plugin->is_matching(plugin, filename, data, length);
return result;