intset housekeeping

diff --git a/intset.c b/intset.c
index f1bbcde321eb795ae512c7bfc5c8f88a3d8f56e2..1ee8263c0136d318c13f731684300395918162dd 100644 (file)
--- a/intset.c
+++ b/intset.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#include <stdint.h>

 #include "intset.h"
 #include "zmalloc.h"
 
 #include "intset.h"
 #include "zmalloc.h"
 


@@ -152,7 +151,7 @@ intset *intsetAdd(intset *is, int64_t value, uint8_t *success) {
 }
 
 /* Delete integer from intset */
 }
 
 /* Delete integer from intset */

-intset *intsetDelete(intset *is, int64_t value, uint8_t *success) {
+intset *intsetRemove(intset *is, int64_t value, uint8_t *success) {

     uint8_t valenc = INTSET_VALUE_ENCODING(value);
     uint32_t pos;
     if (success) *success = 0;
     uint8_t valenc = INTSET_VALUE_ENCODING(value);
     uint32_t pos;
     if (success) *success = 0;


@@ -370,7 +369,7 @@ int main(int argc, char **argv) {
             assert(intsetFind(is,v1));
 
             v2 = rand() % 0xfff;
             assert(intsetFind(is,v1));
 
             v2 = rand() % 0xfff;

-            is = intsetDelete(is,v2,NULL);
+            is = intsetRemove(is,v2,NULL);

             assert(!intsetFind(is,v2));
         }
         checkConsistency(is);
             assert(!intsetFind(is,v2));
         }
         checkConsistency(is);

diff --git a/intset.h b/intset.h
index 9d91710a13acfc86bb051c0bd1db6521a35c1339..b90c44e09c98d0d2e0f3c3d6b96f5c02e6c70a59 100644 (file)
--- a/intset.h
+++ b/intset.h
@@ -1,5 +1,6 @@
 #ifndef __INTSET_H
 #define __INTSET_H
 #ifndef __INTSET_H
 #define __INTSET_H

+#include <stdint.h>

 
 typedef struct intset {
     uint32_t encoding;
 
 typedef struct intset {
     uint32_t encoding;


@@ -9,7 +10,7 @@ typedef struct intset {
 
 intset *intsetNew(void);
 intset *intsetAdd(intset *is, int64_t value, uint8_t *success);
 
 intset *intsetNew(void);
 intset *intsetAdd(intset *is, int64_t value, uint8_t *success);

-intset *intsetDelete(intset *is, int64_t value, uint8_t *success);
+intset *intsetRemove(intset *is, int64_t value, uint8_t *success);

 uint8_t intsetFind(intset *is, int64_t value);
 int64_t intsetRandom(intset *is);
 
 uint8_t intsetFind(intset *is, int64_t value);
 int64_t intsetRandom(intset *is);