mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
Make globals const (part 2) (#10610)
* Zend/zend_enum: make `forbidden_methods` static+const * main/php_syslog: make `xdigits` static * sapi/fpm: make several globals `const` * sapi/phpdbg: make `OPTIONS` static * sapi/phpdbg/help: make help texts const * sapi/cli: make `template_map` const * ext/ffi: make `zend_ffi_types` static * ext/bcmath: make `ref_str` const * ext/phar: make several globals static+const
This commit is contained in:
parent
c0d89e54c8
commit
d46dea169c
12 changed files with 28 additions and 28 deletions
|
@ -38,9 +38,9 @@ const phpdbg_command_t phpdbg_help_commands[] = {
|
|||
}; /* }}} */
|
||||
|
||||
/* {{{ pretty_print. Formatting escapes and wrapping text in a string before printing it. */
|
||||
void pretty_print(char *text)
|
||||
static void pretty_print(const char *text)
|
||||
{
|
||||
char *new, *p, *q;
|
||||
char *new, *q;
|
||||
|
||||
const char *prompt_escape = phpdbg_get_prompt();
|
||||
size_t prompt_escape_len = strlen(prompt_escape);
|
||||
|
@ -60,6 +60,7 @@ void pretty_print(char *text)
|
|||
uint32_t line_count = 0; /* number printable chars on current line */
|
||||
|
||||
/* First pass calculates a safe size for the pretty print version */
|
||||
const char *p;
|
||||
for (p = text; *p; p++) {
|
||||
if (UNEXPECTED(p[0] == '*') && p[1] == '*') {
|
||||
size += bold_escape_len - 2;
|
||||
|
@ -143,9 +144,9 @@ void summary_print(phpdbg_command_t const * const cmd)
|
|||
}
|
||||
|
||||
/* {{{ get_help. Retries and formats text from the phpdbg help text table */
|
||||
static char *get_help(const char * const key)
|
||||
static const char *get_help(const char * const key)
|
||||
{
|
||||
phpdbg_help_text_t *p;
|
||||
const phpdbg_help_text_t *p;
|
||||
|
||||
/* Note that phpdbg_help_text is not assumed to be collated in key order. This is an
|
||||
inconvenience that means that help can't be logically grouped Not worth
|
||||
|
@ -201,8 +202,8 @@ static int get_command(
|
|||
|
||||
} /* }}} */
|
||||
|
||||
void phpdbg_do_help_cmd(char *type) { /* {{{ */
|
||||
char *help;
|
||||
void phpdbg_do_help_cmd(const char *type) { /* {{{ */
|
||||
const char *help;
|
||||
|
||||
if (!type) {
|
||||
pretty_print(get_help("overview!"));
|
||||
|
@ -329,7 +330,7 @@ PHPDBG_HELP(aliases) /* {{{ */
|
|||
* has a key ending in !
|
||||
*/
|
||||
#define CR "\n"
|
||||
phpdbg_help_text_t phpdbg_help_text[] = {
|
||||
const phpdbg_help_text_t phpdbg_help_text[] = {
|
||||
|
||||
/******************************** General Help Topics ********************************/
|
||||
{"overview!", CR
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue