Skip to content

Commit fa322e3

Browse files
catenacybervictorjulien
authored andcommitted
rust: remove unneeded cbindgen exclusions
1 parent 9583447 commit fa322e3

2 files changed

Lines changed: 1 addition & 22 deletions

File tree

rust/cbindgen.toml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -95,21 +95,9 @@ include = [
9595
# A list of items to not include in the generated bindings
9696
# default: []
9797
exclude = [
98-
"AppLayerDecoderEvents",
99-
"AppLayerParserState",
10098
"CLuaState",
101-
"DetectEngineState",
102-
"DetectEngineThreadCtx",
103-
"GenericVar",
104-
"Flow",
105-
"HttpRangeContainerBlock",
10699
"FileContainer",
107-
"JsonT",
108-
"IKEState",
109-
"IKETransaction",
110-
"TFTPState",
111-
"TFTPTransaction",
112-
"free",
100+
"HttpRangeContainerBlock",
113101
"IPPROTO_TCP",
114102
"IPPROTO_UDP",
115103
"SRepCatGetByShortname",
@@ -123,7 +111,6 @@ exclude = [
123111
"SIGMATCH_INFO_MULTI_UINT",
124112
"SIGMATCH_INFO_ENUM_UINT",
125113
"SIGMATCH_INFO_BITFLAGS_UINT",
126-
"FtpCommand",
127114
]
128115

129116
# Types of items that we'll generate. If empty, then all types of item are emitted.
@@ -148,7 +135,6 @@ item_types = ["enums","structs","opaque","functions","constants"]
148135
# [export]
149136
# prefix = "capi_"
150137
[export.rename]
151-
"JsonT" = "json_t"
152138
"CLuaState" = "lua_State"
153139
"JsonBuilder" = "SCJsonBuilder"
154140
"JsonBuilderMark" = "SCJsonBuilderMark"

src/rust.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@
2121
// Forward declarations needed by rust-bindings.h
2222
typedef struct HttpRangeContainerBlock HttpRangeContainerBlock;
2323

24-
// These need to be removed by making rust using a generic void
25-
// in functions prototypes and then casting
26-
typedef struct IKEState_ IKEState;
27-
typedef struct IKETransaction_ IKETransaction;
28-
typedef struct TFTPState_ TFTPState;
29-
typedef struct TFTPTransaction_ TFTPTransaction;
30-
3124
typedef struct DetectEngineState_ DetectEngineState;
3225

3326
// may be improved by smaller include

0 commit comments

Comments
 (0)