support -X option in rpmmd2solv, make add_autopattern available in bindings

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

diff --git a/src/bitmap.c b/src/bitmap.c
index 94a88ca..1bf1666 100644 (file)
--- a/src/bitmap.c
+++ b/src/bitmap.c
@@ -7,7 +7,7 @@
 
 /*
  * bitmap.c
- * 
+ *
  */
 
 #include <stdlib.h>
@@ -59,16 +59,42 @@ map_grow(Map *m, int n)
     }
 }
 
-/* bitwise-ands same-sized maps t and s, stores the result in t. */
+/* 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;
+    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 */