Skip to content

Commit 198fb99

Browse files
GirgiasGirgias
committed
Use interned string for 'NULL'
1 parent 506c078 commit 198fb99

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

‎ext/pgsql/pgsql.c

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4636,7 +4636,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
46364636
switch (Z_TYPE_P(val)) {
46374637
case IS_STRING:
46384638
if (Z_STRLEN_P(val) == 0) {
4639-
ZVAL_STRING(&new_val, "NULL");
4639+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
46404640
}
46414641
else {
46424642
if (zend_string_equals_literal(Z_STR_P(val), "t") || zend_string_equals_literal(Z_STR_P(val), "T") ||
@@ -4678,7 +4678,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
46784678
break;
46794679

46804680
case IS_NULL:
4681-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4681+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
46824682
break;
46834683

46844684
default:
@@ -4697,7 +4697,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
46974697
switch (Z_TYPE_P(val)) {
46984698
case IS_STRING:
46994699
if (Z_STRLEN_P(val) == 0) {
4700-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4700+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
47014701
}
47024702
else {
47034703
/* FIXME: better regex must be used */
@@ -4722,7 +4722,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
47224722
break;
47234723

47244724
case IS_NULL:
4725-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4725+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
47264726
break;
47274727

47284728
default:
@@ -4741,7 +4741,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
47414741
switch (Z_TYPE_P(val)) {
47424742
case IS_STRING:
47434743
if (Z_STRLEN_P(val) == 0) {
4744-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4744+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
47454745
}
47464746
else {
47474747
#define REGEX0 "^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?$"
@@ -4772,7 +4772,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
47724772
break;
47734773

47744774
case IS_NULL:
4775-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4775+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
47764776
break;
47774777

47784778
default:
@@ -4807,7 +4807,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
48074807
case IS_STRING:
48084808
if (Z_STRLEN_P(val) == 0) {
48094809
if (opt & PGSQL_CONV_FORCE_NULL) {
4810-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4810+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
48114811
} else {
48124812
ZVAL_STRINGL(&new_val, "''", sizeof("''")-1);
48134813
}
@@ -4834,7 +4834,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
48344834
break;
48354835

48364836
case IS_NULL:
4837-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4837+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
48384838
break;
48394839

48404840
default:
@@ -4852,7 +4852,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
48524852
switch (Z_TYPE_P(val)) {
48534853
case IS_STRING:
48544854
if (Z_STRLEN_P(val) == 0) {
4855-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4855+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
48564856
}
48574857
else {
48584858
/* better regex? */
@@ -4876,7 +4876,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
48764876
break;
48774877

48784878
case IS_NULL:
4879-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4879+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
48804880
break;
48814881

48824882
default:
@@ -4893,7 +4893,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
48934893
switch (Z_TYPE_P(val)) {
48944894
case IS_STRING:
48954895
if (Z_STRLEN_P(val) == 0) {
4896-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4896+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
48974897
}
48984898
else {
48994899
#define REGEX0 "^((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])(\\/[0-9]{1,3})?$"
@@ -4915,7 +4915,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
49154915
break;
49164916

49174917
case IS_NULL:
4918-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4918+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
49194919
break;
49204920

49214921
default:
@@ -4933,7 +4933,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
49334933
switch(Z_TYPE_P(val)) {
49344934
case IS_STRING:
49354935
if (Z_STRLEN_P(val) == 0) {
4936-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4936+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
49374937
} else if (zend_string_equals_literal_ci(Z_STR_P(val), "now()")) {
49384938
ZVAL_STRINGL(&new_val, "NOW()", sizeof("NOW()")-1);
49394939
} else {
@@ -4950,7 +4950,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
49504950
break;
49514951

49524952
case IS_NULL:
4953-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4953+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
49544954
break;
49554955

49564956
default:
@@ -4966,7 +4966,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
49664966
switch(Z_TYPE_P(val)) {
49674967
case IS_STRING:
49684968
if (Z_STRLEN_P(val) == 0) {
4969-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4969+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
49704970
}
49714971
else {
49724972
#define REGEX0 "^([0-9]{4}[/-][0-9]{1,2}[/-][0-9]{1,2})$"
@@ -4983,7 +4983,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
49834983
break;
49844984

49854985
case IS_NULL:
4986-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4986+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
49874987
break;
49884988

49894989
default:
@@ -4999,7 +4999,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
49994999
switch(Z_TYPE_P(val)) {
50005000
case IS_STRING:
50015001
if (Z_STRLEN_P(val) == 0) {
5002-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
5002+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
50035003
}
50045004
else {
50055005
#define REGEX0 "^(([0-9]{1,2}:[0-9]{1,2}){1}(:[0-9]{1,2}){0,1}){0,1}$"
@@ -5016,7 +5016,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
50165016
break;
50175017

50185018
case IS_NULL:
5019-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
5019+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
50205020
break;
50215021

50225022
default:
@@ -5032,7 +5032,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
50325032
switch(Z_TYPE_P(val)) {
50335033
case IS_STRING:
50345034
if (Z_STRLEN_P(val) == 0) {
5035-
ZVAL_STRING(&new_val, "NULL");
5035+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
50365036
}
50375037
else {
50385038

@@ -5095,7 +5095,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
50955095
break;
50965096

50975097
case IS_NULL:
5098-
ZVAL_STRING(&new_val, "NULL");
5098+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
50995099
break;
51005100

51015101
default:
@@ -5110,7 +5110,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
51105110
switch (Z_TYPE_P(val)) {
51115111
case IS_STRING:
51125112
if (Z_STRLEN_P(val) == 0) {
5113-
ZVAL_STRING(&new_val, "NULL");
5113+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
51145114
}
51155115
else {
51165116
unsigned char *tmp;
@@ -5137,7 +5137,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
51375137
break;
51385138

51395139
case IS_NULL:
5140-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
5140+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
51415141
break;
51425142

51435143
default:
@@ -5153,7 +5153,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
51535153
switch(Z_TYPE_P(val)) {
51545154
case IS_STRING:
51555155
if (Z_STRLEN_P(val) == 0) {
5156-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
5156+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
51575157
}
51585158
else {
51595159
#define REGEX0 "^([0-9a-f]{2,2}:){5,5}[0-9a-f]{2,2}$"
@@ -5169,7 +5169,7 @@ PHP_PGSQL_API zend_result php_pgsql_convert(PGconn *pg_link, const char *table_n
51695169
break;
51705170

51715171
case IS_NULL:
5172-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
5172+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
51735173
break;
51745174

51755175
default:

0 commit comments

Comments
 (0)