New upstream release

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

diff --git a/tools-util.h b/tools-util.h
index 9468f070f3729d369de681a413199b5156c0e8cd..d1122f5d1556d34970d5704c06dedb8eb832b583 100644 (file)
--- a/tools-util.h
+++ b/tools-util.h
@@ -18,7 +18,7 @@
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/uuid.h>
-#include "ccan/darray/darray.h"
+#include "libbcachefs/darray.h"
 
 #define noreturn __attribute__((noreturn))
 
@@ -53,22 +53,7 @@ struct stat xstat(const char *);
        _ret;                                                           \
 })
 
-int printf_pad(unsigned pad, const char * fmt, ...);
-
-enum units {
-       BYTES,
-       SECTORS,
-       HUMAN_READABLE,
-};
-
-struct units_buf __pr_units(s64, enum units);
-
-struct units_buf {
-       char    b[20];
-};
-
-#define pr_units(_v, _u)       &(__pr_units(_v, _u).b[0])
-
+void write_file_str(int, const char *, const char *);
 char *read_file_str(int, const char *);
 u64 read_file_u64(int, const char *);
 
@@ -86,14 +71,14 @@ struct range {
        u64             end;
 };
 
-typedef darray(struct range) ranges;
+typedef DARRAY(struct range) ranges;
 
 static inline void range_add(ranges *data, u64 offset, u64 size)
 {
-       darray_append(*data, (struct range) {
+       darray_push(data, ((struct range) {
                .start = offset,
                .end = offset + size
-       });
+       }));
 }
 
 void ranges_sort_merge(ranges *);
@@ -109,9 +94,9 @@ struct hole_iter {
 static inline struct range hole_iter_next(struct hole_iter *iter)
 {
        struct range r = {
-               .start  = iter->idx ? iter->r.item[iter->idx - 1].end : 0,
-               .end    = iter->idx < iter->r.size
-                       ? iter->r.item[iter->idx].start : iter->end,
+               .start  = iter->idx ? iter->r.data[iter->idx - 1].end : 0,
+               .end    = iter->idx < iter->r.nr
+                       ? iter->r.data[iter->idx].start : iter->end,
        };
 
        BUG_ON(r.start > r.end);
@@ -122,7 +107,7 @@ static inline struct range hole_iter_next(struct hole_iter *iter)
 
 #define for_each_hole(_iter, _ranges, _end, _i)                                \
        for (_iter = (struct hole_iter) { .r = _ranges, .end = _end };  \
-            (_iter.idx <= _iter.r.size &&                              \
+            (_iter.idx <= _iter.r.nr &&                                \
              (_i = hole_iter_next(&_iter), true));)
 
 #include <linux/fiemap.h>