| 1 | From 3e49feb8362f14d6f13d79c9533edd900bbf1d21 Mon Sep 17 00:00:00 2001
|
| 2 | From: Qiangjun Ran <[email protected]>
|
| 3 | Date: Tue, 8 Jun 2021 14:43:34 +0800
|
| 4 | Subject: [PATCH] PHP 8 support
|
| 5 |
|
| 6 | Patch-Source: https://github.com/sqmk/pecl-jsmin/pull/59
|
| 7 | ---
|
| 8 | jsmin.c | 8 ++++----
|
| 9 | jsmin.h | 4 ++--
|
| 10 | php_jsmin.c | 6 +++---
|
| 11 | 3 files changed, 9 insertions(+), 9 deletions(-)
|
| 12 |
|
| 13 | diff --git a/jsmin.c b/jsmin.c
|
| 14 | index 2744aef..773dc09 100644
|
| 15 | |
| 16 | |
| 17 | @@ -34,7 +34,7 @@ SOFTWARE.
|
| 18 | */
|
| 19 |
|
| 20 | static jsmin_obj*
|
| 21 | -new_jsmin_obj(char *javascript TSRMLS_DC)
|
| 22 | +new_jsmin_obj(char *javascript)
|
| 23 | {
|
| 24 | jsmin_obj *jmo = ecalloc(1, sizeof(jsmin_obj));
|
| 25 | jmo->javascript = javascript;
|
| 26 | @@ -48,7 +48,7 @@ new_jsmin_obj(char *javascript TSRMLS_DC)
|
| 27 | /* free_jsmin_obj -- frees up memory on struct
|
| 28 | */
|
| 29 | void
|
| 30 | -free_jsmin_obj(jsmin_obj *jmo TSRMLS_DC)
|
| 31 | +free_jsmin_obj(jsmin_obj *jmo)
|
| 32 | {
|
| 33 | smart_string_free(&jmo->buffer);
|
| 34 | efree(jmo);
|
| 35 | @@ -250,9 +250,9 @@ jsmin_action(int d, jsmin_obj *jmo)
|
| 36 | */
|
| 37 |
|
| 38 | jsmin_obj*
|
| 39 | -jsmin(char *javascript TSRMLS_DC)
|
| 40 | +jsmin(char *javascript)
|
| 41 | {
|
| 42 | - jsmin_obj *jmo = new_jsmin_obj(javascript TSRMLS_CC);
|
| 43 | + jsmin_obj *jmo = new_jsmin_obj(javascript);
|
| 44 |
|
| 45 | jsmin_action(3, jmo);
|
| 46 | while (jmo->theA != 0) {
|
| 47 | diff --git a/jsmin.h b/jsmin.h
|
| 48 | index 317b90b..0bda630 100644
|
| 49 | |
| 50 | |
| 51 | @@ -25,7 +25,7 @@ enum error_codes {
|
| 52 | PHP_JSMIN_ERROR_UNTERMINATED_REGEX
|
| 53 | };
|
| 54 |
|
| 55 | -extern jsmin_obj* jsmin(char *javascript TSRMLS_DC);
|
| 56 | -extern void free_jsmin_obj(jsmin_obj *jmo TSRMLS_DC);
|
| 57 | +extern jsmin_obj* jsmin(char *javascript);
|
| 58 | +extern void free_jsmin_obj(jsmin_obj *jmo);
|
| 59 |
|
| 60 | #endif
|
| 61 | diff --git a/php_jsmin.c b/php_jsmin.c
|
| 62 | index a9783d4..6cc034a 100644
|
| 63 | |
| 64 | |
| 65 | @@ -105,11 +105,11 @@ PHP_FUNCTION(jsmin)
|
| 66 |
|
| 67 | zval *ret_code = NULL;
|
| 68 |
|
| 69 | - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z/", &javascript, &javascript_len, &ret_code) == FAILURE) {
|
| 70 | + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|z/", &javascript, &javascript_len, &ret_code) == FAILURE) {
|
| 71 | RETURN_FALSE;
|
| 72 | }
|
| 73 |
|
| 74 | - jmo = jsmin(javascript TSRMLS_CC);
|
| 75 | + jmo = jsmin(javascript);
|
| 76 | if (ret_code) {
|
| 77 | zval_dtor(ret_code);
|
| 78 | ZVAL_LONG(ret_code, jmo->errorCode);
|
| 79 | @@ -121,7 +121,7 @@ PHP_FUNCTION(jsmin)
|
| 80 | } else {
|
| 81 | ZVAL_STRINGL(return_value, jmo->buffer.c, jmo->buffer.len);
|
| 82 | }
|
| 83 | - free_jsmin_obj(jmo TSRMLS_CC);
|
| 84 | + free_jsmin_obj(jmo);
|
| 85 | }
|
| 86 | /* }}} */
|
| 87 |
|