Skip to content

Commit be013d0

Browse files
committed
uri: Remove now-useless uri_property_handlers_t struct
This struct was just used for “namespacing” within the `uri_parser_t` struct. It is no longer referenced anywhere.
1 parent cf48928 commit be013d0

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

ext/uri/php_uri_common.h

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,6 @@ typedef struct uri_property_handler_t {
6464
uri_write_t write_func;
6565
} uri_property_handler_t;
6666

67-
typedef struct uri_property_handlers_t {
68-
uri_property_handler_t scheme;
69-
uri_property_handler_t username;
70-
uri_property_handler_t password;
71-
uri_property_handler_t host;
72-
uri_property_handler_t port;
73-
uri_property_handler_t path;
74-
uri_property_handler_t query;
75-
uri_property_handler_t fragment;
76-
} uri_property_handlers_t;
77-
7867
typedef struct uri_parser_t {
7968
/**
8069
* Name (the FQCN) of the URI parser. The "" name is reserved for the handler of the legacy parse_url().
@@ -138,7 +127,16 @@ typedef struct uri_parser_t {
138127
*/
139128
void (*free_uri)(void *uri);
140129

141-
const uri_property_handlers_t property_handlers;
130+
struct {
131+
uri_property_handler_t scheme;
132+
uri_property_handler_t username;
133+
uri_property_handler_t password;
134+
uri_property_handler_t host;
135+
uri_property_handler_t port;
136+
uri_property_handler_t path;
137+
uri_property_handler_t query;
138+
uri_property_handler_t fragment;
139+
} property_handlers;
142140
} uri_parser_t;
143141

144142
typedef struct uri_internal_t {

0 commit comments

Comments
 (0)