1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
|
From 19901337bc5b69474464bd30d32f38172ab395f1 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sat, 12 Nov 2016 17:24:49 +0100
Subject: [PATCH 1/2] portability: use zend_long for function parameters
---
phpiredis.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/phpiredis.c b/phpiredis.c
index f297e3f..3e46661 100644
--- a/phpiredis.c
+++ b/phpiredis.c
@@ -25,6 +25,7 @@ int le_redis_persistent_context;
#define PHPIREDIS_RESOURCE_TYPE zend_rsrc_list_entry
#define PHPIREDIS_RETURN_RESOURCE(connection, context) \
ZEND_REGISTER_RESOURCE(return_value, connection, context)
+ typedef long zend_long;
#endif
typedef struct callback {
@@ -372,7 +373,7 @@ PHP_FUNCTION(phpiredis_connect)
phpiredis_connection *connection;
char *ip;
PHPIREDIS_LEN_TYPE ip_size;
- long port = 6379;
+ zend_long port = 6379;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &ip, &ip_size, &port) == FAILURE) {
return;
@@ -391,7 +392,7 @@ PHP_FUNCTION(phpiredis_pconnect)
{
char *ip;
PHPIREDIS_LEN_TYPE ip_size;
- long port = 6379;
+ zend_long port = 6379;
char *hashed_details = NULL;
PHPIREDIS_LEN_TYPE hashed_details_length;
From d0cd9522b723798d005948bde8668776e76af36b Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sat, 12 Nov 2016 17:52:39 +0100
Subject: [PATCH 2/2] add arginfo for all functions
---
phpiredis.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++-------------
1 file changed, 79 insertions(+), 21 deletions(-)
diff --git a/phpiredis.c b/phpiredis.c
index 3e46661..710df74 100644
--- a/phpiredis.c
+++ b/phpiredis.c
@@ -368,6 +368,11 @@ static phpiredis_connection *s_create_connection(const char *ip, int port, zend_
// -------------------------------------------------------------------------- //
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phpiredis_connect, 0, 0, 1)
+ ZEND_ARG_INFO(0, ip)
+ ZEND_ARG_INFO(0, port)
+ZEND_END_ARG_INFO()
+
PHP_FUNCTION(phpiredis_connect)
{
phpiredis_connection *connection;
@@ -477,6 +482,11 @@ PHP_FUNCTION(phpiredis_disconnect)
RETURN_TRUE;
}
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phpiredis_multi_command, 0, 0, 2)
+ ZEND_ARG_INFO(0, connection)
+ ZEND_ARG_ARRAY_INFO(0, commands, 0)
+ZEND_END_ARG_INFO()
+
PHP_FUNCTION(phpiredis_multi_command)
{
zval *resource, *cmds;
@@ -583,6 +593,11 @@ PHP_FUNCTION(phpiredis_multi_command_bs)
get_pipeline_responses(connection, return_value, commands TSRMLS_CC);
}
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phpiredis_command, 0, 0, 2)
+ ZEND_ARG_INFO(0, connection)
+ ZEND_ARG_INFO(0, command)
+ZEND_END_ARG_INFO()
+
PHP_FUNCTION(phpiredis_command)
{
zval *resource;
@@ -616,6 +631,11 @@ PHP_FUNCTION(phpiredis_command)
freeReplyObject(reply);
}
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phpiredis_command_bs, 0, 0, 2)
+ ZEND_ARG_INFO(0, connection)
+ ZEND_ARG_ARRAY_INFO(0, args, 0)
+ZEND_END_ARG_INFO()
+
PHP_FUNCTION(phpiredis_command_bs)
{
zval *resource;
@@ -661,6 +681,10 @@ PHP_FUNCTION(phpiredis_command_bs)
freeReplyObject(reply);
}
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phpiredis_format_command, 0, 0, 1)
+ ZEND_ARG_ARRAY_INFO(0, args, 0)
+ZEND_END_ARG_INFO()
+
PHP_FUNCTION(phpiredis_format_command)
{
zval *cmdArgs;
@@ -690,7 +714,13 @@ PHP_FUNCTION(phpiredis_format_command)
PHP_FUNCTION(phpiredis_reader_create)
{
- phpiredis_reader *reader = emalloc(sizeof(phpiredis_reader));
+ phpiredis_reader *reader;
+
+ if (zend_parse_parameters_none() == FAILURE) {
+ RETURN_FALSE;
+ }
+
+ reader = emalloc(sizeof(phpiredis_reader));
reader->reader = redisReplyReaderCreate();
reader->error = NULL;
reader->bufferedReply = NULL;
@@ -813,6 +843,11 @@ PHP_FUNCTION(phpiredis_reader_destroy)
RETURN_TRUE;
}
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phpiredis_reader_feed, 0, 0, 2)
+ ZEND_ARG_INFO(0, connection)
+ ZEND_ARG_INFO(0, buffer)
+ZEND_END_ARG_INFO()
+
PHP_FUNCTION(phpiredis_reader_feed)
{
zval *resource;
@@ -857,6 +892,11 @@ PHP_FUNCTION(phpiredis_reader_get_error)
#endif
}
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phpiredis_reader_get_reply, 0, 0, 1)
+ ZEND_ARG_INFO(0, ptr)
+ ZEND_ARG_INFO(1, type)
+ZEND_END_ARG_INFO()
+
PHP_FUNCTION(phpiredis_reader_get_reply)
{
zval *resource, *replyType = NULL;
@@ -934,6 +974,10 @@ PHP_FUNCTION(phpiredis_reader_get_state)
}
}
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phpiredis_utils_crc16, 0, 0, 1)
+ ZEND_ARG_INFO(0, buffer)
+ZEND_END_ARG_INFO()
+
PHP_FUNCTION(phpiredis_utils_crc16)
{
char *buf;
@@ -970,31 +1014,45 @@ PHP_MINIT_FUNCTION(phpiredis)
return SUCCESS;
}
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phpiredis_reader_get_reply, 0, 0, 1)
- ZEND_ARG_INFO(0, ptr)
- ZEND_ARG_INFO(1, type)
+/* arginfo shared by various functions */
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phpiredis_void, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phpiredis_conn, 0, 0, 1)
+ ZEND_ARG_INFO(0, connection)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phpiredis_callback, 0, 0, 2)
+ ZEND_ARG_INFO(0, connection)
+ ZEND_ARG_INFO(0, callback)
ZEND_END_ARG_INFO()
+
static zend_function_entry phpiredis_functions[] = {
- PHP_FE(phpiredis_connect, NULL)
- PHP_FE(phpiredis_pconnect, NULL)
- PHP_FE(phpiredis_disconnect, NULL)
- PHP_FE(phpiredis_command, NULL)
- PHP_FE(phpiredis_command_bs, NULL)
- PHP_FE(phpiredis_multi_command, NULL)
- PHP_FE(phpiredis_multi_command_bs, NULL)
- PHP_FE(phpiredis_format_command, NULL)
- PHP_FE(phpiredis_reader_create, NULL)
- PHP_FE(phpiredis_reader_reset, NULL)
- PHP_FE(phpiredis_reader_feed, NULL)
- PHP_FE(phpiredis_reader_get_state, NULL)
- PHP_FE(phpiredis_reader_get_error, NULL)
+ PHP_FE(phpiredis_connect, arginfo_phpiredis_connect)
+ PHP_FE(phpiredis_pconnect, arginfo_phpiredis_connect)
+ PHP_FE(phpiredis_disconnect, arginfo_phpiredis_conn)
+ PHP_FE(phpiredis_command, arginfo_phpiredis_command)
+ PHP_FE(phpiredis_command_bs, arginfo_phpiredis_command_bs)
+ PHP_FE(phpiredis_multi_command, arginfo_phpiredis_multi_command)
+ PHP_FE(phpiredis_multi_command_bs, arginfo_phpiredis_multi_command)
+ PHP_FE(phpiredis_format_command, arginfo_phpiredis_format_command)
+ PHP_FE(phpiredis_reader_create, arginfo_phpiredis_void)
+ PHP_FE(phpiredis_reader_reset, arginfo_phpiredis_conn)
+ PHP_FE(phpiredis_reader_feed, arginfo_phpiredis_reader_feed)
+ PHP_FE(phpiredis_reader_get_state, arginfo_phpiredis_conn)
+ PHP_FE(phpiredis_reader_get_error, arginfo_phpiredis_conn)
PHP_FE(phpiredis_reader_get_reply, arginfo_phpiredis_reader_get_reply)
- PHP_FE(phpiredis_reader_destroy, NULL)
- PHP_FE(phpiredis_reader_set_error_handler, NULL)
- PHP_FE(phpiredis_reader_set_status_handler, NULL)
- PHP_FE(phpiredis_utils_crc16, NULL)
+ PHP_FE(phpiredis_reader_destroy, arginfo_phpiredis_conn)
+ PHP_FE(phpiredis_reader_set_error_handler, arginfo_phpiredis_callback)
+ PHP_FE(phpiredis_reader_set_status_handler, arginfo_phpiredis_callback)
+ PHP_FE(phpiredis_utils_crc16, arginfo_phpiredis_utils_crc16)
+#ifdef PHP_FE_END
+ PHP_FE_END
+#else
{NULL, NULL, NULL}
+#endif
};
zend_module_entry phpiredis_module_entry = {
|
