Skip to content

Fix -Wunused-but-set-global warning #25395

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

Closed
arnaud-lb wants to merge 2 commits into from
Closed

Fix -Wunused-but-set-global warning #25395

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
ab2855f
Fix -Wunused-but-set-global warning
arnaud-lb Nov 11, 2026
9b4b106
Fix -Wunused-but-set-global warning
arnaud-lb Nov 11, 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
8 changes: 6 additions & 2 deletions TSRM/TSRM.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ static tsrm_shutdown_func_t tsrm_thread_free_handler = NULL;
int tsrm_error(int level, const char *format, ...);

/* Read a resource from a thread's resource storage */
#ifdef TSRM_DEBUG
static int tsrm_error_level;
static FILE *tsrm_error_file;

#ifdef TSRM_DEBUG
#define TSRM_ERROR(args) tsrm_error args
#define TSRM_SAFE_RETURN_RSRC(array, offset, range) \
{ \
Expand Down Expand Up @@ -140,7 +140,9 @@ TSRM_API bool tsrm_startup(int expected_threads, int expected_resources, int deb
in_main_thread = true;
is_thread_shutdown = false;

#ifdef TSRM_DEBUG
tsrm_error_file = stderr;
#endif
tsrm_error_set(debug_level, debug_filename);
tsrm_tls_table_size = expected_threads;

Expand Down Expand Up @@ -238,9 +240,11 @@ TSRM_API void tsrm_shutdown(void)
tsrm_mutex_free(tsmm_mutex);
tsrm_mutex_free(tsrm_env_mutex);
TSRM_ERROR((TSRM_ERROR_LEVEL_CORE, "Shutdown TSRM"));
#ifdef TSRM_DEBUG
if (tsrm_error_file!=stderr) {
fclose(tsrm_error_file);
}
#endif
#ifdef TSRM_WIN32
TlsFree(tls_key);
tls_key = TLS_OUT_OF_INDEXES;
Expand Down Expand Up @@ -838,9 +842,9 @@ int tsrm_error(int level, const char *format, ...)

void tsrm_error_set(int level, const char *debug_filename)
{/*{{{*/
#ifdef TSRM_DEBUG
tsrm_error_level = level;

#ifdef TSRM_DEBUG
if (tsrm_error_file!=stderr) { /* close files opened earlier */
fclose(tsrm_error_file);
}
Expand Down
3 changes: 1 addition & 2 deletions ext/pcntl/pcntl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ typedef psetid_t cpu_set_t;

#include "pcntl_arginfo.h"
#include "pcntl_decl.h"
static zend_class_entry *QosClass_ce;

ZEND_DECLARE_MODULE_GLOBALS(pcntl)
static PHP_GINIT_FUNCTION(pcntl);
Expand Down Expand Up @@ -220,7 +219,7 @@ PHP_RINIT_FUNCTION(pcntl)

PHP_MINIT_FUNCTION(pcntl)
{
QosClass_ce = register_class_Pcntl_QosClass();
register_class_Pcntl_QosClass();
register_pcntl_symbols(module_number);
orig_interrupt_function = zend_interrupt_function;
zend_interrupt_function = pcntl_interrupt_function;
Expand Down
Loading