core:fix:fix some warnings

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@1870 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/binding/python/binding_python.c b/navit/navit/binding/python/binding_python.c
index 3ec4d4a..6d4fcc7 100644 (file)
--- a/navit/navit/binding/python/binding_python.c
+++ b/navit/navit/binding/python/binding_python.c
@@ -31,6 +31,7 @@
 #include "debug.h"
 #include "item.h"
 #include "attr.h"
+#include "xmlconfig.h"
 
 #if defined(MS_WINDOWS) || defined(__CYGWIN__)
 #define Obj_HEAD PyObject_HEAD_INIT(NULL);
@@ -313,9 +314,10 @@ config_load_py(PyObject *self, PyObject *args)
 {
        const char *file;
        int ret;
+       xmlerror *error;
        if (!PyArg_ParseTuple(args, "s", &file))
                return NULL;
-       ret=config_load(file, NULL);
+       ret=config_load(file, &error);
        return Py_BuildValue("i",ret);
 }
 

diff --git a/navit/navit/binding/python/main.c b/navit/navit/binding/python/main.c
index 7e059fe..5a782cc 100644 (file)
--- a/navit/navit/binding/python/main.c
+++ b/navit/navit/binding/python/main.c
@@ -28,8 +28,6 @@ static PyObject *
 main_navit(PyObject *self, PyObject *args)
 {
        struct navit *navit;
-       const char *file;
-       int ret=0;
        navit=main_get_navit(NULL);
        return navit_py_ref(navit);
 }

diff --git a/navit/navit/start.c b/navit/navit/start.c
index 52efd18..8e72883 100644 (file)
--- a/navit/navit/start.c
+++ b/navit/navit/start.c
@@ -67,7 +67,7 @@ get_home_directory(void)
 
 int main(int argc, char **argv)
 {
-       GError *error = NULL;
+       xmlerror *error = NULL;
        char *config_file = NULL;
        int opt;
        char *cp;

diff --git a/navit/navit/xmlconfig.c b/navit/navit/xmlconfig.c
index a38ffd6..ee962c2 100644 (file)
--- a/navit/navit/xmlconfig.c
+++ b/navit/navit/xmlconfig.c
@@ -43,7 +43,6 @@
 #include "xmlconfig.h"
 #include "config.h"
 
-typedef GError xmlerror;
 #ifdef HAVE_GLIB
 #define ATTR_DISTANCE 1
 #else
@@ -796,7 +795,7 @@ parse_file(struct xmldocument *document, xmlerror **error)
 }
 #endif
 
-gboolean config_load(char *filename, xmlerror **error)
+gboolean config_load(const char *filename, xmlerror **error)
 {
        struct xmldocument document;
        struct xmlstate *curr=NULL;

diff --git a/navit/navit/xmlconfig.h b/navit/navit/xmlconfig.h
index 202d8dd..15918f1 100644 (file)
--- a/navit/navit/xmlconfig.h
+++ b/navit/navit/xmlconfig.h
@@ -20,8 +20,9 @@
 #ifndef NAVIT_XMLCONFIG_H
 #define NAVIT_XMLCONFIG_H
 
+typedef GError xmlerror;
 struct container;
-gboolean config_load(char *filename,GError **error);
+gboolean config_load(const char *filename, xmlerror **error);
 
 #endif