Move Hashtable and Set primitives to RzUtil (#3910)

* update meson.build for changed file paths * move ht_*.h to librz/include/rz_util * add librz/include/rz_util/ht_*.h to librz/include/meson.build
rizinorg · Oct 12, 2023 · fb863ae · fb863ae
1 parent 19dbb57
commit fb863ae
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 12 deletions.
diff --git a/librz/include/meson.build b/librz/include/meson.build
@@ -117,6 +117,11 @@ rz_util_files = [
   'rz_util/rz_utf8.h',
   'rz_util/rz_version.h',
   'rz_util/rz_x509.h',
+  'rz_util/ht_inc.h',
+  'rz_util/ht_pp.h',
+  'rz_util/ht_pu.h',
+  'rz_util/ht_up.h',
+  'rz_util/ht_uu.h',
 ]
 install_headers(rz_util_files, install_dir: join_paths(rizin_incdir, 'rz_util'))
 

diff --git a/librz/util/sdb/src/ht_inc.h → librz/include/rz_util/ht_inc.h b/librz/util/sdb/src/ht_inc.h → librz/include/rz_util/ht_inc.h
diff --git a/librz/util/sdb/src/ht_pp.h → librz/include/rz_util/ht_pp.h b/librz/util/sdb/src/ht_pp.h → librz/include/rz_util/ht_pp.h
diff --git a/librz/util/sdb/src/ht_pu.h → librz/include/rz_util/ht_pu.h b/librz/util/sdb/src/ht_pu.h → librz/include/rz_util/ht_pu.h
diff --git a/librz/util/sdb/src/ht_up.h → librz/include/rz_util/ht_up.h b/librz/util/sdb/src/ht_up.h → librz/include/rz_util/ht_up.h
diff --git a/librz/util/sdb/src/ht_uu.h → librz/include/rz_util/ht_uu.h b/librz/util/sdb/src/ht_uu.h → librz/include/rz_util/ht_uu.h
diff --git a/librz/util/sdb/src/ht_inc.c → librz/util/ht/ht_inc.c b/librz/util/sdb/src/ht_inc.c → librz/util/ht/ht_inc.c
diff --git a/librz/util/sdb/src/ht_pp.c → librz/util/ht/ht_pp.c b/librz/util/sdb/src/ht_pp.c → librz/util/ht/ht_pp.c
diff --git a/librz/util/sdb/src/ht_pu.c → librz/util/ht/ht_pu.c b/librz/util/sdb/src/ht_pu.c → librz/util/ht/ht_pu.c
diff --git a/librz/util/sdb/src/ht_up.c → librz/util/ht/ht_up.c b/librz/util/sdb/src/ht_up.c → librz/util/ht/ht_up.c
diff --git a/librz/util/sdb/src/ht_uu.c → librz/util/ht/ht_uu.c b/librz/util/sdb/src/ht_uu.c → librz/util/ht/ht_uu.c
diff --git a/librz/util/meson.build b/librz/util/meson.build
@@ -83,6 +83,11 @@ rz_util_common_sources = [
   'version.c',
   'w32-sys.c',
   'x509.c',
+  'ht/ht_uu.c',
+  'ht/ht_pp.c',
+  'ht/ht_up.c',
+  'ht/ht_pu.c',
+  'set.c',
 ]
 rz_util_sources = rz_util_common_sources
 
@@ -112,7 +117,7 @@ else
   rz_util_sources += ['big.c']
 endif
 
-rz_util_includes = [platform_inc, include_directories('sdb/src', 'sdb')]
+rz_util_includes = [platform_inc, include_directories('sdb/src', 'sdb', '../include/rz_util', '.')]
 
 rz_util = library('rz_util', rz_util_sources, libsdb_sources,
   include_directories: rz_util_includes,

diff --git a/librz/util/sdb/src/meson.build b/librz/util/sdb/src/meson.build
@@ -1,17 +1,12 @@
 libsdb_sources = files(
   'array.c',
-  'set.c',
   'base64.c',
   'buffer.c',
   'cdb.c',
   'cdb_make.c',
   'diff.c',
   'disk.c',
   'fmt.c',
-  'ht_uu.c',
-  'ht_pp.c',
-  'ht_up.c',
-  'ht_pu.c',
   'lock.c',
   'ls.c',
   'match.c',
@@ -30,15 +25,9 @@ include_files = files(
   'buffer.h',
   'cdb.h',
   'cdb_make.h',
-  'ht_inc.h',
-  'ht_pp.h',
-  'ht_up.h',
-  'ht_uu.h',
-  'ht_pu.h',
   'ls.h',
   'sdb.h',
   'sdbht.h',
-  'set.h',
 )
 
 install_headers(include_files, install_dir: join_paths(rizin_incdir, 'sdb'))
diff --git a/librz/util/sdb/src/set.c → librz/util/set.c b/librz/util/sdb/src/set.c → librz/util/set.c
diff --git a/librz/util/sdb/src/set.h → librz/util/set.h b/librz/util/sdb/src/set.h → librz/util/set.h