redefine static inline functions to normal functions
SVN revision: 44539
This commit is contained in:
parent
6ffaf58927
commit
905a80f421
|
@ -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);
|
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
|
size_t
|
||||||
e_prefix_data_snprintf(char *dst, size_t size, const char *fmt, ...)
|
e_prefix_data_snprintf(char *dst, size_t size, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
|
|
|
@ -17,12 +17,9 @@ EAPI const char *e_prefix_data_get(void);
|
||||||
EAPI const char *e_prefix_lib_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_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);
|
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)
|
#define e_prefix_data_concat_static(dst, path) e_prefix_data_concat_len(dst, sizeof(dst), path, (sizeof(path) > 0) ? sizeof(path) - 1 : 0)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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);
|
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, ...).
|
* 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);
|
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, ...).
|
* same as snprintf("~/.e/e/"fmt, ...).
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -8,22 +8,16 @@
|
||||||
|
|
||||||
EAPI const char *e_user_homedir_get(void);
|
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_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);
|
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)
|
#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 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_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);
|
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)
|
#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);
|
EAPI const char *e_user_desktop_dir_get(void);
|
||||||
|
|
Loading…
Reference in New Issue