- add SOLVER_NOAUTOSET to disable automatic SET deduction

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

diff --git a/src/dirpool.c b/src/dirpool.c
index e843b2a..afccf50 100644 (file)
--- a/src/dirpool.c
+++ b/src/dirpool.c
@@ -10,30 +10,31 @@
 
 #include "pool.h"
 #include "util.h"
+#include "dirpool.h"
 
 #define DIR_BLOCK 127
 
-typedef struct _Dirpool {
-  Id *dirs;
-  int ndirs;
-  Id *dirtraverse;
-} Dirpool;
-
 void
-dirpool_create(Dirpool *dp)
+dirpool_init(Dirpool *dp)
 {
   memset(dp, 0, sizeof(*dp));
 }
 
 void
+dirpool_free(Dirpool *dp)
+{
+  sat_free(dp->dirs);
+  sat_free(dp->dirtraverse);
+}
+
+void
 dirpool_make_dirtraverse(Dirpool *dp)
 {
   Id parent, i, *dirtraverse;
   if (!dp->ndirs)
     return;
   dp->dirs = sat_extend_resize(dp->dirs, dp->ndirs, sizeof(Id), DIR_BLOCK);
-  dirtraverse = sat_extend_resize(0, dp->ndirs, sizeof(Id), DIR_BLOCK);
-  memset(dirtraverse, 0, dp->ndirs * sizeof(Id));
+  dirtraverse = sat_calloc_block(dp->ndirs, sizeof(Id), DIR_BLOCK);
   for (parent = 0, i = 0; i < dp->ndirs; i++)
     {
       if (dp->dirs[i] > 0)
@@ -52,6 +53,8 @@ dirpool_add_dir(Dirpool *dp, Id parent, Id comp, int create)
 
   if (!dp->ndirs)
     {
+      if (!create)
+       return 0;
       dp->ndirs = 2;
       dp->dirs = sat_extend_resize(dp->dirs, dp->ndirs, sizeof(Id), DIR_BLOCK);
       dp->dirs[0] = 0;
@@ -100,4 +103,3 @@ dirpool_add_dir(Dirpool *dp, Id parent, Id comp, int create)
   dp->dirtraverse[dp->ndirs] = 0;
   return dp->ndirs++;
 }
-