btrfs-progs: receive: use static buffer for mount point option argument

[platform/upstream/btrfs-progs.git] / utils.h

diff --git a/utils.h b/utils.h
index e771482..8ed18e1 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -69,6 +69,8 @@
 #define GETOPT_VAL_GBYTES                      262
 #define GETOPT_VAL_TBYTES                      263
 
+#define GETOPT_VAL_HELP                                270
+
 int check_argc_exact(int nargs, int expected);
 int check_argc_min(int nargs, int expected);
 int check_argc_max(int nargs, int expected);
@@ -127,17 +129,13 @@ int btrfs_device_already_in_root(struct btrfs_root *root, int fd,
 
 int pretty_size_snprintf(u64 size, char *str, size_t str_bytes, unsigned unit_mode);
 #define pretty_size(size)      pretty_size_mode(size, UNITS_DEFAULT)
-#define pretty_size_mode(size, mode)                                         \
-       ({                                                                    \
-               static __thread char _str[32];                                \
-               (void)pretty_size_snprintf((size), _str, sizeof(_str), (mode)); \
-               _str;                                                         \
-       })
+const char *pretty_size_mode(u64 size, unsigned mode);
 
 int get_mountpt(char *dev, char *mntpt, size_t size);
 u64 parse_size(char *s);
 u64 parse_qgroupid(const char *p);
 u64 arg_strtou64(const char *str);
+int arg_copy_path(char *dest, const char *src, int destlen);
 int open_file_or_dir(const char *fname, DIR **dirstream);
 int open_file_or_dir3(const char *fname, DIR **dirstream, int open_flags);
 void close_file_or_dir(int fd, DIR *dirstream);
@@ -154,10 +152,10 @@ int open_path_or_dev_mnt(const char *path, DIR **dirstream);
 u64 btrfs_device_size(int fd, struct stat *st);
 /* Helper to always get proper size of the destination string */
 #define strncpy_null(dest, src) __strncpy__null(dest, src, sizeof(dest))
-int test_dev_for_mkfs(char *file, int force_overwrite, char *estr);
+int test_dev_for_mkfs(char *file, int force_overwrite);
 int get_label_mounted(const char *mount_path, char *labelp);
 int test_num_disk_vs_raid(u64 metadata_profile, u64 data_profile,
-       u64 dev_cnt, int mixed, char *estr);
+       u64 dev_cnt, int mixed);
 int group_profile_max_safe_loss(u64 flags);
 int is_vol_small(char *file);
 int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf,