archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/standard/browscap.c: Minor refactorings (#15885)

Browse source 
- Use more appropriate types
- Add const modifiers
- Reduce scope of some variable
- Prevent shadowing of variable
This commit is contained in:
Gina Peter Banyard 2024-09-17 16:48:21 +01:00 • committed by GitHub
parent 4830535b69
commit ae4ef32d68
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
ext/standard/browscap.c
View file

@ -88,7 +88,7 @@ static inline bool is_placeholder(char c) {
} }
/* Length of prefix not containing any wildcards */ /* Length of prefix not containing any wildcards */
static uint8_t browscap_compute_prefix_len(zend_string *pattern) { static uint8_t browscap_compute_prefix_len(const zend_string *pattern) {
size_t i; size_t i;
for (i = 0; i < ZSTR_LEN(pattern); i++) { for (i = 0; i < ZSTR_LEN(pattern); i++) {
if (is_placeholder(ZSTR_VAL(pattern)[i])) { if (is_placeholder(ZSTR_VAL(pattern)[i])) {
@ -126,7 +126,7 @@ static size_t browscap_compute_contains(
} }
/* Length of regex, including escapes, anchors, etc. */ /* Length of regex, including escapes, anchors, etc. */
static size_t browscap_compute_regex_len(zend_string *pattern) { static size_t browscap_compute_regex_len(const zend_string *pattern) {
size_t i, len = ZSTR_LEN(pattern); size_t i, len = ZSTR_LEN(pattern);
for (i = 0; i < ZSTR_LEN(pattern); i++) { for (i = 0; i < ZSTR_LEN(pattern); i++) {
switch (ZSTR_VAL(pattern)[i]) { switch (ZSTR_VAL(pattern)[i]) {
@ -145,7 +145,7 @@ static size_t browscap_compute_regex_len(zend_string *pattern) {
return len + sizeof("~^$~")-1; return len + sizeof("~^$~")-1;
} }
static zend_string *browscap_convert_pattern(zend_string *pattern, int persistent) /* {{{ */ static zend_string *browscap_convert_pattern(const zend_string *pattern, bool persistent) /* {{{ */
{ {
size_t i, j=0; size_t i, j=0;
char *t; char *t;
@ -306,7 +306,7 @@ static void php_browscap_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callb
{ {
browscap_parser_ctx *ctx = arg; browscap_parser_ctx *ctx = arg;
browser_data *bdata = ctx->bdata; browser_data *bdata = ctx->bdata;
int persistent = GC_FLAGS(bdata->htab) & IS_ARRAY_PERSISTENT; bool persistent = GC_FLAGS(bdata->htab) & IS_ARRAY_PERSISTENT;
if (!arg1) { if (!arg1) {
return; return;
@ -315,7 +315,7 @@ static void php_browscap_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callb
switch (callback_type) { switch (callback_type) {
case ZEND_INI_PARSER_ENTRY: case ZEND_INI_PARSER_ENTRY:
if (ctx->current_entry != NULL && arg2) { if (ctx->current_entry != NULL && arg2) {
zend_string *new_key, *new_value; zend_string *new_value;
/* Set proper value for true/false settings */ /* Set proper value for true/false settings */
if (zend_string_equals_literal_ci(Z_STR_P(arg2), "on") if (zend_string_equals_literal_ci(Z_STR_P(arg2), "on")
@ -350,7 +350,7 @@ static void php_browscap_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callb
ctx->current_entry->parent = new_value; ctx->current_entry->parent = new_value;
} else { } else {
new_key = browscap_intern_str_ci(ctx, Z_STR_P(arg1), persistent); zend_string *new_key = browscap_intern_str_ci(ctx, Z_STR_P(arg1), persistent);
browscap_add_kv(bdata, new_key, new_value, persistent); browscap_add_kv(bdata, new_key, new_value, persistent);
ctx->current_entry->kv_end = bdata->kv_used; ctx->current_entry->kv_end = bdata->kv_used;
} }
@ -402,7 +402,7 @@ static void php_browscap_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callb
} }
/* }}} */ /* }}} */
static int browscap_read_file(char *filename, browser_data *browdata, int persistent) /* {{{ */ static zend_result browscap_read_file(char *filename, browser_data *browdata, bool persistent) /* {{{ */
{ {
zend_file_handle fh; zend_file_handle fh;
browscap_parser_ctx ctx = {0}; browscap_parser_ctx ctx = {0};
@ -459,7 +459,7 @@ static void browscap_globals_ctor(zend_browscap_globals *browscap_globals) /* {{
/* }}} */ /* }}} */
#endif #endif
static void browscap_bdata_dtor(browser_data *bdata, int persistent) /* {{{ */ static void browscap_bdata_dtor(browser_data *bdata, bool persistent) /* {{{ */
{ {
if (bdata->htab != NULL) { if (bdata->htab != NULL) {
uint32_t i; uint32_t i;
@ -510,7 +510,7 @@ PHP_MINIT_FUNCTION(browscap) /* {{{ */
/* ctor call not really needed for non-ZTS */ /* ctor call not really needed for non-ZTS */
if (browscap && browscap[0]) { if (browscap && browscap[0]) {
if (browscap_read_file(browscap, &global_bdata, 1) == FAILURE) { if (browscap_read_file(browscap, &global_bdata, true) == FAILURE) {
return FAILURE; return FAILURE;
} }
} }
@ -538,7 +538,7 @@ PHP_MSHUTDOWN_FUNCTION(browscap) /* {{{ */
} }
/* }}} */ /* }}} */
static inline size_t browscap_get_minimum_length(browscap_entry *entry) { static inline size_t browscap_get_minimum_length(const browscap_entry *entry) {
size_t len = entry->prefix_len; size_t len = entry->prefix_len;
int i; int i;
for (i = 0; i < BROWSCAP_NUM_CONTAINS; i++) { for (i = 0; i < BROWSCAP_NUM_CONTAINS; i++) {
@ -622,13 +622,12 @@ static bool browscap_match_string_wildcard(const char *s, const char *s_end, con
return pattern_current == pattern_end; return pattern_current == pattern_end;
} }
static int browser_reg_compare(browscap_entry *entry, zend_string *agent_name, browscap_entry **found_entry_ptr, size_t *cached_prev_len) /* {{{ */ static int browser_reg_compare(browscap_entry *entry, const zend_string *agent_name, browscap_entry **found_entry_ptr, size_t *cached_prev_len) /* {{{ */
{ {
browscap_entry *found_entry = *found_entry_ptr; browscap_entry *found_entry = *found_entry_ptr;
ALLOCA_FLAG(use_heap) ALLOCA_FLAG(use_heap)
zend_string *pattern_lc; zend_string *pattern_lc;
const char *cur; const char *cur;
int i;
/* Lowercase the pattern, the agent name is already lowercase */ /* Lowercase the pattern, the agent name is already lowercase */
ZSTR_ALLOCA_ALLOC(pattern_lc, ZSTR_LEN(entry->pattern), use_heap); ZSTR_ALLOCA_ALLOC(pattern_lc, ZSTR_LEN(entry->pattern), use_heap);
@ -636,7 +635,7 @@ static int browser_reg_compare(browscap_entry *entry, zend_string *agent_name, b
/* Check if the agent contains the "contains" portions */ /* Check if the agent contains the "contains" portions */
cur = ZSTR_VAL(agent_name) + entry->prefix_len; cur = ZSTR_VAL(agent_name) + entry->prefix_len;
for (i = 0; i < BROWSCAP_NUM_CONTAINS; i++) { for (int i = 0; i < BROWSCAP_NUM_CONTAINS; i++) {
if (entry->contains_len[i] != 0) { if (entry->contains_len[i] != 0) {
cur = zend_memnstr(cur, cur = zend_memnstr(cur,
ZSTR_VAL(pattern_lc) + entry->contains_start[i], ZSTR_VAL(pattern_lc) + entry->contains_start[i],
@ -668,7 +667,7 @@ static int browser_reg_compare(browscap_entry *entry, zend_string *agent_name, b
number of characters changed in the user agent being checked versus number of characters changed in the user agent being checked versus
the previous match found and the current match. */ the previous match found and the current match. */
size_t curr_len = entry->prefix_len; /* Start from the prefix because the prefix is free of wildcards */ size_t curr_len = entry->prefix_len; /* Start from the prefix because the prefix is free of wildcards */
zend_string *current_match = entry->pattern; const zend_string *current_match = entry->pattern;
for (size_t i = curr_len; i < ZSTR_LEN(current_match); i++) { for (size_t i = curr_len; i < ZSTR_LEN(current_match); i++) {
switch (ZSTR_VAL(current_match)[i]) { switch (ZSTR_VAL(current_match)[i]) {
case '?': case '?':
@ -717,7 +716,7 @@ PHP_FUNCTION(get_browser)
if (BROWSCAP_G(activation_bdata).filename[0] != '\0') { if (BROWSCAP_G(activation_bdata).filename[0] != '\0') {
bdata = &BROWSCAP_G(activation_bdata); bdata = &BROWSCAP_G(activation_bdata);
if (bdata->htab == NULL) { /* not initialized yet */ if (bdata->htab == NULL) { /* not initialized yet */
if (browscap_read_file(bdata->filename, bdata, 0) == FAILURE) { if (browscap_read_file(bdata->filename, bdata, false) == FAILURE) {
RETURN_FALSE; RETURN_FALSE;
} }
} }