Switch to eina_stringshare.

This could also change the usage of string share in E17.



SVN revision: 36679

1 files changed, 20 insertions, 20 deletions

diff --git a/src/bin/e_path.c b/src/bin/e_path.c
index abf5301d03..3c34f7adab 100644
--- a/src/bin/e_path.c
+++ b/src/bin/e_path.c
@@ -45,7 +45,7 @@ e_path_default_path_append(E_Path *ep, const char *path)
 
 	strcpy(new_path, home_dir);
 	strcat(new_path, path + 1);
-        epd->dir = evas_stringshare_add(new_path);
+        epd->dir = eina_stringshare_add(new_path);
 	free(new_path);
 	ep->default_dir_list = evas_list_append(ep->default_dir_list, epd);	
      }
@@ -55,7 +55,7 @@ e_path_default_path_append(E_Path *ep, const char *path)
 	epd = malloc(sizeof(E_Path_Dir));
 	if (!epd)
 	  return;
-	epd->dir = evas_stringshare_add(path);
+	epd->dir = eina_stringshare_add(path);
 	ep->default_dir_list = evas_list_append(ep->default_dir_list, epd);
      }
    _e_path_cache_free(ep);
@@ -98,7 +98,7 @@ e_path_user_path_append(E_Path *ep, const char *path)
 
 	strcpy(new_path, home_dir);
 	strcat(new_path, path + 1);
-        epd->dir = evas_stringshare_add(new_path);
+        epd->dir = eina_stringshare_add(new_path);
 	free(new_path);
 	*(ep->user_dir_list) = evas_list_append(*(ep->user_dir_list), epd);	
      }
@@ -108,7 +108,7 @@ e_path_user_path_append(E_Path *ep, const char *path)
 	epd = malloc(sizeof(E_Path_Dir));
 	if (!epd)
 	  return;
-	epd->dir = evas_stringshare_add(path);
+	epd->dir = eina_stringshare_add(path);
 	*(ep->user_dir_list) = evas_list_append(*(ep->user_dir_list), epd);
      }
    _e_path_cache_free(ep);
@@ -141,7 +141,7 @@ e_path_user_path_prepend(E_Path *ep, const char *path)
 
 	strcpy(new_path, home_dir);
 	strcat(new_path, path + 1);
-        epd->dir = evas_stringshare_add(new_path);
+        epd->dir = eina_stringshare_add(new_path);
 	free(new_path);
 	*(ep->user_dir_list) = evas_list_prepend(*(ep->user_dir_list), epd);	
      }
@@ -151,7 +151,7 @@ e_path_user_path_prepend(E_Path *ep, const char *path)
 	epd = malloc(sizeof(E_Path_Dir));
 	if (!epd)
 	  return;
-	epd->dir = evas_stringshare_add(path);
+	epd->dir = eina_stringshare_add(path);
 	*(ep->user_dir_list) = evas_list_prepend(*(ep->user_dir_list), epd);
      }
    _e_path_cache_free(ep);
@@ -189,7 +189,7 @@ e_path_user_path_remove(E_Path *ep, const char *path)
 		    {
 		       *(ep->user_dir_list) = evas_list_remove_list(
 						*(ep->user_dir_list), l);
-		       evas_stringshare_del(epd->dir);
+		       eina_stringshare_del(epd->dir);
 		       free(epd);
 		       free(new_path);
 		       _e_path_cache_free(ep);
@@ -211,7 +211,7 @@ e_path_user_path_remove(E_Path *ep, const char *path)
 		    {
 		       *(ep->user_dir_list) = evas_list_remove_list(
 						*(ep->user_dir_list), l);
-		       evas_stringshare_del(epd->dir);
+		       eina_stringshare_del(epd->dir);
 		       free(epd);
 		       _e_path_cache_free(ep);
 		       return;
@@ -229,7 +229,7 @@ e_path_user_path_clear(E_Path *ep)
 	E_Path_Dir *epd;
 	epd = (*(ep->user_dir_list))->data;
 	*(ep->user_dir_list) = evas_list_remove_list(*(ep->user_dir_list), *(ep->user_dir_list));
-	evas_stringshare_del(epd->dir);
+	eina_stringshare_del(epd->dir);
 	free(epd);     
      }
    _e_path_cache_free(ep);
@@ -247,7 +247,7 @@ e_path_find(E_Path *ep, const char *file)
 
    if (!file) return NULL;
    str = evas_hash_find(ep->hash, file);
-   if (str) return evas_stringshare_add(str);
+   if (str) return eina_stringshare_add(str);
    /* Look in the default dir list */
    for (l = ep->default_dir_list; l; l = l->next)
      {
@@ -262,8 +262,8 @@ e_path_find(E_Path *ep, const char *file)
 		  if (evas_hash_size(ep->hash) >= 512)
 		    _e_path_cache_free(ep);
 		  ep->hash = evas_hash_add(ep->hash, file,
-					   evas_stringshare_add(buf));
-		  return evas_stringshare_add(buf);
+					   eina_stringshare_add(buf));
+		  return eina_stringshare_add(buf);
 	       }
 	  }
      }
@@ -281,8 +281,8 @@ e_path_find(E_Path *ep, const char *file)
 		  if (evas_hash_size(ep->hash) >= 512)
 		    _e_path_cache_free(ep);
 		  ep->hash = evas_hash_add(ep->hash, file,
-					   evas_stringshare_add(buf));
-		  return evas_stringshare_add(buf);
+					   eina_stringshare_add(buf));
+		  return eina_stringshare_add(buf);
 	       }
 	  }
      }
@@ -307,7 +307,7 @@ e_path_evas_append(E_Path *ep, Evas *evas)
 	
 	epd = l->data;
 	if (epd->dir) evas_font_path_append(evas, epd->dir);
-	evas_stringshare_del(epd->dir);
+	eina_stringshare_del(epd->dir);
 	free(epd);
      }
    if (dir_list) evas_list_free(dir_list);
@@ -330,7 +330,7 @@ e_path_dir_list_get(E_Path *ep)
 	  {
 	     epd = l->data;
 	     new_epd = malloc(sizeof(E_Path_Dir));
-	     new_epd->dir = evas_stringshare_add(epd->dir);
+	     new_epd->dir = eina_stringshare_add(epd->dir);
 	     dir_list = evas_list_append(dir_list, new_epd);
 	  }
      }
@@ -339,7 +339,7 @@ e_path_dir_list_get(E_Path *ep)
      {
 	epd = l->data;
 	new_epd = malloc(sizeof(E_Path_Dir));
-	new_epd->dir = evas_stringshare_add(epd->dir);
+	new_epd->dir = eina_stringshare_add(epd->dir);
 	dir_list = evas_list_append(dir_list, new_epd);
      }
 
@@ -355,7 +355,7 @@ e_path_dir_list_free(Evas_List *dir_list)
      {
 	epd = dir_list->data;
 	dir_list = evas_list_remove_list(dir_list, dir_list);
-	evas_stringshare_del(epd->dir);
+	eina_stringshare_del(epd->dir);
 	free(epd);
      }
 }
@@ -369,7 +369,7 @@ _e_path_free(E_Path *ep)
      {
 	E_Path_Dir *epd;
 	epd = ep->default_dir_list->data;
-	evas_stringshare_del(epd->dir);
+	eina_stringshare_del(epd->dir);
 	free(epd);
 	ep->default_dir_list = evas_list_remove_list(ep->default_dir_list, 
 						     ep->default_dir_list);
@@ -389,6 +389,6 @@ _e_path_cache_free(E_Path *ep)
 static Evas_Bool
 _e_path_cache_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
 {
-   evas_stringshare_del(data);
+   eina_stringshare_del(data);
    return 1;
 }