Skip to content

Fix c23 compilation #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bix0r merged 2 commits into from
May 18, 2026
Merged

Fix c23 compilation #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3c19b8
Remove deprecated xmlIndentTreeOutput
bix0r May 12, 2026
b754d77
Remove ignored auto keyword
bix0r May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 2 additions & 19 deletions src/php_solr_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ PHP_METHOD(SolrClient, addDocument)

if (commitWithin > 0L)
{
auto char commitWithinBuffer[32];
char commitWithinBuffer[32];

memset(commitWithinBuffer, 0, sizeof(commitWithinBuffer));

Expand All @@ -714,7 +714,6 @@ PHP_METHOD(SolrClient, addDocument)

solr_add_doc_node(root_node, doc_entry);

xmlIndentTreeOutput = 1;
xmlDocDumpFormatMemoryEnc(doc_ptr, &request_string, &size, "UTF-8", format);

/* The XML request we are sending to Solr */
Expand Down Expand Up @@ -854,7 +853,7 @@ PHP_METHOD(SolrClient, addDocuments)

if (commitWithin > 0L)
{
auto char commitWithinBuffer[32];
char commitWithinBuffer[32];

memset(commitWithinBuffer, 0, sizeof(commitWithinBuffer));

Expand All @@ -879,8 +878,6 @@ PHP_METHOD(SolrClient, addDocuments)
/* We are done with the doc_entries pointer */
SOLR_FREE_DOC_ENTRIES(doc_entries);

xmlIndentTreeOutput = 1;

xmlDocDumpFormatMemoryEnc(doc_ptr, &request_string, &size, "UTF-8", format);

/* The XML request we are sending to Solr */
Expand Down Expand Up @@ -1067,8 +1064,6 @@ PHP_METHOD(SolrClient, deleteById)
xmlNewChild(root_node, NULL, (xmlChar *) "id", escaped_id_value);
xmlFree(escaped_id_value);

xmlIndentTreeOutput = 1;

xmlDocDumpFormatMemoryEnc(doc_ptr, &request_string, &size, "UTF-8", format);

/* The XML request we are sending to Solr */
Expand Down Expand Up @@ -1169,8 +1164,6 @@ end_doc_ids_loop :
return;
}

xmlIndentTreeOutput = 1;

xmlDocDumpFormatMemoryEnc(doc_ptr, &request_string, &size, "UTF-8", format);

/* The XML request we are sending to Solr */
Expand Down Expand Up @@ -1240,8 +1233,6 @@ PHP_METHOD(SolrClient, deleteByQuery)
xmlNewChild(root_node, NULL, (xmlChar *) "query", escaped_query_value);
xmlFree(escaped_query_value);

xmlIndentTreeOutput = 1;

xmlDocDumpFormatMemoryEnc(doc_ptr, &request_string, &size, "UTF-8", format);

/* The XML request we are sending to Solr */
Expand Down Expand Up @@ -1517,8 +1508,6 @@ end_doc_queries_loop :
return;
}

xmlIndentTreeOutput = 1;

xmlDocDumpFormatMemoryEnc(doc_ptr, &request_string, &size, "UTF-8", format);

/* The XML request we are sending to Solr */
Expand Down Expand Up @@ -1593,8 +1582,6 @@ PHP_METHOD(SolrClient, optimize)
return;
}

xmlIndentTreeOutput = 1;

xmlDocDumpFormatMemoryEnc(doc_ptr, &request_string, &size, "UTF-8", format);

/* The XML request we are sending to Solr */
Expand Down Expand Up @@ -1662,8 +1649,6 @@ PHP_METHOD(SolrClient, commit)
return;
}

xmlIndentTreeOutput = 1;

xmlDocDumpFormatMemoryEnc(doc_ptr, &request_string, &size, "UTF-8", format);

/* The XML request we are sending to Solr */
Expand Down Expand Up @@ -1714,8 +1699,6 @@ PHP_METHOD(SolrClient, rollback)
return;
}

xmlIndentTreeOutput = 1;

xmlDocDumpFormatMemoryEnc(doc_ptr, &request_string, &size, "UTF-8", format);

/* The XML request we are sending to Solr */
Expand Down
2 changes: 0 additions & 2 deletions src/php_solr_document.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,6 @@ static void solr_serialize_document_object(HashTable *document_fields, xmlChar *

} /* SOLR_HASHTABLE_FOR_LOOP(document_fields) */

xmlIndentTreeOutput = 1;

xmlDocDumpFormatMemoryEnc(doc_ptr, buffer, size, "UTF-8", format);

xmlFreeDoc(doc_ptr);
Expand Down
2 changes: 0 additions & 2 deletions src/php_solr_params.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,6 @@ static int solr_serialize_solr_params_object(xmlChar **serialized, int *size, zv
}
}

xmlIndentTreeOutput = 1;

xmlDocDumpFormatMemoryEnc(doc_ptr, serialized, size, "UTF-8", format);
xmlFreeDoc(doc_ptr);

Expand Down
4 changes: 2 additions & 2 deletions src/solr_functions_document.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ PHP_SOLR_API void solr_add_doc_node(xmlNode *root_node, solr_document_t *doc_ent

if (doc_entry->document_boost > 0.0f)
{
auto char tmp_buffer[256]; /* Scratch pad for converting numeric values to strings */
char tmp_buffer[256]; /* Scratch pad for converting numeric values to strings */
memset(tmp_buffer, 0, sizeof(tmp_buffer));
php_gcvt(doc_entry->document_boost, EG(precision), '.', 'e' , tmp_buffer);
xmlNewProp(solr_doc_node, (xmlChar *) "boost", (xmlChar *) tmp_buffer);
Expand Down Expand Up @@ -507,7 +507,7 @@ PHP_SOLR_API void solr_generate_document_xml_from_fields(xmlNode *solr_doc_node,
/* Set the boost attribute if this is the first value */
if (is_first_value && field->field_boost > 0.0f)
{
auto char tmp_boost_value_buffer[256];
char tmp_boost_value_buffer[256];

memset(tmp_boost_value_buffer, 0, sizeof(tmp_boost_value_buffer));

Expand Down
4 changes: 2 additions & 2 deletions src/solr_functions_params.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ PHP_SOLR_API void solr_simple_list_param_value_fetch(solr_param_t *solr_param, s
solr_param_value_t *current_ptr = solr_param->head;
solr_char_t list_delimiter = ','; /* Comma 0x2C */
zend_ulong n_loops = solr_param->count - 1;
auto solr_string_t tmp_buffer;
solr_string_t tmp_buffer;
zend_string *url_encoded_list = NULL;

solr_string_appends(buffer, solr_param->param_name, solr_param->param_name_length);
Expand Down Expand Up @@ -935,7 +935,7 @@ PHP_SOLR_API void solr_simple_list_param_value_tostring(solr_param_t *solr_param
solr_param_value_t *current_ptr = solr_param->head;
solr_char_t list_delimiter = solr_param->delimiter; /* Comma 0x2C */
zend_ulong n_loops = solr_param->count - 1;
auto solr_string_t tmp_buffer;
solr_string_t tmp_buffer;
zend_string *url_encoded_list = NULL;

solr_string_appends(buffer, solr_param->param_name, solr_param->param_name_length);
Expand Down
12 changes: 6 additions & 6 deletions src/solr_string.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ php_printf("solr_string_alloc() [Re]allocated %u bytes at %p in %s(), %s Line %d
/* {{{ PHP_SOLR_API void solr_string_appends(solr_string_t *dest, const solr_char_t *src, size_t length SOLR_MEM_DEBUG_DC) */
PHP_SOLR_API void solr_string_appends_ex(solr_string_t *dest, const solr_char_t *src, size_t length SOLR_MEM_DEBUG_DC)
{
auto size_t __new_length = 0U;
size_t __new_length = 0U;

/* (Re)allocates memory and increases the capacity if necessary */
solr_string_alloc(dest, length, &__new_length SOLR_MEM_DEBUG_CC);
Expand All @@ -71,7 +71,7 @@ PHP_SOLR_API void solr_string_appends_ex(solr_string_t *dest, const solr_char_t
/* {{{ PHP_SOLR_API void solr_string_appendc(solr_string_t *dest, solr_char_t ch SOLR_MEM_DEBUG_DC) */
PHP_SOLR_API void solr_string_appendc_ex(solr_string_t *dest, solr_char_t ch SOLR_MEM_DEBUG_DC)
{
auto size_t __new_length = 0U;
size_t __new_length = 0U;

/* (Re)allocates memory and increases the capacity if necessary */
solr_string_alloc(dest, 1, &__new_length SOLR_MEM_DEBUG_CC);
Expand Down Expand Up @@ -101,8 +101,8 @@ PHP_SOLR_API void solr_string_remove_last_char(solr_string_t *dest)
/* {{{ PHP_SOLR_API void solr_string_append_long(solr_string_t *dest, long int long_val) */
PHP_SOLR_API void solr_string_append_long_ex(solr_string_t *dest, long int long_val SOLR_MEM_DEBUG_DC)
{
auto size_t __new_length = 0U;
auto char tmp_buffer[SOLR_STRING_LONG_BUFFER_SIZE];
size_t __new_length = 0U;
char tmp_buffer[SOLR_STRING_LONG_BUFFER_SIZE];
size_t length = 0;

/* Write the formated long to the buffer */
Expand All @@ -127,8 +127,8 @@ PHP_SOLR_API void solr_string_append_long_ex(solr_string_t *dest, long int long_
/* {{{ PHP_SOLR_API void solr_string_append_unsigned_long(solr_string_t *dest, unsigned long int long_val) */
PHP_SOLR_API void solr_string_append_unsigned_long_ex(solr_string_t *dest, unsigned long int long_val SOLR_MEM_DEBUG_DC)
{
auto size_t __new_length = 0U;
auto char tmp_buffer[SOLR_STRING_UNSIGNED_LONG_BUFFER_SIZE];
size_t __new_length = 0U;
char tmp_buffer[SOLR_STRING_UNSIGNED_LONG_BUFFER_SIZE];
size_t length = 0;

/* Write the formated unsigned long to the buffer */
Expand Down
Loading