Skip to content

Commit 170f634

Browse files
GirgiasGirgias
committed
Use interned string for 'NULL'
1 parent 44915ca commit 170f634

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
@@ -4626,7 +4626,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
46264626
switch (Z_TYPE_P(val)) {
46274627
case IS_STRING:
46284628
if (Z_STRLEN_P(val) == 0) {
4629-
ZVAL_STRING(&new_val, "NULL");
4629+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
46304630
}
46314631
else {
46324632
if (zend_string_equals_literal(Z_STR_P(val), "t") || zend_string_equals_literal(Z_STR_P(val), "T") ||
@@ -4668,7 +4668,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
46684668
break;
46694669

46704670
case IS_NULL:
4671-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4671+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
46724672
break;
46734673

46744674
default:
@@ -4687,7 +4687,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
46874687
switch (Z_TYPE_P(val)) {
46884688
case IS_STRING:
46894689
if (Z_STRLEN_P(val) == 0) {
4690-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4690+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
46914691
}
46924692
else {
46934693
/* FIXME: better regex must be used */
@@ -4712,7 +4712,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
47124712
break;
47134713

47144714
case IS_NULL:
4715-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4715+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
47164716
break;
47174717

47184718
default:
@@ -4731,7 +4731,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
47314731
switch (Z_TYPE_P(val)) {
47324732
case IS_STRING:
47334733
if (Z_STRLEN_P(val) == 0) {
4734-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4734+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
47354735
}
47364736
else {
47374737
#define REGEX0 "^[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?$"
@@ -4762,7 +4762,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
47624762
break;
47634763

47644764
case IS_NULL:
4765-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4765+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
47664766
break;
47674767

47684768
default:
@@ -4797,7 +4797,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
47974797
case IS_STRING:
47984798
if (Z_STRLEN_P(val) == 0) {
47994799
if (opt & PGSQL_CONV_FORCE_NULL) {
4800-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4800+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
48014801
} else {
48024802
ZVAL_STRINGL(&new_val, "''", sizeof("''")-1);
48034803
}
@@ -4824,7 +4824,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
48244824
break;
48254825

48264826
case IS_NULL:
4827-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4827+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
48284828
break;
48294829

48304830
default:
@@ -4842,7 +4842,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
48424842
switch (Z_TYPE_P(val)) {
48434843
case IS_STRING:
48444844
if (Z_STRLEN_P(val) == 0) {
4845-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4845+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
48464846
}
48474847
else {
48484848
/* better regex? */
@@ -4866,7 +4866,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
48664866
break;
48674867

48684868
case IS_NULL:
4869-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4869+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
48704870
break;
48714871

48724872
default:
@@ -4883,7 +4883,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
48834883
switch (Z_TYPE_P(val)) {
48844884
case IS_STRING:
48854885
if (Z_STRLEN_P(val) == 0) {
4886-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4886+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
48874887
}
48884888
else {
48894889
#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})?$"
@@ -4905,7 +4905,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
49054905
break;
49064906

49074907
case IS_NULL:
4908-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4908+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
49094909
break;
49104910

49114911
default:
@@ -4923,7 +4923,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
49234923
switch(Z_TYPE_P(val)) {
49244924
case IS_STRING:
49254925
if (Z_STRLEN_P(val) == 0) {
4926-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4926+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
49274927
} else if (!strcasecmp(Z_STRVAL_P(val), "now()")) {
49284928
ZVAL_STRINGL(&new_val, "NOW()", sizeof("NOW()")-1);
49294929
} else {
@@ -4940,7 +4940,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
49404940
break;
49414941

49424942
case IS_NULL:
4943-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4943+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
49444944
break;
49454945

49464946
default:
@@ -4956,7 +4956,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
49564956
switch(Z_TYPE_P(val)) {
49574957
case IS_STRING:
49584958
if (Z_STRLEN_P(val) == 0) {
4959-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4959+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
49604960
}
49614961
else {
49624962
#define REGEX0 "^([0-9]{4}[/-][0-9]{1,2}[/-][0-9]{1,2})$"
@@ -4973,7 +4973,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
49734973
break;
49744974

49754975
case IS_NULL:
4976-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4976+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
49774977
break;
49784978

49794979
default:
@@ -4989,7 +4989,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
49894989
switch(Z_TYPE_P(val)) {
49904990
case IS_STRING:
49914991
if (Z_STRLEN_P(val) == 0) {
4992-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
4992+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
49934993
}
49944994
else {
49954995
#define REGEX0 "^(([0-9]{1,2}:[0-9]{1,2}){1}(:[0-9]{1,2}){0,1}){0,1}$"
@@ -5006,7 +5006,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
50065006
break;
50075007

50085008
case IS_NULL:
5009-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
5009+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
50105010
break;
50115011

50125012
default:
@@ -5022,7 +5022,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
50225022
switch(Z_TYPE_P(val)) {
50235023
case IS_STRING:
50245024
if (Z_STRLEN_P(val) == 0) {
5025-
ZVAL_STRING(&new_val, "NULL");
5025+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
50265026
}
50275027
else {
50285028

@@ -5085,7 +5085,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
50855085
break;
50865086

50875087
case IS_NULL:
5088-
ZVAL_STRING(&new_val, "NULL");
5088+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
50895089
break;
50905090

50915091
default:
@@ -5100,7 +5100,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
51005100
switch (Z_TYPE_P(val)) {
51015101
case IS_STRING:
51025102
if (Z_STRLEN_P(val) == 0) {
5103-
ZVAL_STRING(&new_val, "NULL");
5103+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
51045104
}
51055105
else {
51065106
unsigned char *tmp;
@@ -5127,7 +5127,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
51275127
break;
51285128

51295129
case IS_NULL:
5130-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
5130+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
51315131
break;
51325132

51335133
default:
@@ -5143,7 +5143,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
51435143
switch(Z_TYPE_P(val)) {
51445144
case IS_STRING:
51455145
if (Z_STRLEN_P(val) == 0) {
5146-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
5146+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
51475147
}
51485148
else {
51495149
#define REGEX0 "^([0-9a-f]{2,2}:){5,5}[0-9a-f]{2,2}$"
@@ -5159,7 +5159,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
51595159
break;
51605160

51615161
case IS_NULL:
5162-
ZVAL_STRINGL(&new_val, "NULL", sizeof("NULL")-1);
5162+
ZVAL_STR(&new_val, ZSTR_KNOWN(ZEND_STR_NULL));
51635163
break;
51645164

51655165
default:

0 commit comments

Comments
 (0)