Fix the bad redirect and force const in signature

3 files changed, 3 insertions, 4 deletions

diff --git a/navit/android.c b/navit/android.c
index 32cb3d366..bddc48be8 100644
--- a/navit/android.c
+++ b/navit/android.c
@@ -682,8 +682,7 @@ static void android_search_idle(struct android_search_priv *search_priv) {
 
 static void start_search(struct android_search_priv *search_priv, const char *search_string) {
     dbg(lvl_debug,"enter %s", search_string);
-    char tmp_search_string = *search_string; // This is allows us to avoid warnings about discarding const qualifier
-    char *str=search_fix_spaces(&tmp_search_string);
+    char *str=search_fix_spaces(search_string);
     search_priv->phrases = g_strsplit(str, " ", 0);
     //ret=search_address_town(ret, sl, phrases, NULL, partial, jni);
 
diff --git a/navit/search.c b/navit/search.c
index ebe591c2e..1ede1c28a 100644
--- a/navit/search.c
+++ b/navit/search.c
@@ -135,7 +135,7 @@ int search_list_level(enum attr_type attr_type) {
     }
 }
 
-char *search_fix_spaces(char *str) {
+char *search_fix_spaces(const char *str) {
     int i;
     int len=strlen(str);
     char c,*s,*d,*ret=g_strdup(str);
diff --git a/navit/search.h b/navit/search.h
index f5738f6d9..cdf93410e 100644
--- a/navit/search.h
+++ b/navit/search.h
@@ -87,7 +87,7 @@ char *search_list_get_unique(struct search_list *this_, char *unique);
 struct search_list_result *search_list_get_result(struct search_list *this_);
 void search_list_destroy(struct search_list *this_);
 void search_init(void);
-char *search_fix_spaces(char *str);
+char *search_fix_spaces(const char *str);
 /* end of prototypes */
 #ifdef __cplusplus
 }