Skip to content

Commit e736d7c

Browse files
nielsdosnielsdos
committed
Make more pointers const in ext/tidy
1 parent f6940b9 commit e736d7c

File tree

1 file changed

+30
-29
lines changed

1 file changed

+30
-29
lines changed

‎ext/tidy/tidy.c

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ static inline PHPTidyObj *php_tidy_fetch_object(zend_object *obj) {
118118
/* }}} */
119119

120120
/* {{{ ext/tidy prototypes */
121-
static zend_string *php_tidy_file_to_mem(char *, bool);
121+
static zend_string *php_tidy_file_to_mem(const char *, bool);
122122
static void tidy_object_free_storage(zend_object *);
123123
static zend_object *tidy_object_new_node(zend_class_entry *);
124124
static zend_object *tidy_object_new_doc(zend_class_entry *);
@@ -129,8 +129,8 @@ static void tidy_doc_update_properties(PHPTidyObj *);
129129
static void tidy_add_node_default_properties(PHPTidyObj *);
130130
static void *php_tidy_get_opt_val(PHPTidyDoc *, TidyOption, TidyOptionType *);
131131
static void php_tidy_create_node(INTERNAL_FUNCTION_PARAMETERS, tidy_base_nodetypes);
132-
static int _php_tidy_set_tidy_opt(TidyDoc, char *, zval *);
133-
static int _php_tidy_apply_config_array(TidyDoc doc, HashTable *ht_options);
132+
static int _php_tidy_set_tidy_opt(TidyDoc, const char *, zval *);
133+
static int _php_tidy_apply_config_array(TidyDoc doc, const HashTable *ht_options);
134134
static PHP_INI_MH(php_tidy_set_clean_output);
135135
static void php_tidy_clean_output_start(const char *name, size_t name_len);
136136
static php_output_handler *php_tidy_output_handler_init(const char *handler_name, size_t handler_name_len, size_t chunk_size, int flags);
@@ -195,7 +195,7 @@ static void TIDY_CALL php_tidy_free(void *buf)
195195

196196
static void TIDY_CALL php_tidy_panic(ctmbstr msg)
197197
{
198-
php_error_docref(NULL, E_ERROR, "Could not allocate memory for tidy! (Reason: %s)", (char *)msg);
198+
php_error_docref(NULL, E_ERROR, "Could not allocate memory for tidy! (Reason: %s)", (const char *)msg);
199199
}
200200

201201
static void php_tidy_load_config(TidyDoc doc, const char *path)
@@ -208,7 +208,7 @@ static void php_tidy_load_config(TidyDoc doc, const char *path)
208208
}
209209
}
210210

211-
static zend_result php_tidy_apply_config(TidyDoc doc, zend_string *str_string, HashTable *ht_options)
211+
static zend_result php_tidy_apply_config(TidyDoc doc, const zend_string *str_string, const HashTable *ht_options)
212212
{
213213
if (ht_options) {
214214
return _php_tidy_apply_config_array(doc, ht_options);
@@ -221,7 +221,7 @@ static zend_result php_tidy_apply_config(TidyDoc doc, zend_string *str_string, H
221221
return SUCCESS;
222222
}
223223

224-
static int _php_tidy_set_tidy_opt(TidyDoc doc, char *optname, zval *value)
224+
static int _php_tidy_set_tidy_opt(TidyDoc doc, const char *optname, zval *value)
225225
{
226226
TidyOption opt = tidyGetOptionByName(doc, optname);
227227
zend_string *str, *tmp_str;
@@ -365,7 +365,7 @@ static void php_tidy_quick_repair(INTERNAL_FUNCTION_PARAMETERS, bool is_file)
365365

366366
tidySaveBuffer (doc, &output);
367367
FIX_BUFFER(&output);
368-
RETVAL_STRINGL((char *) output.bp, output.size ? output.size-1 : 0);
368+
RETVAL_STRINGL((const char *) output.bp, output.size ? output.size-1 : 0);
369369
tidyBufFree(&output);
370370
} else {
371371
RETVAL_FALSE;
@@ -382,7 +382,7 @@ static void php_tidy_quick_repair(INTERNAL_FUNCTION_PARAMETERS, bool is_file)
382382
tidyRelease(doc);
383383
}
384384

385-
static zend_string *php_tidy_file_to_mem(char *filename, bool use_include_path)
385+
static zend_string *php_tidy_file_to_mem(const char *filename, bool use_include_path)
386386
{
387387
php_stream *stream;
388388
zend_string *data = NULL;
@@ -497,7 +497,7 @@ static zend_result tidy_doc_cast_handler(zend_object *in, zval *out, int type)
497497
tidyBufInit(&output);
498498
tidySaveBuffer (obj->ptdoc->doc, &output);
499499
if (output.size) {
500-
ZVAL_STRINGL(out, (char *) output.bp, output.size-1);
500+
ZVAL_STRINGL(out, (const char *) output.bp, output.size-1);
501501
} else {
502502
ZVAL_EMPTY_STRING(out);
503503
}
@@ -535,7 +535,7 @@ static zend_result tidy_node_cast_handler(zend_object *in, zval *out, int type)
535535
tidyBufInit(&buf);
536536
if (obj->ptdoc) {
537537
tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf);
538-
ZVAL_STRINGL(out, (char *) buf.bp, buf.size-1);
538+
ZVAL_STRINGL(out, (const char *) buf.bp, buf.size-1);
539539
} else {
540540
ZVAL_EMPTY_STRING(out);
541541
}
@@ -587,7 +587,7 @@ static void tidy_add_node_default_properties(PHPTidyObj *obj)
587587
TidyAttr tempattr;
588588
TidyNode tempnode;
589589
zval attribute, children, temp;
590-
char *name;
590+
const char *name;
591591

592592
tidyBufInit(&buf);
593593
tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf);
@@ -597,13 +597,13 @@ static void tidy_add_node_default_properties(PHPTidyObj *obj)
597597
&obj->std,
598598
"value",
599599
sizeof("value") - 1,
600-
buf.size ? (char *) buf.bp : "",
600+
buf.size ? (const char *) buf.bp : "",
601601
buf.size ? buf.size - 1 : 0
602602
);
603603

604604
tidyBufFree(&buf);
605605

606-
name = (char *) tidyNodeGetName(obj->node);
606+
name = (const char *) tidyNodeGetName(obj->node);
607607

608608
zend_update_property_string(
609609
tidy_ce_node,
@@ -671,12 +671,12 @@ static void tidy_add_node_default_properties(PHPTidyObj *obj)
671671
tempattr = tidyAttrFirst(obj->node);
672672

673673
if (tempattr) {
674-
char *name, *val;
674+
const char *name, *val;
675675
array_init(&attribute);
676676

677677
do {
678-
name = (char *)tidyAttrName(tempattr);
679-
val = (char *)tidyAttrValue(tempattr);
678+
name = (const char *)tidyAttrName(tempattr);
679+
val = (const char *)tidyAttrValue(tempattr);
680680
if (name) {
681681
if (val) {
682682
add_assoc_string(&attribute, name, val);
@@ -783,7 +783,7 @@ static void php_tidy_create_node(INTERNAL_FUNCTION_PARAMETERS, tidy_base_nodetyp
783783
tidy_create_node_object(return_value, obj->ptdoc, node);
784784
}
785785

786-
static int _php_tidy_apply_config_array(TidyDoc doc, HashTable *ht_options)
786+
static int _php_tidy_apply_config_array(TidyDoc doc, const HashTable *ht_options)
787787
{
788788
zval *opt_val;
789789
zend_string *opt_name;
@@ -799,7 +799,7 @@ static int _php_tidy_apply_config_array(TidyDoc doc, HashTable *ht_options)
799799
return SUCCESS;
800800
}
801801

802-
static int php_tidy_parse_string(PHPTidyObj *obj, char *string, uint32_t len, char *enc)
802+
static int php_tidy_parse_string(PHPTidyObj *obj, const char *string, uint32_t len, const char *enc)
803803
{
804804
TidyBuffer buf;
805805

@@ -884,12 +884,12 @@ static PHP_MINFO_FUNCTION(tidy)
884884
php_info_print_table_start();
885885
php_info_print_table_row(2, "Tidy support", "enabled");
886886
#ifdef HAVE_TIDYBUFFIO_H
887-
php_info_print_table_row(2, "libTidy Version", (char *)tidyLibraryVersion());
887+
php_info_print_table_row(2, "libTidy Version", (const char *)tidyLibraryVersion());
888888
#elif defined(HAVE_TIDYP_H)
889-
php_info_print_table_row(2, "libtidyp Version", (char *)tidyVersion());
889+
php_info_print_table_row(2, "libtidyp Version", (const char *)tidyVersion());
890890
#endif
891891
#ifdef HAVE_TIDYRELEASEDATE
892-
php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate());
892+
php_info_print_table_row(2, "libTidy Release", (const char *)tidyReleaseDate());
893893
#endif
894894
php_info_print_table_end();
895895

@@ -1032,7 +1032,7 @@ PHP_FUNCTION(tidy_get_error_buffer)
10321032
TIDY_FETCH_OBJECT;
10331033

10341034
if (obj->ptdoc->errbuf && obj->ptdoc->errbuf->bp) {
1035-
RETURN_STRINGL((char*)obj->ptdoc->errbuf->bp, obj->ptdoc->errbuf->size-1);
1035+
RETURN_STRINGL((const char*)obj->ptdoc->errbuf->bp, obj->ptdoc->errbuf->size-1);
10361036
} else {
10371037
RETURN_FALSE;
10381038
}
@@ -1048,7 +1048,7 @@ PHP_FUNCTION(tidy_get_output)
10481048
tidyBufInit(&output);
10491049
tidySaveBuffer(obj->ptdoc->doc, &output);
10501050
FIX_BUFFER(&output);
1051-
RETVAL_STRINGL((char *) output.bp, output.size ? output.size-1 : 0);
1051+
RETVAL_STRINGL((const char *) output.bp, output.size ? output.size-1 : 0);
10521052
tidyBufFree(&output);
10531053
}
10541054
/* }}} */
@@ -1146,9 +1146,9 @@ PHP_FUNCTION(tidy_get_release)
11461146
}
11471147

11481148
#ifdef HAVE_TIDYRELEASEDATE
1149-
RETURN_STRING((char *)tidyReleaseDate());
1149+
RETURN_STRING((const char *)tidyReleaseDate());
11501150
#else
1151-
RETURN_STRING((char *)"unknown");
1151+
RETURN_STRING((const char *)"unknown");
11521152
#endif
11531153
}
11541154
/* }}} */
@@ -1159,7 +1159,8 @@ PHP_FUNCTION(tidy_get_release)
11591159
PHP_FUNCTION(tidy_get_opt_doc)
11601160
{
11611161
PHPTidyObj *obj;
1162-
char *optval, *optname;
1162+
const char *optval;
1163+
char *optname;
11631164
size_t optname_len;
11641165
TidyOption opt;
11651166
zval *object;
@@ -1177,7 +1178,7 @@ PHP_FUNCTION(tidy_get_opt_doc)
11771178
RETURN_THROWS();
11781179
}
11791180

1180-
if ( (optval = (char *) tidyOptGetDoc(obj->ptdoc->doc, opt)) ) {
1181+
if ( (optval = (const char *) tidyOptGetDoc(obj->ptdoc->doc, opt)) ) {
11811182
RETURN_STRING(optval);
11821183
}
11831184

@@ -1191,7 +1192,7 @@ PHP_FUNCTION(tidy_get_opt_doc)
11911192
PHP_FUNCTION(tidy_get_config)
11921193
{
11931194
TidyIterator itOpt;
1194-
char *opt_name;
1195+
const char *opt_name;
11951196
void *opt_value;
11961197
TidyOptionType optt;
11971198

@@ -1204,7 +1205,7 @@ PHP_FUNCTION(tidy_get_config)
12041205
while (itOpt) {
12051206
TidyOption opt = tidyGetNextOption(obj->ptdoc->doc, &itOpt);
12061207

1207-
opt_name = (char *)tidyOptGetName(opt);
1208+
opt_name = (const char *)tidyOptGetName(opt);
12081209
opt_value = php_tidy_get_opt_val(obj->ptdoc, opt, &optt);
12091210
switch (optt) {
12101211
case TidyString:

0 commit comments

Comments
 (0)