Skip to content

Commit 042b3f5

Browse files
nielsdosnielsdos
committed
Make more pointers const in ext/tidy
1 parent d14b936 commit 042b3f5

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;
@@ -354,7 +354,7 @@ static void php_tidy_quick_repair(INTERNAL_FUNCTION_PARAMETERS, bool is_file)
354354

355355
tidySaveBuffer (doc, &output);
356356
FIX_BUFFER(&output);
357-
RETVAL_STRINGL((char *) output.bp, output.size ? output.size-1 : 0);
357+
RETVAL_STRINGL((const char *) output.bp, output.size ? output.size-1 : 0);
358358
tidyBufFree(&output);
359359
} else {
360360
RETVAL_FALSE;
@@ -371,7 +371,7 @@ static void php_tidy_quick_repair(INTERNAL_FUNCTION_PARAMETERS, bool is_file)
371371
tidyRelease(doc);
372372
}
373373

374-
static zend_string *php_tidy_file_to_mem(char *filename, bool use_include_path)
374+
static zend_string *php_tidy_file_to_mem(const char *filename, bool use_include_path)
375375
{
376376
php_stream *stream;
377377
zend_string *data = NULL;
@@ -486,7 +486,7 @@ static zend_result tidy_doc_cast_handler(zend_object *in, zval *out, int type)
486486
tidyBufInit(&output);
487487
tidySaveBuffer (obj->ptdoc->doc, &output);
488488
if (output.size) {
489-
ZVAL_STRINGL(out, (char *) output.bp, output.size-1);
489+
ZVAL_STRINGL(out, (const char *) output.bp, output.size-1);
490490
} else {
491491
ZVAL_EMPTY_STRING(out);
492492
}
@@ -524,7 +524,7 @@ static zend_result tidy_node_cast_handler(zend_object *in, zval *out, int type)
524524
tidyBufInit(&buf);
525525
if (obj->ptdoc) {
526526
tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf);
527-
ZVAL_STRINGL(out, (char *) buf.bp, buf.size-1);
527+
ZVAL_STRINGL(out, (const char *) buf.bp, buf.size-1);
528528
} else {
529529
ZVAL_EMPTY_STRING(out);
530530
}
@@ -577,7 +577,7 @@ static void tidy_add_node_default_properties(PHPTidyObj *obj)
577577
TidyNode tempnode;
578578
zval attribute, children, temp;
579579
PHPTidyObj *newobj;
580-
char *name;
580+
const char *name;
581581

582582
tidyBufInit(&buf);
583583
tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf);
@@ -587,13 +587,13 @@ static void tidy_add_node_default_properties(PHPTidyObj *obj)
587587
&obj->std,
588588
"value",
589589
sizeof("value") - 1,
590-
buf.size ? (char *) buf.bp : "",
590+
buf.size ? (const char *) buf.bp : "",
591591
buf.size ? buf.size - 1 : 0
592592
);
593593

594594
tidyBufFree(&buf);
595595

596-
name = (char *) tidyNodeGetName(obj->node);
596+
name = (const char *) tidyNodeGetName(obj->node);
597597

598598
zend_update_property_string(
599599
tidy_ce_node,
@@ -661,12 +661,12 @@ static void tidy_add_node_default_properties(PHPTidyObj *obj)
661661
tempattr = tidyAttrFirst(obj->node);
662662

663663
if (tempattr) {
664-
char *name, *val;
664+
const char *name, *val;
665665
array_init(&attribute);
666666

667667
do {
668-
name = (char *)tidyAttrName(tempattr);
669-
val = (char *)tidyAttrValue(tempattr);
668+
name = (const char *)tidyAttrName(tempattr);
669+
val = (const char *)tidyAttrValue(tempattr);
670670
if (name) {
671671
if (val) {
672672
add_assoc_string(&attribute, name, val);
@@ -789,7 +789,7 @@ static void php_tidy_create_node(INTERNAL_FUNCTION_PARAMETERS, tidy_base_nodetyp
789789
tidy_add_node_default_properties(newobj);
790790
}
791791

792-
static int _php_tidy_apply_config_array(TidyDoc doc, HashTable *ht_options)
792+
static int _php_tidy_apply_config_array(TidyDoc doc, const HashTable *ht_options)
793793
{
794794
zval *opt_val;
795795
zend_string *opt_name;
@@ -805,7 +805,7 @@ static int _php_tidy_apply_config_array(TidyDoc doc, HashTable *ht_options)
805805
return SUCCESS;
806806
}
807807

808-
static int php_tidy_parse_string(PHPTidyObj *obj, char *string, uint32_t len, char *enc)
808+
static int php_tidy_parse_string(PHPTidyObj *obj, const char *string, uint32_t len, const char *enc)
809809
{
810810
TidyBuffer buf;
811811

@@ -890,12 +890,12 @@ static PHP_MINFO_FUNCTION(tidy)
890890
php_info_print_table_start();
891891
php_info_print_table_row(2, "Tidy support", "enabled");
892892
#ifdef HAVE_TIDYBUFFIO_H
893-
php_info_print_table_row(2, "libTidy Version", (char *)tidyLibraryVersion());
893+
php_info_print_table_row(2, "libTidy Version", (const char *)tidyLibraryVersion());
894894
#elif defined(HAVE_TIDYP_H)
895-
php_info_print_table_row(2, "libtidyp Version", (char *)tidyVersion());
895+
php_info_print_table_row(2, "libtidyp Version", (const char *)tidyVersion());
896896
#endif
897897
#ifdef HAVE_TIDYRELEASEDATE
898-
php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate());
898+
php_info_print_table_row(2, "libTidy Release", (const char *)tidyReleaseDate());
899899
#endif
900900
php_info_print_table_end();
901901

@@ -1038,7 +1038,7 @@ PHP_FUNCTION(tidy_get_error_buffer)
10381038
TIDY_FETCH_OBJECT;
10391039

10401040
if (obj->ptdoc->errbuf && obj->ptdoc->errbuf->bp) {
1041-
RETURN_STRINGL((char*)obj->ptdoc->errbuf->bp, obj->ptdoc->errbuf->size-1);
1041+
RETURN_STRINGL((const char*)obj->ptdoc->errbuf->bp, obj->ptdoc->errbuf->size-1);
10421042
} else {
10431043
RETURN_FALSE;
10441044
}
@@ -1054,7 +1054,7 @@ PHP_FUNCTION(tidy_get_output)
10541054
tidyBufInit(&output);
10551055
tidySaveBuffer(obj->ptdoc->doc, &output);
10561056
FIX_BUFFER(&output);
1057-
RETVAL_STRINGL((char *) output.bp, output.size ? output.size-1 : 0);
1057+
RETVAL_STRINGL((const char *) output.bp, output.size ? output.size-1 : 0);
10581058
tidyBufFree(&output);
10591059
}
10601060
/* }}} */
@@ -1152,9 +1152,9 @@ PHP_FUNCTION(tidy_get_release)
11521152
}
11531153

11541154
#ifdef HAVE_TIDYRELEASEDATE
1155-
RETURN_STRING((char *)tidyReleaseDate());
1155+
RETURN_STRING((const char *)tidyReleaseDate());
11561156
#else
1157-
RETURN_STRING((char *)"unknown");
1157+
RETURN_STRING((const char *)"unknown");
11581158
#endif
11591159
}
11601160
/* }}} */
@@ -1165,7 +1165,8 @@ PHP_FUNCTION(tidy_get_release)
11651165
PHP_FUNCTION(tidy_get_opt_doc)
11661166
{
11671167
PHPTidyObj *obj;
1168-
char *optval, *optname;
1168+
const char *optval;
1169+
char *optname;
11691170
size_t optname_len;
11701171
TidyOption opt;
11711172
zval *object;
@@ -1183,7 +1184,7 @@ PHP_FUNCTION(tidy_get_opt_doc)
11831184
RETURN_THROWS();
11841185
}
11851186

1186-
if ( (optval = (char *) tidyOptGetDoc(obj->ptdoc->doc, opt)) ) {
1187+
if ( (optval = (const char *) tidyOptGetDoc(obj->ptdoc->doc, opt)) ) {
11871188
RETURN_STRING(optval);
11881189
}
11891190

@@ -1197,7 +1198,7 @@ PHP_FUNCTION(tidy_get_opt_doc)
11971198
PHP_FUNCTION(tidy_get_config)
11981199
{
11991200
TidyIterator itOpt;
1200-
char *opt_name;
1201+
const char *opt_name;
12011202
void *opt_value;
12021203
TidyOptionType optt;
12031204

@@ -1210,7 +1211,7 @@ PHP_FUNCTION(tidy_get_config)
12101211
while (itOpt) {
12111212
TidyOption opt = tidyGetNextOption(obj->ptdoc->doc, &itOpt);
12121213

1213-
opt_name = (char *)tidyOptGetName(opt);
1214+
opt_name = (const char *)tidyOptGetName(opt);
12141215
opt_value = php_tidy_get_opt_val(obj->ptdoc, opt, &optt);
12151216
switch (optt) {
12161217
case TidyString:

0 commit comments

Comments
 (0)