Merge pull request #206 from kode54/fix-fsck-service

[bcachefs-tools-debian] / tools-util.h

diff --git a/tools-util.h b/tools-util.h
index dafd79166ade37e9afe5cce71e0e92c007d73c0e..563313845df3fe609ecb5b0742ea0364c8ef6e8c 100644 (file)
--- a/tools-util.h
+++ b/tools-util.h
@@ -28,15 +28,42 @@ void die(const char *, ...)
        __attribute__ ((format (printf, 1, 2))) noreturn;
 char *mprintf(const char *, ...)
        __attribute__ ((format (printf, 1, 2)));
-void *xcalloc(size_t, size_t);
-void *xmalloc(size_t);
-void *xrealloc(void *, size_t);
 void xpread(int, void *, size_t, off_t);
 void xpwrite(int, const void *, size_t, off_t, const char *);
 struct stat xfstatat(int, const char *, int);
 struct stat xfstat(int);
 struct stat xstat(const char *);
 
+static inline void *xmalloc(size_t size)
+{
+       void *p = malloc(size);
+
+       if (!p)
+               die("insufficient memory");
+
+       memset(p, 0, size);
+       return p;
+}
+
+static inline void *xcalloc(size_t count, size_t size)
+{
+       void *p = calloc(count, size);
+
+       if (!p)
+               die("insufficient memory");
+
+       return p;
+}
+
+static inline void *xrealloc(void *p, size_t size)
+{
+       p = realloc(p, size);
+       if (!p)
+               die("insufficient memory");
+
+       return p;
+}
+
 #define xopenat(_dirfd, _path, ...)                                    \
 ({                                                                     \
        int _fd = openat((_dirfd), (_path), __VA_ARGS__);               \
@@ -64,7 +91,8 @@ ssize_t read_string_list_or_die(const char *, const char * const[],
 
 u64 get_size(int);
 unsigned get_blocksize(int);
-int open_for_format(const char *, bool);
+struct dev_opts;
+int open_for_format(struct dev_opts *, bool);
 
 bool ask_yn(void);
 
@@ -171,4 +199,6 @@ do {                                                                        \
 struct bpos bpos_parse(char *);
 struct bbpos bbpos_parse(char *);
 
+darray_str get_or_split_cmdline_devs(int argc, char *argv[]);
+
 #endif /* _TOOLS_UTIL_H */