Fix:Core:MSVC fixes

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

diff --git a/navit/navit/country.c b/navit/navit/country.c
index 1bcaad1..8a398a3 100644 (file)
--- a/navit/navit/country.c
+++ b/navit/navit/country.c
@@ -380,7 +380,7 @@ match(struct country_search *this_, enum attr_type type, const char *name)
        if (this_->partial)
                ret=(strncasecmp(this_->search.u.str, name, this_->len) == 0);
        else
-               ret=(strcasecmp(this_->search.u.str, name) == 0);
+               ret=(g_strcasecmp(this_->search.u.str, name) == 0);
        return ret;
        
 }

diff --git a/navit/navit/file.c b/navit/navit/file.c
index 2d38ba5..4807115 100644 (file)
--- a/navit/navit/file.c
+++ b/navit/navit/file.c
@@ -774,7 +774,7 @@ file_create_caseinsensitive(char *name, struct attr **options)
        if (d) {
                *p++='/';
                while ((filename=file_readdir(d))) {
-                       if (!strcasecmp(filename, p)) {
+                       if (!g_strcasecmp(filename, p)) {
                                strcpy(p, filename);
                                ret=file_create(dirname, options);
                                if (ret)

diff --git a/navit/navit/gui/internal/gui_internal.c b/navit/navit/gui/internal/gui_internal.c
index b5f0153..f9567ca 100644 (file)
--- a/navit/navit/gui/internal/gui_internal.c
+++ b/navit/navit/gui/internal/gui_internal.c
@@ -4311,7 +4311,7 @@ static const char *
 find_attr(const char **names, const char **values, const char *name)
 {
        while (*names) {
-               if (!strcasecmp(*names, name))
+               if (!g_strcasecmp(*names, name))
                        return *values;
                names+=xml_attr_distance;
                values+=xml_attr_distance;
@@ -4480,7 +4480,7 @@ gui_internal_html_start(void *dummy, const char *tag_name, const char **names, c
        struct html *html=&this->html[this->html_depth];
        const char *cond, *type;
 
-       if (!strcasecmp(tag_name,"text"))
+       if (!g_strcasecmp(tag_name,"text"))
                return;
        html->command=NULL;
        html->name=NULL;
@@ -4494,7 +4494,7 @@ gui_internal_html_start(void *dummy, const char *tag_name, const char **names, c
        }
 
        for (i=0 ; i < sizeof(html_tag_map)/sizeof(struct html_tag_map); i++) {
-               if (!strcasecmp(html_tag_map[i].tag_name, tag_name)) {
+               if (!g_strcasecmp(html_tag_map[i].tag_name, tag_name)) {
                        tag=html_tag_map[i].tag;
                        break;
                }
@@ -4570,7 +4570,7 @@ gui_internal_html_end(void *dummy, const char *tag_name, void *data, void *error
        struct html *html;
        struct html *parent=NULL;
 
-       if (!strcasecmp(tag_name,"text"))
+       if (!g_strcasecmp(tag_name,"text"))
                return;
        this->html_depth--;
        html=&this->html[this->html_depth];

diff --git a/navit/navit/linguistics.c b/navit/navit/linguistics.c
index 9227d96..2b17c57 100644 (file)
--- a/navit/navit/linguistics.c
+++ b/navit/navit/linguistics.c
@@ -150,13 +150,13 @@ linguistics_next_word(char *str)
 int
 linguistics_search(char *str)
 {
-       if (!strcasecmp(str,"str"))
+       if (!g_strcasecmp(str,"str"))
                return 0;
-       if (!strcasecmp(str,"str."))
+       if (!g_strcasecmp(str,"str."))
                return 0;
-       if (!strcasecmp(str,"strasse"))
+       if (!g_strcasecmp(str,"strasse"))
                return 0;
-       if (!strcasecmp(str,"weg"))
+       if (!g_strcasecmp(str,"weg"))
                return 0;
        return 1;
 }

diff --git a/navit/navit/navigation.c b/navit/navit/navigation.c
index f7e3860..6751e98 100644 (file)
--- a/navit/navit/navigation.c
+++ b/navit/navit/navigation.c
@@ -1283,7 +1283,7 @@ contains_suffix(char *name, char *suffix)
                return 0;
        if (strlen(name) < strlen(suffix))
                return 0;
-       return !strcasecmp(name+strlen(name)-strlen(suffix), suffix);
+       return !g_strcasecmp(name+strlen(name)-strlen(suffix), suffix);
 }
 
 static char *

diff --git a/navit/navit/search.c b/navit/navit/search.c
index 979a6f6..45cd74c 100644 (file)
--- a/navit/navit/search.c
+++ b/navit/navit/search.c
@@ -400,9 +400,9 @@ static int
 search_match(char *str, char *search, int partial)
 {
        if (!partial)
-               return (!strcasecmp(str, search));
+               return (!g_strcasecmp(str, search));
        else
-               return (!strncasecmp(str, search, strlen(search)));
+               return (!g_strncasecmp(str, search, strlen(search)));
 }
 
 static struct pcoord *

diff --git a/navit/navit/vehicle/file/vehicle_file.c b/navit/navit/vehicle/file/vehicle_file.c
index c05c6dd..36bad5d 100644 (file)
--- a/navit/navit/vehicle/file/vehicle_file.c
+++ b/navit/navit/vehicle/file/vehicle_file.c
@@ -457,7 +457,7 @@ vehicle_file_parse(struct vehicle_priv *priv, char *buffer)
                        lat -= priv->geo.lat * 100;
                        priv->geo.lat += lat / 60;
 
-                       if (!strcasecmp(item[3],"S"))
+                       if (!g_strcasecmp(item[3],"S"))
                                priv->geo.lat=-priv->geo.lat;
 
                        lng = g_ascii_strtod(item[4], NULL);
@@ -465,7 +465,7 @@ vehicle_file_parse(struct vehicle_priv *priv, char *buffer)
                        lng -= priv->geo.lng * 100;
                        priv->geo.lng += lng / 60;
 
-                       if (!strcasecmp(item[5],"W"))
+                       if (!g_strcasecmp(item[5],"W"))
                                priv->geo.lng=-priv->geo.lng;
                        priv->valid=attr_position_valid_valid;
             dbg(2, "latitude '%2.4f' longitude %2.4f\n", priv->geo.lat, priv->geo.lng);
@@ -965,9 +965,9 @@ vehicle_file_new_file(struct vehicle_methods
                ret->checksum_ignore=checksum_ignore->u.num;
        ret->attrs = attrs;
        on_eof = attr_search(attrs, NULL, attr_on_eof);
-       if (on_eof && !strcasecmp(on_eof->u.str, "stop"))
+       if (on_eof && !g_strcasecmp(on_eof->u.str, "stop"))
                ret->on_eof=1;
-       if (on_eof && !strcasecmp(on_eof->u.str, "exit"))
+       if (on_eof && !g_strcasecmp(on_eof->u.str, "exit"))
                ret->on_eof=2;
        dbg(0,"on_eof=%d\n", ret->on_eof);
        *meth = vehicle_file_methods;