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>

diff --git a/send-utils.c b/send-utils.c
index c3d8c3e..fa09bb4 100644 (file)
--- a/send-utils.c
+++ b/send-utils.c
@@ -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);

diff --git a/send-utils.h b/send-utils.h
index 32e4fdc..b4f45d3 100644 (file)
--- a/send-utils.h
+++ b/send-utils.h
@@ -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