Skip to content

Commit c9de358

Browse files
committed
zend_ini: add const qualifiers
1 parent 568dde5 commit c9de358

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

Zend/zend_ini.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static inline bool zend_is_whitespace(char c) {
4141
*/
4242
static int zend_remove_ini_entries(zval *el, void *arg) /* {{{ */
4343
{
44-
zend_ini_entry *ini_entry = (zend_ini_entry *)Z_PTR_P(el);
44+
const zend_ini_entry *ini_entry = (zend_ini_entry *)Z_PTR_P(el);
4545
int module_number = *(int *)arg;
4646

4747
return ini_entry->module_number == module_number;
@@ -560,7 +560,7 @@ ZEND_API zend_string *zend_ini_get_value(zend_string *name) /* {{{ */
560560
}
561561
/* }}} */
562562

563-
ZEND_API bool zend_ini_parse_bool(zend_string *str)
563+
ZEND_API bool zend_ini_parse_bool(const zend_string *str)
564564
{
565565
if (zend_string_equals_literal_ci(str, "true")
566566
|| zend_string_equals_literal_ci(str, "yes")
@@ -610,12 +610,12 @@ static const char *zend_ini_consume_quantity_prefix(const char *const digits, co
610610
return digits_consumed;
611611
}
612612

613-
static zend_ulong zend_ini_parse_quantity_internal(zend_string *value, zend_ini_parse_quantity_signed_result_t signed_result, zend_string **errstr) /* {{{ */
613+
static zend_ulong zend_ini_parse_quantity_internal(const zend_string *value, zend_ini_parse_quantity_signed_result_t signed_result, zend_string **errstr) /* {{{ */
614614
{
615615
char *digits_end = NULL;
616-
char *str = ZSTR_VAL(value);
617-
char *str_end = &str[ZSTR_LEN(value)];
618-
char *digits = str;
616+
const char *str = ZSTR_VAL(value);
617+
const char *str_end = &str[ZSTR_LEN(value)];
618+
const char *digits = str;
619619
bool overflow = false;
620620
zend_ulong factor;
621621
smart_str invalid = {0};
@@ -844,19 +844,19 @@ static zend_ulong zend_ini_parse_quantity_internal(zend_string *value, zend_ini_
844844
}
845845
/* }}} */
846846

847-
ZEND_API zend_long zend_ini_parse_quantity(zend_string *value, zend_string **errstr) /* {{{ */
847+
ZEND_API zend_long zend_ini_parse_quantity(const zend_string *value, zend_string **errstr) /* {{{ */
848848
{
849849
return (zend_long) zend_ini_parse_quantity_internal(value, ZEND_INI_PARSE_QUANTITY_SIGNED, errstr);
850850
}
851851
/* }}} */
852852

853-
ZEND_API zend_ulong zend_ini_parse_uquantity(zend_string *value, zend_string **errstr) /* {{{ */
853+
ZEND_API zend_ulong zend_ini_parse_uquantity(const zend_string *value, zend_string **errstr) /* {{{ */
854854
{
855855
return zend_ini_parse_quantity_internal(value, ZEND_INI_PARSE_QUANTITY_UNSIGNED, errstr);
856856
}
857857
/* }}} */
858858

859-
ZEND_API zend_long zend_ini_parse_quantity_warn(zend_string *value, zend_string *setting) /* {{{ */
859+
ZEND_API zend_long zend_ini_parse_quantity_warn(const zend_string *value, zend_string *setting) /* {{{ */
860860
{
861861
zend_string *errstr;
862862
zend_long retval = zend_ini_parse_quantity(value, &errstr);
@@ -870,7 +870,7 @@ ZEND_API zend_long zend_ini_parse_quantity_warn(zend_string *value, zend_string
870870
}
871871
/* }}} */
872872

873-
ZEND_API zend_ulong zend_ini_parse_uquantity_warn(zend_string *value, zend_string *setting) /* {{{ */
873+
ZEND_API zend_ulong zend_ini_parse_uquantity_warn(const zend_string *value, zend_string *setting) /* {{{ */
874874
{
875875
zend_string *errstr;
876876
zend_ulong retval = zend_ini_parse_uquantity(value, &errstr);
@@ -887,7 +887,7 @@ ZEND_API zend_ulong zend_ini_parse_uquantity_warn(zend_string *value, zend_strin
887887
ZEND_INI_DISP(zend_ini_boolean_displayer_cb) /* {{{ */
888888
{
889889
bool value;
890-
zend_string *tmp_value;
890+
const zend_string *tmp_value;
891891

892892
if (type == ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
893893
tmp_value = (ini_entry->orig_value ? ini_entry->orig_value : NULL );
@@ -913,7 +913,7 @@ ZEND_INI_DISP(zend_ini_boolean_displayer_cb) /* {{{ */
913913

914914
ZEND_INI_DISP(zend_ini_color_displayer_cb) /* {{{ */
915915
{
916-
char *value;
916+
const char *value;
917917

918918
if (type == ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
919919
value = ZSTR_VAL(ini_entry->orig_value);
@@ -940,7 +940,7 @@ ZEND_INI_DISP(zend_ini_color_displayer_cb) /* {{{ */
940940

941941
ZEND_INI_DISP(display_link_numbers) /* {{{ */
942942
{
943-
char *value;
943+
const char *value;
944944

945945
if (type == ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
946946
value = ZSTR_VAL(ini_entry->orig_value);

Zend/zend_ini.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ ZEND_API char *zend_ini_string_ex(const char *name, size_t name_length, bool ori
9393
ZEND_API zend_string *zend_ini_str(const char *name, size_t name_length, bool orig);
9494
ZEND_API zend_string *zend_ini_str_ex(const char *name, size_t name_length, bool orig, bool *exists);
9595
ZEND_API zend_string *zend_ini_get_value(zend_string *name);
96-
ZEND_API bool zend_ini_parse_bool(zend_string *str);
96+
ZEND_API bool zend_ini_parse_bool(const zend_string *str);
9797

9898
/**
9999
* Parses an ini quantity
@@ -130,16 +130,16 @@ ZEND_API bool zend_ini_parse_bool(zend_string *str);
130130
* In any of these cases an error string is stored in *errstr (caller must
131131
* release it), otherwise *errstr is set to NULL.
132132
*/
133-
ZEND_API zend_long zend_ini_parse_quantity(zend_string *value, zend_string **errstr);
133+
ZEND_API zend_long zend_ini_parse_quantity(const zend_string *value, zend_string **errstr);
134134

135135
/**
136136
* Unsigned variant of zend_ini_parse_quantity
137137
*/
138-
ZEND_API zend_ulong zend_ini_parse_uquantity(zend_string *value, zend_string **errstr);
138+
ZEND_API zend_ulong zend_ini_parse_uquantity(const zend_string *value, zend_string **errstr);
139139

140-
ZEND_API zend_long zend_ini_parse_quantity_warn(zend_string *value, zend_string *setting);
140+
ZEND_API zend_long zend_ini_parse_quantity_warn(const zend_string *value, zend_string *setting);
141141

142-
ZEND_API zend_ulong zend_ini_parse_uquantity_warn(zend_string *value, zend_string *setting);
142+
ZEND_API zend_ulong zend_ini_parse_uquantity_warn(const zend_string *value, zend_string *setting);
143143

144144
ZEND_API zend_result zend_ini_register_displayer(const char *name, uint32_t name_length, void (*displayer)(zend_ini_entry *ini_entry, int type));
145145

0 commit comments

Comments
 (0)