Improve output of "N-bit" items in json data.

[rsync.git] / ifuncs.h

diff --git a/ifuncs.h b/ifuncs.h
index 0fe900a3db5e55979ef46a27682f9f4321183c1f..956fc22eb8286a8a0e81de92dbab870ccc08034b 100644 (file)
--- a/ifuncs.h
+++ b/ifuncs.h
@@ -1,6 +1,6 @@
 /* Inline functions for rsync.
  *
- * Copyright (C) 2007-2008 Wayne Davison
+ * Copyright (C) 2007-2022 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,8 +19,7 @@
 static inline void
 alloc_xbuf(xbuf *xb, size_t sz)
 {
-       if (!(xb->buf = new_array(char, sz)))
-               out_of_memory("alloc_xbuf");
+       xb->buf = new_array(char, sz);
        xb->size = sz;
        xb->len = xb->pos = 0;
 }
@@ -29,12 +28,18 @@ static inline void
 realloc_xbuf(xbuf *xb, size_t sz)
 {
        char *bf = realloc_array(xb->buf, char, sz);
-       if (!bf)
-               out_of_memory("realloc_xbuf");
        xb->buf = bf;
        xb->size = sz;
 }
 
+static inline void
+free_xbuf(xbuf *xb)
+{
+       if (xb->buf)
+               free(xb->buf);
+       memset(xb, 0, sizeof (xbuf));
+}
+
 static inline int
 to_wire_mode(mode_t mode)
 {
@@ -66,3 +71,42 @@ d_name(struct dirent *di)
        return di->d_name;
 #endif
 }
+
+static inline void
+init_stat_x(stat_x *sx_p)
+{
+       sx_p->crtime = 0;
+#ifdef SUPPORT_ACLS
+       sx_p->acc_acl = sx_p->def_acl = NULL;
+#endif
+#ifdef SUPPORT_XATTRS
+       sx_p->xattr = NULL;
+#endif
+}
+
+static inline void
+free_stat_x(stat_x *sx_p)
+{
+#ifdef SUPPORT_ACLS
+    {
+       extern int preserve_acls;
+       if (preserve_acls)
+               free_acl(sx_p);
+    }
+#endif
+#ifdef SUPPORT_XATTRS
+    {
+       extern int preserve_xattrs;
+       if (preserve_xattrs)
+               free_xattr(sx_p);
+    }
+#endif
+}
+
+static inline char *my_strdup(const char *str, const char *file, int line)
+{
+    int len = strlen(str)+1;
+    char *buf = my_alloc(NULL, len, 1, file, line);
+    memcpy(buf, str, len);
+    return buf;
+}