Imported Upstream version 0.7.21

[platform/upstream/libsolv.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index d8a136d..9c2b824 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -29,10 +29,12 @@ extern void *solv_malloc2(size_t, size_t);
 extern void *solv_calloc(size_t, size_t);
 extern void *solv_realloc(void *, size_t);
 extern void *solv_realloc2(void *, size_t, size_t);
+extern void *solv_extend_realloc(void *, size_t, size_t, size_t);
 extern void *solv_free(void *);
 extern char *solv_strdup(const char *);
 extern void solv_oom(size_t, size_t);
 extern unsigned int solv_timems(unsigned int subtract);
+extern int solv_setcloexec(int fd, int state);
 extern void solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard);
 extern char *solv_dupjoin(const char *str1, const char *str2, const char *str3);
 extern char *solv_dupappend(const char *str1, const char *str2, const char *str3);
@@ -48,12 +50,12 @@ static inline void *solv_extend(void *buf, size_t len, size_t nmemb, size_t size
   if (nmemb == 1)
     {
       if ((len & block) == 0)
-       buf = solv_realloc2(buf, len + (1 + block), size);
+       buf = solv_extend_realloc(buf, len + 1, size, block);
     }
   else
     {
       if (((len - 1) | block) != ((len + nmemb - 1) | block))
-       buf = solv_realloc2(buf, (len + (nmemb + block)) & ~block, size);
+       buf = solv_extend_realloc(buf, len + nmemb, size, block);
     }
   return buf;
 }
@@ -76,7 +78,7 @@ static inline void *solv_zextend(void *buf, size_t len, size_t nmemb, size_t siz
 static inline void *solv_extend_resize(void *buf, size_t len, size_t size, size_t block)
 {
   if (len)
-    buf = solv_realloc2(buf, (len + block) & ~block, size);
+    buf = solv_extend_realloc(buf, len, size, block);
   return buf;
 }
 
@@ -85,12 +87,12 @@ static inline void *solv_calloc_block(size_t len, size_t size, size_t block)
   void *buf;
   if (!len)
     return 0;
-  buf = solv_malloc2((len + block) & ~block, size);
+  buf = solv_extend_realloc((void *)0, len, size, block);
   memset(buf, 0, ((len + block) & ~block) * size);
   return buf;
 }
 
-static inline void *solv_memdup(void *buf, size_t len)
+static inline void *solv_memdup(const void *buf, size_t len)
 {
   void *newbuf;
   if (!buf)
@@ -101,7 +103,7 @@ static inline void *solv_memdup(void *buf, size_t len)
   return newbuf;
 }
 
-static inline void *solv_memdup2(void *buf, size_t num, size_t len)
+static inline void *solv_memdup2(const void *buf, size_t num, size_t len)
 {
   void *newbuf;
   if (!buf)