util: add wrapper for realloc to avoid specyfing type

[elogind.git] / src / shared / util.h

diff --git a/src/shared/util.h b/src/shared/util.h
index 4c4aed583e9afafc159b7da9a4c40eeadb9d1d59..99ec0a39bdc4ee1212d4f6aec5ab974c3468d4a9 100644 (file)
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -37,8 +37,8 @@
 #include <sys/resource.h>
 #include <stddef.h>
 #include <unistd.h>
-#include <systemd/sd-journal.h>
 
+#include <systemd/sd-journal.h>
 #include "macro.h"
 #include "time-util.h"
 
@@ -539,6 +539,8 @@ static inline void journal_closep(sd_journal **j) {
         sd_journal_close(*j);
 }
 
+#define _cleanup_globfree_ __attribute__((cleanup(globfree)))
+
 _malloc_  static inline void *malloc_multiply(size_t a, size_t b) {
         if (_unlikely_(b == 0 || a > ((size_t) -1) / b))
                 return NULL;
@@ -616,6 +618,8 @@ char *strextend(char **x, ...);
 char *strrep(const char *s, unsigned n);
 
 void* greedy_realloc(void **p, size_t *allocated, size_t need);
+#define GREEDY_REALLOC(array, allocated, need) \
+        greedy_realloc((void**) &(array), &(allocated), (sizeof *array) * (need))
 
 static inline void _reset_errno_(int *saved_errno) {
         errno = *saved_errno;
@@ -644,3 +648,12 @@ static inline unsigned u64log2(uint64_t n) {
 static inline bool logind_running(void) {
         return access("/run/systemd/seats/", F_OK) >= 0;
 }
+
+static inline unsigned decimal_str_max(unsigned x) {
+        unsigned ans = 1;
+        while (x /= 10)
+                ans ++;
+        return ans;
+}
+
+int unlink_noerrno(const char *path);