X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fgary.h;h=89760ffc65c8b1d09cffa73aeb313bcbd2a645ec;hb=e6688eeb82d349a202a30a243a59079bdc4c212d;hp=386dd765cc913a7557b5f27e770b31f01bdf2df1;hpb=305df0095d05525e1324cbc7c74d764535338b07;p=libucw.git

diff --git a/ucw/gary.h b/ucw/gary.h
index 386dd765..89760ffc 100644
--- a/ucw/gary.h
+++ b/ucw/gary.h
@@ -18,9 +18,10 @@ struct gary_hdr {
 #define GARY_BODY(ptr) ((byte *)(ptr) + GARY_HDR_SIZE)
 
 #define GARY_INIT(ptr, n) (ptr) = gary_init(sizeof(*(ptr)), (n))
-#define GARY_FREE(ptr) xfree(GARY_HDR(ptr))
+#define GARY_FREE(ptr) do { if (ptr) xfree(GARY_HDR(ptr)); } while (0)
 #define GARY_SIZE(ptr) (GARY_HDR(ptr)->num_elts)
-#define GARY_SET_SIZE(ptr, n) (ptr) = gary_set_size((ptr), (n))
+#define GARY_RESIZE(ptr, n) (ptr) = gary_set_size((ptr), (n))
+#define GARY_INIT_OR_RESIZE(ptr, n) (ptr) = (ptr) ? gary_set_size((ptr), (n)) : gary_init(sizeof(*(ptr)), (n))
 
 #define GARY_PUSH(ptr, n) ({						\
   struct gary_hdr *_h = GARY_HDR(ptr);					\