- clean up a bit

diff --git a/src/solver.c b/src/solver.c
index 65f2959ccd4cf8249b3c2c5dc8d4dc299ea3a254..be80d8234eb3d9dc4e2962fdab00180601f7b5e0 100644 (file)
--- a/src/solver.c
+++ b/src/solver.c
@@ -3569,7 +3569,7 @@ solver_solve(Solver *solv, Queue *job)
          if (MAPTST(&addedmap, i))
            possible++;
        }
-      POOL_DEBUG(SAT_DEBUG_STATS, "%d of %d installable solvables considered for solving (rules has been generated for)\n", possible, installable);
+      POOL_DEBUG(SAT_DEBUG_STATS, "%d of %d installable solvables considered for solving\n", possible, installable);
     }
 
   /*

diff --git a/src/util.c b/src/util.c
index d6e68587e7b92c9139f8b249f35b6ab936118b5d..6ebf864b2041e88696a0226ed2d758f62c8f1a89 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -12,24 +12,30 @@
 
 #include "util.h"
 
+void
+sat_oom(size_t num, size_t len)
+{
+  if (num)
+    fprintf(stderr, "Out of memory allocating %zu*%zu bytes!\n", num, len);
+  else
+    fprintf(stderr, "Out of memory allocating %zu bytes!\n", num);
+  exit(1);
+}
+
 void *
 sat_malloc(size_t len)
 {
   void *r = malloc(len ? len : 1);
-  if (r)
-    return r;
-  fprintf(stderr, "Out of memory allocating %zu bytes!\n", len);
-  exit(1);
+  if (!r)
+    sat_oom(0, len);
+  return r;
 }
 
 void *
 sat_malloc2(size_t num, size_t len)
 {
   if (len && (num * len) / len != num)
-    {
-      fprintf(stderr, "Out of memory allocating %zu*%zu bytes!\n", num, len);
-      exit(1);
-    }
+    sat_oom(num, len);
   return sat_malloc(num * len);
 }
 
@@ -40,20 +46,16 @@ sat_realloc(void *old, size_t len)
     old = malloc(len ? len : 1);
   else
     old = realloc(old, len ? len : 1);
-  if (old)
-    return old;
-  fprintf(stderr, "Out of memory reallocating %zu bytes!\n", len);
-  exit(1);
+  if (!old)
+    sat_oom(0, len);
+  return old;
 }
 
 void *
 sat_realloc2(void *old, size_t num, size_t len)
 {
   if (len && (num * len) / len != num)
-    {
-      fprintf(stderr, "Out of memory allocating %zu*%zu bytes!\n", num, len);
-      exit(1);
-    }
+   sat_oom(num, len);
   return sat_realloc(old, num * len);
 }
 
@@ -65,10 +67,9 @@ sat_calloc(size_t num, size_t len)
     r = malloc(1);
   else
     r = calloc(num, len);
-  if (r)
-    return r;
-  fprintf(stderr, "Out of memory allocating %zu bytes!\n", num * len);
-  exit(1);
+  if (!r)
+    sat_oom(num, len);
+  return r;
 }
 
 void *

diff --git a/src/util.h b/src/util.h
index d2748f27915fda8889640a2311e26b4bb016134d..5488965cd13bd986d2a99bc73b570a7cef944a17 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -22,6 +22,7 @@ extern void *sat_calloc(size_t, size_t);
 extern void *sat_realloc(void *, size_t);
 extern void *sat_realloc2(void *, size_t, size_t);
 extern void *sat_free(void *);
+extern void sat_oom(size_t, size_t);
 
 static inline void *sat_extend(void *buf, size_t len, size_t nmemb, size_t size, size_t block)
 {