Rename poolid_private.h to pool_private.h

Also move the declaration of the internal functions from pool.h
to pool_private.h.

diff --git a/src/pool.h b/src/pool.h
index fda87abf0968b2c2fbc682ac5ce3532d868cebd5..d994256409964165e1fe9df9c02e960f8c49610d 100644 (file)
--- a/src/pool.h
+++ b/src/pool.h
@@ -398,10 +398,6 @@ long long pool_calc_installsizechange(Pool *pool, Map *installedmap);
 
 void pool_add_fileconflicts_deps(Pool *pool, Queue *conflicts);
 
-#ifdef LIBSOLV_INTERNAL
-Id *pool_lookup_languagecache_row(Pool *pool, Id keyname);
-#endif
-
 
 
 /* loop over all providers of d */

diff --git a/src/poolid_private.h b/src/pool_private.h
similarity index 57%
rename from src/poolid_private.h
rename to src/pool_private.h
index 0a8c51e9a3abb024f189cbb2a4dd5ca61c607df8..7f241db7982bcfd0143cc90410d6698f723aa259 100644 (file)
--- a/src/poolid_private.h
+++ b/src/pool_private.h
@@ -6,14 +6,16 @@
  */
 
 /*
- * poolid_private.h
+ * pool_private.h
  *
  */
 
-#ifndef LIBSOLV_POOLID_PRIVATE_H
-#define LIBSOLV_POOLID_PRIVATE_H
+#ifndef LIBSOLV_POOL_PRIVATE_H
+#define LIBSOLV_POOL_PRIVATE_H
 
 /* the size of all buffers is incremented in blocks */
 #define WHATPROVIDES_BLOCK     1023
 
-#endif /* LIBSOLV_POOLID_PRIVATE_H */
+Id *pool_lookup_languagecache_row(Pool *pool, Id keyname);
+
+#endif /* LIBSOLV_POOL_PRIVATE_H */

diff --git a/src/poolid.c b/src/poolid.c
index 3f6d3d88080bda59d734ff786a928511c417ac82..e20b461efe01990b97d6a9d6b2b21ecd47fcdce7 100644 (file)
--- a/src/poolid.c
+++ b/src/poolid.c
@@ -16,8 +16,8 @@
 #include <stdio.h>
 
 #include "pool.h"
+#include "pool_private.h"
 #include "poolid.h"
-#include "poolid_private.h"
 #include "util.h"
 
 #define REL_BLOCK              1023    /* hashtable for relations */

diff --git a/src/poolwhatprovides.c b/src/poolwhatprovides.c
index 5d495ebd5e3c6b13cbc812d3e46757b95c25303e..109c66e22e9c329695813daebb70ee20dd474f1e 100644 (file)
--- a/src/poolwhatprovides.c
+++ b/src/poolwhatprovides.c
@@ -19,7 +19,7 @@
 #include <sys/types.h>
 
 #include "pool.h"
-#include "poolid_private.h"
+#include "pool_private.h"
 #include "repo.h"
 #include "util.h"
 #include "evr.h"

diff --git a/src/repo.c b/src/repo.c
index 050ea24ec39b29b326f52dc2e96ce1acd4848f9f..1aee4a83bb8490b7644a6d45e2d2a45d3b152191 100644 (file)
--- a/src/repo.c
+++ b/src/repo.c
@@ -23,7 +23,6 @@
 
 #include "repo.h"
 #include "pool.h"
-#include "poolid_private.h"
 #include "util.h"
 #include "chksum.h"
 

diff --git a/src/repo_solv.c b/src/repo_solv.c
index ca3fa2139a774bd4bc0e0b95bdd94ab3973e2044..b18270628e915269e93f3edcff7f3b7bcda32af4 100644 (file)
--- a/src/repo_solv.c
+++ b/src/repo_solv.c
@@ -25,7 +25,7 @@
 #include "repopack.h"
 #include "repopage.h"
 
-#include "poolid_private.h"    /* WHATPROVIDES_BLOCK */
+#include "pool_private.h"      /* WHATPROVIDES_BLOCK */
 
 #define INTERESTED_START       SOLVABLE_NAME
 #define INTERESTED_END         SOLVABLE_ENHANCES

diff --git a/src/repodata.c b/src/repodata.c
index 7320f004d84bbf798fa34570f8ef6deb48ed627b..09b7f9602f568f131d2b48e3f236eef26b3631db 100644 (file)
--- a/src/repodata.c
+++ b/src/repodata.c
@@ -26,7 +26,6 @@
 
 #include "repo.h"
 #include "pool.h"
-#include "poolid_private.h"
 #include "util.h"
 #include "hash.h"
 #include "chksum.h"

diff --git a/src/solvable.c b/src/solvable.c
index 07da4324c45b715555addf00eea4c496c9368b07..41e6e94ef06732d61a80584a690ee30cb8a13ec6 100644 (file)
--- a/src/solvable.c
+++ b/src/solvable.c
@@ -18,6 +18,7 @@
 #include <string.h>
 
 #include "pool.h"
+#include "pool_private.h"
 #include "repo.h"
 #include "util.h"
 #include "policy.h"