refactor a bit

[platform/upstream/libsolv.git] / src / strpool.h

diff --git a/src/strpool.h b/src/strpool.h
index 3845ced..c97b873 100644 (file)
--- a/src/strpool.h
+++ b/src/strpool.h
@@ -4,24 +4,28 @@
  * This program is licensed under the BSD license, read LICENSE.BSD
  * for further information
  */
-#ifndef SATSOLVER_STRINGPOOL_H
-#define SATSOLVER_STRINGPOOL_H
+#ifndef LIBSOLV_STRINGPOOL_H
+#define LIBSOLV_STRINGPOOL_H
 
 #include "pooltypes.h"
 #include "hash.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define STRID_NULL  0
 #define STRID_EMPTY 1
 
 struct _Stringpool
 {
-  Offset *strings;            // table of offsets into stringspace, indexed by Id: Id -> Offset
-  int nstrings;               // number of unique strings in stringspace
-  char *stringspace;          // space for all unique strings: stringspace + Offset = string
-  Offset sstrings;            // next free pos in stringspace
+  Offset *strings;            /* table of offsets into stringspace, indexed by Id: Id -> Offset */
+  int nstrings;               /* number of ids in strings table */
+  char *stringspace;          /* space for all unique strings: stringspace + Offset = string */
+  Offset sstrings;            /* size of used stringspace */
 
-  Hashtable stringhashtbl;    // hash table: (string ->) Hash -> Id
-  Hashmask stringhashmask;    // modulo value for hash table (size of table - 1)
+  Hashtable stringhashtbl;    /* hash table: (string ->) Hash -> Id */
+  Hashval stringhashmask;     /* modulo value for hash table (size of table - 1) */
 };
 
 void stringpool_init(Stringpool *ss, const char *strs[]);
@@ -42,4 +46,8 @@ stringpool_id2str(Stringpool *ss, Id id)
   return ss->stringspace + ss->strings[id];
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif