Get test apps compiling

LegNeato · Oct 23, 2022 · 386d0f4 · 386d0f4
1 parent 5edbc6a
commit 386d0f4
Show file tree

Hide file tree

Showing 82 changed files with 1,724 additions and 2,271 deletions.
diff --git a/src/apps/Cargo.toml → src/apps/applib/lib/Cargo.toml b/src/apps/Cargo.toml → src/apps/applib/lib/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "unsafe-h3lib-apps"
+name = "unsafe-h3lib-applib"
 authors = ["C2Rust"]
 version = "0.0.0"
 publish = false
@@ -8,14 +8,10 @@ autobins = false
 
 [lib]
 name = "unsafe_h3lib_applib"
-path = "applib/lib/lib.rs"
+path = "lib.rs"
 crate-type = ["staticlib", "rlib"]
 
 [dependencies]
-unsafe-h3lib = { version = "*", path = "../h3lib" }
+unsafe-h3lib = { version = "*", path = "../../../h3lib" }
 num-traits = "0.2"
-libc = "0.2"
-
-[[bin]]
-name = "mkRangGeo"
-path = "testapps/mkRandGeo.rs"
+libc = "0.2"
diff --git a/src/apps/filters/cellToBoundary.rs b/src/apps/filters/cellToBoundary.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     static mut __stdinp: *mut FILE;
     fn feof(_: *mut FILE) -> libc::c_int;
     fn fgets(_: *mut libc::c_char, _: libc::c_int, _: *mut FILE) -> *mut libc::c_char;
@@ -55,7 +55,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/filters/cellToLatLng.rs b/src/apps/filters/cellToLatLng.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     fn fgets(_: *mut libc::c_char, _: libc::c_int, _: *mut FILE) -> *mut libc::c_char;
     fn printf(_: *const libc::c_char, _: ...) -> libc::c_int;
     static mut __stdinp: *mut FILE;
@@ -55,7 +55,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/filters/cellToLocalIj.rs b/src/apps/filters/cellToLocalIj.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     static mut __stdinp: *mut FILE;
     static mut __stderrp: *mut FILE;
     fn feof(_: *mut FILE) -> libc::c_int;
@@ -59,7 +59,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/filters/gridDisk.rs b/src/apps/filters/gridDisk.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     static mut __stdinp: *mut FILE;
     fn feof(_: *mut FILE) -> libc::c_int;
     fn fgets(_: *mut libc::c_char, _: libc::c_int, _: *mut FILE) -> *mut libc::c_char;
@@ -58,7 +58,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/filters/gridDiskUnsafe.rs b/src/apps/filters/gridDiskUnsafe.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     static mut __stdinp: *mut FILE;
     fn feof(_: *mut FILE) -> libc::c_int;
     fn fgets(_: *mut libc::c_char, _: libc::c_int, _: *mut FILE) -> *mut libc::c_char;
@@ -53,7 +53,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/filters/h3ToComponents.rs b/src/apps/filters/h3ToComponents.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     fn fgets(_: *mut libc::c_char, _: libc::c_int, _: *mut FILE) -> *mut libc::c_char;
     fn printf(_: *const libc::c_char, _: ...) -> libc::c_int;
     static mut __stdinp: *mut FILE;
@@ -50,7 +50,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/filters/latLngToCell.rs b/src/apps/filters/latLngToCell.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     static mut __stdinp: *mut FILE;
     static mut __stderrp: *mut FILE;
     fn feof(_: *mut FILE) -> libc::c_int;
@@ -59,7 +59,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/filters/localIjToCell.rs b/src/apps/filters/localIjToCell.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     static mut __stdinp: *mut FILE;
     static mut __stderrp: *mut FILE;
     fn feof(_: *mut FILE) -> libc::c_int;
@@ -65,7 +65,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/fuzzers/fuzzerCellArea.rs b/src/apps/fuzzers/fuzzerCellArea.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     fn strcmp(_: *const libc::c_char, _: *const libc::c_char) -> libc::c_int;
     fn fclose(_: *mut FILE) -> libc::c_int;
     fn fopen(_: *const libc::c_char, _: *const libc::c_char) -> *mut FILE;
@@ -52,7 +52,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/fuzzers/fuzzerCellProperties.rs b/src/apps/fuzzers/fuzzerCellProperties.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     fn strcmp(_: *const libc::c_char, _: *const libc::c_char) -> libc::c_int;
     fn fclose(_: *mut FILE) -> libc::c_int;
     fn fopen(_: *const libc::c_char, _: *const libc::c_char) -> *mut FILE;
@@ -58,7 +58,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/fuzzers/fuzzerCellToLatLng.rs b/src/apps/fuzzers/fuzzerCellToLatLng.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     fn strcmp(_: *const libc::c_char, _: *const libc::c_char) -> libc::c_int;
     fn fclose(_: *mut FILE) -> libc::c_int;
     fn fopen(_: *const libc::c_char, _: *const libc::c_char) -> *mut FILE;
@@ -51,7 +51,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/fuzzers/fuzzerCellsToLinkedMultiPolygon.rs b/src/apps/fuzzers/fuzzerCellsToLinkedMultiPolygon.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     fn strcmp(_: *const libc::c_char, _: *const libc::c_char) -> libc::c_int;
     fn error(msg: *const libc::c_char);
     fn cellsToLinkedMultiPolygon(
@@ -55,7 +55,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/fuzzers/fuzzerCompact.rs b/src/apps/fuzzers/fuzzerCompact.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     fn strcmp(_: *const libc::c_char, _: *const libc::c_char) -> libc::c_int;
     fn fclose(_: *mut FILE) -> libc::c_int;
     fn fopen(_: *const libc::c_char, _: *const libc::c_char) -> *mut FILE;
@@ -70,7 +70,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/fuzzers/fuzzerDirectedEdge.rs b/src/apps/fuzzers/fuzzerDirectedEdge.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     fn strcmp(_: *const libc::c_char, _: *const libc::c_char) -> libc::c_int;
     fn fclose(_: *mut FILE) -> libc::c_int;
     fn fopen(_: *const libc::c_char, _: *const libc::c_char) -> *mut FILE;
@@ -57,7 +57,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/fuzzers/fuzzerDistances.rs b/src/apps/fuzzers/fuzzerDistances.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     fn strcmp(_: *const libc::c_char, _: *const libc::c_char) -> libc::c_int;
     fn fclose(_: *mut FILE) -> libc::c_int;
     fn fopen(_: *const libc::c_char, _: *const libc::c_char) -> *mut FILE;
@@ -52,7 +52,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/fuzzers/fuzzerEdgeLength.rs b/src/apps/fuzzers/fuzzerEdgeLength.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     fn strcmp(_: *const libc::c_char, _: *const libc::c_char) -> libc::c_int;
     fn fclose(_: *mut FILE) -> libc::c_int;
     fn fopen(_: *const libc::c_char, _: *const libc::c_char) -> *mut FILE;
@@ -52,7 +52,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/fuzzers/fuzzerGridDisk.rs b/src/apps/fuzzers/fuzzerGridDisk.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     fn strcmp(_: *const libc::c_char, _: *const libc::c_char) -> libc::c_int;
     fn fclose(_: *mut FILE) -> libc::c_int;
     fn fopen(_: *const libc::c_char, _: *const libc::c_char) -> *mut FILE;
@@ -80,7 +80,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/fuzzers/fuzzerHierarchy.rs b/src/apps/fuzzers/fuzzerHierarchy.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     fn strcmp(_: *const libc::c_char, _: *const libc::c_char) -> libc::c_int;
     fn fclose(_: *mut FILE) -> libc::c_int;
     fn fopen(_: *const libc::c_char, _: *const libc::c_char) -> *mut FILE;
@@ -57,7 +57,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/fuzzers/fuzzerIndexIO.rs b/src/apps/fuzzers/fuzzerIndexIO.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     fn memcpy(_: *mut libc::c_void, _: *const libc::c_void, _: libc::c_ulong) -> *mut libc::c_void;
     fn strcmp(_: *const libc::c_char, _: *const libc::c_char) -> libc::c_int;
     fn fclose(_: *mut FILE) -> libc::c_int;
@@ -52,7 +52,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/fuzzers/fuzzerInternalAlgos.rs b/src/apps/fuzzers/fuzzerInternalAlgos.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     fn strcmp(_: *const libc::c_char, _: *const libc::c_char) -> libc::c_int;
     fn fclose(_: *mut FILE) -> libc::c_int;
     fn fopen(_: *const libc::c_char, _: *const libc::c_char) -> *mut FILE;
@@ -64,7 +64,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/fuzzers/fuzzerLatLngToCell.rs b/src/apps/fuzzers/fuzzerLatLngToCell.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     fn strcmp(_: *const libc::c_char, _: *const libc::c_char) -> libc::c_int;
     fn fclose(_: *mut FILE) -> libc::c_int;
     fn fopen(_: *const libc::c_char, _: *const libc::c_char) -> *mut FILE;
@@ -50,7 +50,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],

diff --git a/src/apps/fuzzers/fuzzerLocalIj.rs b/src/apps/fuzzers/fuzzerLocalIj.rs
@@ -1,6 +1,6 @@
 use ::libc;
 extern "C" {
-    pub type __sFILEX;
+
     fn strcmp(_: *const libc::c_char, _: *const libc::c_char) -> libc::c_int;
     fn fclose(_: *mut FILE) -> libc::c_int;
     fn fopen(_: *const libc::c_char, _: *const libc::c_char) -> *mut FILE;
@@ -62,7 +62,7 @@ pub struct __sFILE {
         unsafe extern "C" fn(*mut libc::c_void, *const libc::c_char, libc::c_int) -> libc::c_int,
     >,
     pub _ub: __sbuf,
-    pub _extra: *mut __sFILEX,
+    pub _extra: *mut libc::c_void,
     pub _ur: libc::c_int,
     pub _ubuf: [libc::c_uchar; 3],
     pub _nbuf: [libc::c_uchar; 1],