Merge pull request #44 from akozumpl/archs

[platform/upstream/libsolv.git] / src / bitmap.c

diff --git a/src/bitmap.c b/src/bitmap.c
index 0ebd2d9..1bf1666 100644 (file)
--- a/src/bitmap.c
+++ b/src/bitmap.c
@@ -1,6 +1,13 @@
 /*
+ * Copyright (c) 2007, Novell Inc.
+ *
+ * This program is licensed under the BSD license, read LICENSE.BSD
+ * for further information
+ */
+
+/*
  * bitmap.c
- * 
+ *
  */
 
 #include <stdlib.h>
@@ -9,28 +16,85 @@
 #include "bitmap.h"
 #include "util.h"
 
+/* constructor */
 void
-mapinit(Map *m, int n)
+map_init(Map *m, int n)
 {
   m->size = (n + 7) >> 3;
-  m->map = xcalloc(m->size, 1);
+  m->map = m->size ? solv_calloc(m->size, 1) : 0;
 }
 
-// free space allocated
+/* destructor */
 void
-mapfree(Map *m)
+map_free(Map *m)
 {
-  m->map = xfree(m->map);
+  m->map = solv_free(m->map);
   m->size = 0;
 }
 
-// copy t <- s
+/* copy constructor t <- s */
 void
-clonemap(Map *t, Map *s)
+map_init_clone(Map *t, Map *s)
 {
   t->size = s->size;
-  t->map = xmalloc(s->size);
-  memcpy(t->map, s->map, t->size);
+  if (s->size)
+    {
+      t->map = solv_malloc(s->size);
+      memcpy(t->map, s->map, s->size);
+    }
+  else
+    t->map = 0;
+}
+
+/* grow a map */
+void
+map_grow(Map *m, int n)
+{
+  n = (n + 7) >> 3;
+  if (m->size < n)
+    {
+      m->map = solv_realloc(m->map, n);
+      memset(m->map + m->size, 0, n - m->size);
+      m->size = n;
+    }
+}
+
+/* bitwise-ands maps t and s, stores the result in t. */
+void
+map_and(Map *t, Map *s)
+{
+    unsigned char *ti, *si, *end;
+    ti = t->map;
+    si = s->map;
+    end = ti + (t->size < s->size ? t->size : s->size);
+    while (ti < end)
+       *ti++ &= *si++;
+}
+
+/* bitwise-ors maps t and s, stores the result in t. */
+void
+map_or(Map *t, Map *s)
+{
+    unsigned char *ti, *si, *end;
+    if (t->size < s->size)
+      map_grow(t, s->size << 3);
+    ti = t->map;
+    si = s->map;
+    end = ti + (t->size < s->size ? t->size : s->size);
+    while (ti < end)
+       *ti++ |= *si++;
+}
+
+/* remove all set bits in s from t. */
+void
+map_subtract(Map *t, Map *s)
+{
+    unsigned char *ti, *si, *end;
+    ti = t->map;
+    si = s->map;
+    end = ti + (t->size < s->size ? t->size : s->size);
+    while (ti < end)
+       *ti++ &= ~*si++;
 }
 
-// EOF
+/* EOF */