X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=send-utils.h;h=e8f86912b246b7df942b23025691f95e0f2a8bc0;hb=3cfe67998a71256bd95f4b2942bd4b3481b550d5;hp=f451c1cb60714212018d6eb5a0e87345801c8b18;hpb=197c6d85ffbfabcb262b111ee0fb373c414d425f;p=platform%2Fupstream%2Fbtrfs-progs.git

diff --git a/send-utils.h b/send-utils.h
index f451c1c..e8f8691 100644
--- a/send-utils.h
+++ b/send-utils.h
@@ -15,13 +15,16 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 021110-1307, USA.
  */
-#ifndef SEND_UTILS_H_
-#define SEND_UTILS_H_
+
+#ifndef __BTRFS_SEND_UTILS_H__
+#define __BTRFS_SEND_UTILS_H__
 
 #if BTRFS_FLAT_INCLUDES
+#include "kerncompat.h"
 #include "ctree.h"
 #include "rbtree.h"
 #else
+#include <btrfs/kerncompat.h>
 #include <btrfs/ctree.h>
 #include <btrfs/rbtree.h>
 #endif /* BTRFS_FLAT_INCLUDES */
@@ -77,20 +80,44 @@ struct subvol_uuid_search {
 
 int subvol_uuid_search_init(int mnt_fd, struct subvol_uuid_search *s);
 void subvol_uuid_search_finit(struct subvol_uuid_search *s);
+/*
+ * Search for a subvolume by given type (received uuid, root id, path), returns
+ * pointer to newly allocated struct subvol_info or NULL in case it's not found
+ * or there was another error. This ambiguity of error value is fixed by
+ * subvol_uuid_search2 that returns a negative errno in case of an error, of a
+ * valid pointer otherwise.
+ *
+ * This function will be deprecated in the future, please consider using v2 in
+ * new code unless you need to keep backward compatibility with older
+ * btrfs-progs.
+ */
 struct subvol_info *subvol_uuid_search(struct subvol_uuid_search *s,
 				       u64 root_id, const u8 *uuid, u64 transid,
 				       const char *path,
 				       enum subvol_search_type type);
+struct subvol_info *subvol_uuid_search2(struct subvol_uuid_search *s,
+				       u64 root_id, const u8 *uuid, u64 transid,
+				       const char *path,
+				       enum subvol_search_type type);
 void subvol_uuid_search_add(struct subvol_uuid_search *s,
 			    struct subvol_info *si);
 
 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_cat3_out(char *out, const char *p1, const char *p2, const char *p3);
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* SEND_UTILS_H_ */
+#endif