Skip to content

Commit e9cdacc

Browse files
author
Sterling Hughes
committed
Whitespace fixes and moving to zend_parse_parameters()
1 parent 1e125df commit e9cdacc

File tree

2 files changed

+59
-82
lines changed

2 files changed

+59
-82
lines changed

‎ext/zip/php_zip.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ PHP_FUNCTION(zip_entry_read);
4747
PHP_FUNCTION(zip_entry_close);
4848

4949
typedef struct {
50-
ZZIP_FILE *fp;
51-
ZZIP_DIRENT dirent;
50+
ZZIP_FILE *fp;
51+
ZZIP_DIRENT dirent;
5252
} php_zzip_dirent;
5353

5454
#else

‎ext/zip/zip.c

Lines changed: 57 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ ZEND_GET_MODULE(zip)
7676
static void php_zip_free_dir(zend_rsrc_list_entry *rsrc TSRMLS_DC)
7777
{
7878
ZZIP_DIR *z_dir = (ZZIP_DIR *) rsrc->ptr;
79-
8079
zzip_closedir(z_dir);
8180
}
8281
/* }}} */
@@ -87,9 +86,8 @@ static void php_zip_free_entry(zend_rsrc_list_entry *rsrc TSRMLS_DC)
8786
{
8887
php_zzip_dirent *entry = (php_zzip_dirent *) rsrc->ptr;
8988

90-
if (entry->fp) {
91-
zzip_close(entry->fp);
92-
}
89+
if (entry->fp)
90+
zzip_close(entry->fp);
9391

9492
efree(entry);
9593
}
@@ -99,9 +97,9 @@ static void php_zip_free_entry(zend_rsrc_list_entry *rsrc TSRMLS_DC)
9997
*/
10098
PHP_MINIT_FUNCTION(zip)
10199
{
102-
le_zip_dir = zend_register_list_destructors_ex(php_zip_free_dir, NULL, le_zip_dir_name, module_number);
100+
le_zip_dir = zend_register_list_destructors_ex(php_zip_free_dir, NULL, le_zip_dir_name, module_number);
103101
le_zip_entry = zend_register_list_destructors_ex(php_zip_free_entry, NULL, le_zip_entry_name, module_number);
104-
return(SUCCESS);
102+
return SUCCESS;
105103
}
106104
/* }}} */
107105

@@ -120,18 +118,17 @@ PHP_MINFO_FUNCTION(zip)
120118
Open a new zip archive for reading */
121119
PHP_FUNCTION(zip_open)
122120
{
123-
zval **filename;
121+
char *filename;
124122
ZZIP_DIR *archive_p = NULL;
123+
int filename_len;
125124

126-
if (ZEND_NUM_ARGS() != 1 ||
127-
zend_get_parameters_ex(1, &filename) == FAILURE) {
128-
WRONG_PARAM_COUNT;
129-
}
125+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &filename, &filename_len) == FAILURE)
126+
return;
130127

131-
archive_p = zzip_opendir(Z_STRVAL_PP(filename));
128+
archive_p = zzip_opendir(filename);
132129
if (archive_p == NULL) {
133-
php_error(E_WARNING, "Cannot open zip archive %s", Z_STRVAL_PP(filename));
134-
RETURN_FALSE;
130+
php_error(E_WARNING, "Cannot open zip archive %s", filename);
131+
RETURN_FALSE;
135132
}
136133

137134
ZEND_REGISTER_RESOURCE(return_value, archive_p, le_zip_dir);
@@ -142,26 +139,22 @@ PHP_FUNCTION(zip_open)
142139
Returns the next file in the archive */
143140
PHP_FUNCTION(zip_read)
144141
{
145-
zval **zzip_dp;
146-
ZZIP_DIR *archive_p = NULL;
147-
php_zzip_dirent *entry = NULL;
148-
int ret;
149-
150-
if (ZEND_NUM_ARGS() != 1 ||
151-
zend_get_parameters_ex(1, &zzip_dp) == FAILURE) {
152-
WRONG_PARAM_COUNT;
153-
}
154-
142+
zval **zzip_dp;
143+
ZZIP_DIR *archive_p = NULL;
144+
php_zzip_dirent *entry = NULL;
145+
int ret;
146+
147+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &zzip_dp) == FAILURE)
148+
return;
149+
155150
ZEND_FETCH_RESOURCE(archive_p, ZZIP_DIR *, zzip_dp, -1, le_zip_dir_name, le_zip_dir);
156151

157152
entry = emalloc(sizeof(php_zzip_dirent));
158-
159153
ret = zzip_dir_read(archive_p, &entry->dirent);
160154
if (ret == 0) {
161-
efree(entry);
162-
RETURN_FALSE;
155+
efree(entry);
156+
RETURN_FALSE;
163157
}
164-
165158
entry->fp = NULL;
166159

167160
ZEND_REGISTER_RESOURCE(return_value, entry, le_zip_entry);
@@ -175,10 +168,8 @@ PHP_FUNCTION(zip_close)
175168
zval **zzip_dp;
176169
ZZIP_DIR *archive_p = NULL;
177170

178-
if (ZEND_NUM_ARGS() != 1 ||
179-
zend_get_parameters_ex(1, &zzip_dp) == FAILURE) {
180-
WRONG_PARAM_COUNT;
181-
}
171+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &zzip_dp) == FAILURE)
172+
return;
182173

183174
ZEND_FETCH_RESOURCE(archive_p, ZZIP_DIR *, zzip_dp, -1, le_zip_dir_name, le_zip_dir);
184175

@@ -193,10 +184,8 @@ static void php_zzip_get_entry(INTERNAL_FUNCTION_PARAMETERS, int opt)
193184
zval **zzip_ent;
194185
php_zzip_dirent *entry = NULL;
195186

196-
if (ZEND_NUM_ARGS() != 1 ||
197-
zend_get_parameters_ex(1, &zzip_ent) == FAILURE) {
198-
WRONG_PARAM_COUNT;
199-
}
187+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &zzip_ent) == FAILURE)
188+
return;
200189

201190
ZEND_FETCH_RESOURCE(entry, php_zzip_dirent *, zzip_ent, -1, le_zip_entry_name, le_zip_entry);
202191

@@ -253,57 +242,47 @@ PHP_FUNCTION(zip_entry_compressionmethod)
253242
Open a Zip File, pointed by the resource entry */
254243
PHP_FUNCTION(zip_entry_open)
255244
{
256-
zval **zzip_dp, **zzip_ent, **mode;
257-
ZZIP_DIR *archive_p = NULL;
258-
php_zzip_dirent *entry = NULL;
259-
260-
if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 3 ||
261-
zend_get_parameters_ex(ZEND_NUM_ARGS(), &zzip_dp, &zzip_ent, &mode) == FAILURE) {
262-
WRONG_PARAM_COUNT;
263-
}
264-
265-
ZEND_FETCH_RESOURCE(archive_p, ZZIP_DIR *, zzip_dp, -1, le_zip_dir_name, le_zip_dir);
266-
ZEND_FETCH_RESOURCE(entry, php_zzip_dirent *, zzip_ent, -1, le_zip_entry_name, le_zip_entry);
245+
zval **zzip_dp;
246+
zval **zzip_ent;
247+
ZZIP_DIR *archive_p = NULL;
248+
php_zzip_dirent *entry = NULL;
249+
int mode;
250+
251+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rr|i", &zzip_dp, &zzip_ent, &mode) == FAILURE)
252+
return;
253+
254+
ZEND_FETCH_RESOURCE(archive_p, ZZIP_DIR *, zzip_dp, -1, le_zip_dir_name, le_zip_dir);
255+
ZEND_FETCH_RESOURCE(entry, php_zzip_dirent *, zzip_ent, -1, le_zip_entry_name, le_zip_entry);
267256

268257
entry->fp = zzip_file_open(archive_p, entry->dirent.d_name, O_RDONLY | O_BINARY);
269258

270-
if (entry->fp) {
271-
RETURN_TRUE;
272-
} else {
273-
RETURN_FALSE;
274-
}
259+
if (entry->fp)
260+
RETURN_TRUE;
261+
else
262+
RETURN_FALSE;
275263
}
276264
/* }}} */
277265

278266
/* {{{ proto string zip_read(resource zip_ent)
279267
Read X bytes from an opened zip entry */
280268
PHP_FUNCTION(zip_entry_read)
281269
{
282-
zval **zzip_ent, **length;
283-
php_zzip_dirent *entry = NULL;
284-
char *buf = NULL;
285-
int len = 1024,
286-
argc = ZEND_NUM_ARGS(),
287-
ret = 0;
288-
289-
if (argc < 1 || argc > 2 ||
290-
zend_get_parameters_ex(argc, &zzip_ent, &length) == FAILURE) {
291-
WRONG_PARAM_COUNT;
292-
}
293-
270+
zval **zzip_ent;
271+
php_zzip_dirent *entry = NULL;
272+
char *buf = NULL;
273+
int len = 1024;
274+
int ret = 0;
275+
276+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|i", &zzip_ent, &len) == FAILURE)
277+
return;
278+
294279
ZEND_FETCH_RESOURCE(entry, php_zzip_dirent *, zzip_ent, -1, le_zip_entry_name, le_zip_entry);
295-
if (argc > 1) {
296-
convert_to_long_ex(length);
297-
len = Z_LVAL_PP(length);
298-
}
299280

300281
buf = emalloc(len + 1);
301-
302282
ret = zzip_read(entry->fp, buf, len);
303-
if (ret == 0) {
304-
RETURN_FALSE;
305-
}
306-
283+
if (ret == 0)
284+
RETURN_FALSE;
285+
else
307286
RETURN_STRINGL(buf, len, 0);
308287
}
309288
/* }}} */
@@ -312,15 +291,13 @@ PHP_FUNCTION(zip_entry_read)
312291
Close a zip entry */
313292
PHP_FUNCTION(zip_entry_close)
314293
{
315-
zval **zzip_ent;
316-
php_zzip_dirent *entry = NULL;
294+
zval **zzip_ent;
295+
php_zzip_dirent *entry = NULL;
317296

318-
if (ZEND_NUM_ARGS() != 1 ||
319-
zend_get_parameters_ex(1, &zzip_ent) == FAILURE) {
320-
WRONG_PARAM_COUNT;
321-
}
297+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &zzip_ent) == FAILURE)
298+
return;
322299

323-
ZEND_FETCH_RESOURCE(entry, php_zzip_dirent *, zzip_ent, -1, le_zip_entry_name, le_zip_entry);
300+
ZEND_FETCH_RESOURCE(entry, php_zzip_dirent *, zzip_ent, -1, le_zip_entry_name, le_zip_entry);
324301

325302
zend_list_delete(Z_LVAL_PP(zzip_ent));
326303
}

0 commit comments

Comments
 (0)