RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: send-utils: remove unused functions path_cat and path_cat3 

Since function path_cat and path_cat3 are not used anymore, remove them.
They have been reprecated since version 4.0.

Signed-off-by: Gu Jinxiang <gujx@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Gu Jinxiang 2018-04-09 13:43:30 +08:00 committed by David Sterba
parent 0d4adfd336
commit 6bcb03dda1
2 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
send-utils.c
View File

@ -757,18 +757,6 @@ int path_cat_out(char *out, const char *p1, const char *p2)
return 0; return 0;
} }
__attribute__((deprecated))
char *path_cat(const char *p1, const char *p2)
{
int p1_len = strlen(p1);
int p2_len = strlen(p2);
char *new = malloc(p1_len + p2_len + 2);
path_cat_out(new, p1, p2);
return new;
}
int path_cat3_out(char *out, const char *p1, const char *p2, const char *p3) int path_cat3_out(char *out, const char *p1, const char *p2, const char *p3)
{ {
int p1_len = strlen(p1); int p1_len = strlen(p1);
@ -788,16 +776,3 @@ int path_cat3_out(char *out, const char *p1, const char *p2, const char *p3)
return 0; return 0;
} }
__attribute__((deprecated))
char *path_cat3(const char *p1, const char *p2, const char *p3)
{
int p1_len = strlen(p1);
int p2_len = strlen(p2);
int p3_len = strlen(p3);
char *new = malloc(p1_len + p2_len + p3_len + 3);
path_cat3_out(new, p1, p2, p3);
return new;
}

9
send-utils.h
View File

@ -104,15 +104,6 @@ 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); 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))
char *path_cat(const char *p1, const char *p2);
__attribute__((deprecated))
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_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); int path_cat3_out(char *out, const char *p1, const char *p2, const char *p3);