Ecore_Str.h -> Eina

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/efreet@45741 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/efreet.c b/src/lib/efreet.c
index 38e6877..11541db 100644 (file)
--- a/src/lib/efreet.c
+++ b/src/lib/efreet.c
@@ -8,8 +8,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <Ecore_Str.h>
-
 #include "Efreet.h"
 #include "efreet_private.h"
 #include "efreet_xml.h"
@@ -240,7 +238,7 @@ efreet_array_cat(char *buffer, size_t size, const char *strs[])
     size_t n;
     for (i = 0, n = 0; n < size && strs[i]; i++)
     {
-        n += ecore_strlcpy(buffer + n, strs[i], size - n);
+        n += eina_strlcpy(buffer + n, strs[i], size - n);
     }
     return n;
 }

diff --git a/src/lib/efreet_desktop.c b/src/lib/efreet_desktop.c
index b6a1af6..6b939dc 100644 (file)
--- a/src/lib/efreet_desktop.c
+++ b/src/lib/efreet_desktop.c
@@ -16,7 +16,6 @@
 #endif
 
 #include <Ecore.h>
-#include <Ecore_Str.h>
 #include <Ecore_File.h>
 
 #include "Efreet.h"
@@ -1583,7 +1582,7 @@ efreet_string_append(char *dest, int *size, int *len, const char *src)
     int l;
     int off = 0;
 
-    l = ecore_strlcpy(dest + *len, src, *size - *len);
+    l = eina_strlcpy(dest + *len, src, *size - *len);
 
     while (l > *size - *len)
     {
@@ -1594,7 +1593,7 @@ efreet_string_append(char *dest, int *size, int *len, const char *src)
         dest = realloc(dest, *size);
         *(dest + *len) = '\0';
 
-        l = ecore_strlcpy(dest + *len, src + off, *size - *len);
+        l = eina_strlcpy(dest + *len, src + off, *size - *len);
     }
     *len += l;
 

diff --git a/src/lib/efreet_icon.c b/src/lib/efreet_icon.c
index 12714e5..8e4c677 100644 (file)
--- a/src/lib/efreet_icon.c
+++ b/src/lib/efreet_icon.c
@@ -13,7 +13,6 @@
 #include <limits.h>
 
 #include <Ecore.h>
-#include <Ecore_Str.h>
 #include <Ecore_File.h>
 
 #include "Efreet.h"
@@ -889,7 +888,7 @@ efreet_icon_fallback_dir_scan(const char *dir, const char *icon_name)
     size = efreet_array_cat(path, sizeof(path), icon_path);
     EINA_LIST_FOREACH(efreet_icon_extensions, l, ext)
     {
-        ecore_strlcpy(path + size, ext, sizeof(path) - size);
+        eina_strlcpy(path + size, ext, sizeof(path) - size);
 
         if (ecore_file_exists(path))
         {
@@ -939,7 +938,7 @@ efreet_icon_lookup_directory_helper(Efreet_Icon_Theme_Directory *dir,
 
     EINA_LIST_FOREACH(efreet_icon_extensions, l, ext)
     {
-        ecore_strlcpy(file_path + len, ext, sizeof(file_path) - len);
+        eina_strlcpy(file_path + len, ext, sizeof(file_path) - len);
 
         if (ecore_file_exists(file_path))
         {

diff --git a/src/lib/efreet_menu.c b/src/lib/efreet_menu.c
index 2a5a078..8e2a4fb 100644 (file)
--- a/src/lib/efreet_menu.c
+++ b/src/lib/efreet_menu.c
@@ -10,7 +10,6 @@
 #include <dirent.h>
 #include <limits.h>
 
-#include <Ecore_Str.h>
 #include <Ecore_File.h>
 
 #include "Efreet.h"
@@ -1939,9 +1938,9 @@ efreet_menu_handle_legacy_dir_helper(Efreet_Menu_Internal *root,
 
         if (!strcmp(file->d_name, ".") || !strcmp(file->d_name, "..")) continue;
         file_path[0] = '\0';
-        ecore_strlcpy(file_path, path, PATH_MAX);
-        ecore_strlcpy(file_path + path_len, "/", PATH_MAX - path_len);
-        ecore_strlcpy(file_path + path_len + 1, file->d_name, PATH_MAX - path_len - 1);
+        eina_strlcpy(file_path, path, PATH_MAX);
+        eina_strlcpy(file_path + path_len, "/", PATH_MAX - path_len);
+        eina_strlcpy(file_path + path_len + 1, file->d_name, PATH_MAX - path_len - 1);
 
         /* recurse into sub directories */
         if (ecore_file_is_dir(file_path))