diff --git a/src/bin/e_prefix.c b/src/bin/e_prefix.c index 38ce51bc6..b94410a69 100644 --- a/src/bin/e_prefix.c +++ b/src/bin/e_prefix.c @@ -524,6 +524,12 @@ e_prefix_data_concat_len(char *dst, size_t size, const char *path, size_t path_l return ecore_str_join_len(dst, size, '/', _prefix_path_data, _prefix_path_data_len, path, path_len); } +size_t +e_prefix_data_concat(char *dst, size_t size, const char *path) +{ + return e_prefix_data_concat_len(dst, size, path, strlen(path)); +} + size_t e_prefix_data_snprintf(char *dst, size_t size, const char *fmt, ...) { diff --git a/src/bin/e_prefix.h b/src/bin/e_prefix.h index f563d0318..65c58d7a7 100644 --- a/src/bin/e_prefix.h +++ b/src/bin/e_prefix.h @@ -17,12 +17,9 @@ EAPI const char *e_prefix_data_get(void); EAPI const char *e_prefix_lib_get(void); EAPI size_t e_prefix_data_concat_len(char *dst, size_t size, const char *path, size_t path_len); +EAPI size_t e_prefix_data_concat(char *dst, size_t size, const char *path); EAPI size_t e_prefix_data_snprintf(char *dst, size_t size, const char *fmt, ...) EINA_PRINTF(3, 4); -static inline size_t e_prefix_data_concat(char *dst, size_t size, const char *path) -{ - return e_prefix_data_concat_len(dst, size, path, strlen(path)); -} #define e_prefix_data_concat_static(dst, path) e_prefix_data_concat_len(dst, sizeof(dst), path, (sizeof(path) > 0) ? sizeof(path) - 1 : 0) diff --git a/src/bin/e_user.c b/src/bin/e_user.c index 8faeea567..c0836eb9a 100644 --- a/src/bin/e_user.c +++ b/src/bin/e_user.c @@ -49,6 +49,12 @@ e_user_homedir_concat_len(char *dst, size_t size, const char *path, size_t path_ return ecore_str_join_len(dst, size, '/', _e_user_homedir, _e_user_homedir_len, path, path_len); } +EAPI size_t +e_user_homedir_concat(char *dst, size_t size, const char *path) +{ + return e_user_homedir_concat_len(dst, size, path, strlen(path)); +} + /** * same as snprintf("~/"fmt, ...). */ @@ -153,6 +159,12 @@ e_user_dir_concat_len(char *dst, size_t size, const char *path, size_t path_len) return ecore_str_join_len(dst, size, '/', _e_user_dir, _e_user_dir_len, path, path_len); } +EAPI size_t +e_user_dir_concat(char *dst, size_t size, const char *path) +{ + return e_user_dir_concat_len(dst, size, path, strlen(path)); +} + /** * same as snprintf("~/.e/e/"fmt, ...). */ diff --git a/src/bin/e_user.h b/src/bin/e_user.h index 3e9d45aef..1e6a9d7b3 100644 --- a/src/bin/e_user.h +++ b/src/bin/e_user.h @@ -8,22 +8,16 @@ EAPI const char *e_user_homedir_get(void); EAPI size_t e_user_homedir_concat_len(char *dst, size_t size, const char *path, size_t path_len); +EAPI size_t e_user_homedir_concat(char *dst, size_t size, const char *path); EAPI size_t e_user_homedir_snprintf(char *dst, size_t size, const char *fmt, ...) EINA_PRINTF(3, 4); -static inline size_t e_user_homedir_concat(char *dst, size_t size, const char *path) -{ - return e_user_homedir_concat_len(dst, size, path, strlen(path)); -} #define e_user_homedir_concat_static(dst, path) e_user_homedir_concat_len(dst, sizeof(dst), path, (sizeof(path) > 0) ? sizeof(path) - 1 : 0) EAPI const char *e_user_dir_get(void); EAPI size_t e_user_dir_concat_len(char *dst, size_t size, const char *path, size_t path_len); +EAPI size_t e_user_dir_concat(char *dst, size_t size, const char *path); EAPI size_t e_user_dir_snprintf(char *dst, size_t size, const char *fmt, ...) EINA_PRINTF(3, 4); -static inline size_t e_user_dir_concat(char *dst, size_t size, const char *path) -{ - return e_user_dir_concat_len(dst, size, path, strlen(path)); -} #define e_user_dir_concat_static(dst, path) e_user_dir_concat_len(dst, sizeof(dst), path, (sizeof(path) > 0) ? sizeof(path) - 1 : 0) EAPI const char *e_user_desktop_dir_get(void);