marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: send utils: deprecate path_cat and path_cat3 

The functios do no allocation error handling, use _out variants instead.

Signed-off-by: David Sterba <dsterba@suse.cz>
master
David Sterba 2015-06-16 16:37:18 +02:00
parent e6658cd54a
commit 8c44cd110c
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
send-utils.c
View File

@ -727,6 +727,7 @@ int path_cat_out(char *out, const char *p1, const char *p2)
return 0;
}
__attribute__((deprecated("please use path_cat_out")))
char *path_cat(const char *p1, const char *p2)
{
int p1_len = strlen(p1);
@ -758,6 +759,7 @@ int path_cat3_out(char *out, const char *p1, const char *p2, const char *p3)
return 0;
}
__attribute__((deprecated("please use path_cat3_out")))
char *path_cat3(const char *p1, const char *p2, const char *p3)
{
int p1_len = strlen(p1);

9
send-utils.h
View File

@ -89,9 +89,16 @@ void subvol_uuid_search_add(struct subvol_uuid_search *s,
int btrfs_subvolid_resolve(int fd, char *path, size_t path_len, u64 subvol_id);
/*
* DEPRECATED: the functions path_cat and path_cat3 are unsafe and should not
* be used, use the _out variants and always check the return code.
*/
__attribute__((deprecated("please use path_cat_out")))
char *path_cat(const char *p1, const char *p2);
int path_cat_out(char *out, const char *p1, const char *p2);
__attribute__((deprecated("please use path_cat3_out")))
char *path_cat3(const char *p1, const char *p2, const char *p3);
int path_cat_out(char *out, const char *p1, const char *p2);
int path_cat3_out(char *out, const char *p1, const char *p2, const char *p3);
#ifdef __cplusplus