Skip to content

Commit 263b22f

Browse files
MaxKellermannMaxKellermann
authored
Make lots of string pointers const (#10646)
This allows using string literals without implicitly casting away the `const`.
1 parent 373809c commit 263b22f

22 files changed

+39
-40
lines changed

‎ext/curl/curl_file.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ PHP_FUNCTION(curl_file_create)
6565
}
6666
/* }}} */
6767

68-
static void curlfile_get_property(char *name, size_t name_len, INTERNAL_FUNCTION_PARAMETERS)
68+
static void curlfile_get_property(const char *name, size_t name_len, INTERNAL_FUNCTION_PARAMETERS)
6969
{
7070
zval *res, rv;
7171

@@ -74,7 +74,7 @@ static void curlfile_get_property(char *name, size_t name_len, INTERNAL_FUNCTION
7474
RETURN_COPY_DEREF(res);
7575
}
7676

77-
static void curlfile_set_property(char *name, size_t name_len, INTERNAL_FUNCTION_PARAMETERS)
77+
static void curlfile_set_property(const char *name, size_t name_len, INTERNAL_FUNCTION_PARAMETERS)
7878
{
7979
zend_string *arg;
8080

‎ext/curl/interface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2073,7 +2073,7 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
20732073
struct curl_slist *slist = NULL;
20742074

20752075
if (Z_TYPE_P(zvalue) != IS_ARRAY) {
2076-
char *name = NULL;
2076+
const char *name = NULL;
20772077
switch (option) {
20782078
case CURLOPT_HTTPHEADER:
20792079
name = "CURLOPT_HTTPHEADER";

‎ext/date/php_date.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ PHPAPI time_t php_time(void)
235235

236236
#include "php_date_arginfo.h"
237237

238-
static char* guess_timezone(const timelib_tzdb *tzdb);
238+
static const char* guess_timezone(const timelib_tzdb *tzdb);
239239
static void date_register_classes(void);
240240
/* }}} */
241241

@@ -549,7 +549,7 @@ static PHP_INI_MH(OnUpdate_date_timezone)
549549
/* }}} */
550550

551551
/* {{{ Helper functions */
552-
static char* guess_timezone(const timelib_tzdb *tzdb)
552+
static const char* guess_timezone(const timelib_tzdb *tzdb)
553553
{
554554
/* Checking whether timezone has been set with date_default_timezone_set() */
555555
if (DATEG(timezone) && (strlen(DATEG(timezone))) > 0) {
@@ -573,10 +573,9 @@ static char* guess_timezone(const timelib_tzdb *tzdb)
573573

574574
PHPAPI timelib_tzinfo *get_timezone_info(void)
575575
{
576-
char *tz;
577576
timelib_tzinfo *tzi;
578577

579-
tz = guess_timezone(DATE_TIMEZONEDB);
578+
const char *tz = guess_timezone(DATE_TIMEZONEDB);
580579
tzi = php_date_parse_tzfile(tz, DATE_TIMEZONEDB);
581580
if (! tzi) {
582581
zend_throw_error(date_ce_date_error, "Timezone database is corrupt. Please file a bug report as this should never happen");
@@ -607,7 +606,7 @@ static const char * const day_short_names[] = {
607606
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
608607
};
609608

610-
static char *english_suffix(timelib_sll number)
609+
static const char *english_suffix(timelib_sll number)
611610
{
612611
if (number >= 10 && number <= 19) {
613612
return "th";
@@ -1667,7 +1666,7 @@ static const zend_object_iterator_funcs date_period_it_funcs = {
16671666
NULL, /* get_gc */
16681667
};
16691668

1670-
zend_object_iterator *date_object_period_get_iterator(zend_class_entry *ce, zval *object, int by_ref) /* {{{ */
1669+
static zend_object_iterator *date_object_period_get_iterator(zend_class_entry *ce, zval *object, int by_ref) /* {{{ */
16711670
{
16721671
date_period_it *iterator;
16731672

@@ -2043,7 +2042,7 @@ static void php_timezone_to_string(php_timezone_obj *tzobj, zval *zv)
20432042
}
20442043
}
20452044

2046-
void date_timezone_object_to_hash(php_timezone_obj *tzobj, HashTable *props)
2045+
static void date_timezone_object_to_hash(php_timezone_obj *tzobj, HashTable *props)
20472046
{
20482047
zval zv;
20492048

‎ext/dba/dba.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,10 +462,10 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
462462
dba_mode_t modenr;
463463
dba_info *info, *other;
464464
const dba_handler *hptr;
465-
char *error = NULL;
465+
const char *error = NULL;
466466
int lock_mode, lock_flag = 0;
467-
char *file_mode;
468-
char *lock_file_mode = NULL;
467+
const char *file_mode;
468+
const char *lock_file_mode = NULL;
469469
int persistent_flag = persistent ? STREAM_OPEN_PERSISTENT : 0;
470470
zend_string *opened_path = NULL;
471471
char *lock_name;

‎ext/dba/libcdb/cdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ int cdb_find(struct cdb *c, char *key, unsigned int len)
185185
/* }}} */
186186

187187
/* {{{ cdb_version */
188-
char *cdb_version()
188+
const char *cdb_version()
189189
{
190190
return "0.75, $Id$";
191191
}

‎ext/dba/libcdb/cdb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ int cdb_find(struct cdb *, char *, unsigned int);
4848
#define cdb_datapos(c) ((c)->dpos)
4949
#define cdb_datalen(c) ((c)->dlen)
5050

51-
char *cdb_version(void);
51+
const char *cdb_version(void);
5252

5353
#endif

‎ext/dba/libcdb/cdb_make.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ int cdb_make_finish(struct cdb_make *c)
236236
/* }}} */
237237

238238
/* {{{ cdb_make_version */
239-
char *cdb_make_version()
239+
const char *cdb_make_version()
240240
{
241241
return "0.75, $Id$";
242242
}

‎ext/dba/libcdb/cdb_make.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ int cdb_make_addbegin(struct cdb_make *, unsigned int, unsigned int);
5555
int cdb_make_addend(struct cdb_make *, unsigned int, unsigned int, uint32);
5656
int cdb_make_add(struct cdb_make *, char *, unsigned int, char *, unsigned int);
5757
int cdb_make_finish(struct cdb_make *);
58-
char *cdb_make_version(void);
58+
const char *cdb_make_version(void);
5959

6060
#endif

‎ext/dba/libflatfile/flatfile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ datum flatfile_nextkey(flatfile *dba) {
276276
/* }}} */
277277

278278
/* {{{ flatfile_version */
279-
char *flatfile_version()
279+
const char *flatfile_version()
280280
{
281281
return "1.0, $Id$";
282282
}

‎ext/dba/libflatfile/flatfile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ int flatfile_delete(flatfile *dba, datum key_datum);
3939
int flatfile_findkey(flatfile *dba, datum key_datum);
4040
datum flatfile_firstkey(flatfile *dba);
4141
datum flatfile_nextkey(flatfile *dba);
42-
char *flatfile_version(void);
42+
const char *flatfile_version(void);
4343

4444
#endif

‎ext/dba/libinifile/inifile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
*/
3939

4040
/* {{{ inifile_version */
41-
char *inifile_version()
41+
const char *inifile_version()
4242
{
4343
return "1.0, $Id$";
4444
}

‎ext/dba/libinifile/inifile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ int inifile_delete_ex(inifile *dba, const key_type *key, bool *found);
4949
int inifile_replace(inifile *dba, const key_type *key, const val_type *val);
5050
int inifile_replace_ex(inifile *dba, const key_type *key, const val_type *val, bool *found);
5151
int inifile_append(inifile *dba, const key_type *key, const val_type *val);
52-
char *inifile_version(void);
52+
const char *inifile_version(void);
5353

5454
key_type inifile_key_split(const char *group_name);
5555
char * inifile_key_string(const key_type *key);

‎ext/dba/php_dba.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ extern zend_module_entry dba_module_entry;
7373
#define dba_module_ptr &dba_module_entry
7474

7575
typedef struct dba_handler {
76-
char *name; /* handler name */
76+
const char *name; /* handler name */
7777
int flags; /* whether and how dba does locking and other flags*/
78-
zend_result (*open)(dba_info *, char **error);
78+
zend_result (*open)(dba_info *, const char **error);
7979
void (*close)(dba_info *);
8080
zend_string* (*fetch)(dba_info *, zend_string *, int);
8181
zend_result (*update)(dba_info *, zend_string *, zend_string *, int);
@@ -92,7 +92,7 @@ typedef struct dba_handler {
9292
/* common prototypes which must be supplied by modules */
9393

9494
#define DBA_OPEN_FUNC(x) \
95-
zend_result dba_open_##x(dba_info *info, char **error)
95+
zend_result dba_open_##x(dba_info *info, const char **error)
9696
#define DBA_CLOSE_FUNC(x) \
9797
void dba_close_##x(dba_info *info)
9898
#define DBA_FETCH_FUNC(x) \

‎ext/opcache/ZendAccelerator.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ zend_accel_shared_globals *accel_shared_globals = NULL;
112112
char accel_uname_id[32];
113113
#endif
114114
bool accel_startup_ok = false;
115-
static char *zps_failure_reason = NULL;
116-
char *zps_api_failure_reason = NULL;
115+
static const char *zps_failure_reason = NULL;
116+
const char *zps_api_failure_reason = NULL;
117117
bool file_cache_only = false; /* process uses file cache only */
118118
#if ENABLE_FILE_CACHE_FALLBACK
119119
bool fallback_process = false; /* process uses file cache fallback */
@@ -2809,7 +2809,7 @@ static int accelerator_remove_cb(zend_extension *element1, zend_extension *eleme
28092809
return 0;
28102810
}
28112811

2812-
static void zps_startup_failure(char *reason, char *api_reason, int (*cb)(zend_extension *, zend_extension *))
2812+
static void zps_startup_failure(const char *reason, const char *api_reason, int (*cb)(zend_extension *, zend_extension *))
28132813
{
28142814
accel_startup_ok = false;
28152815
zps_failure_reason = reason;

‎ext/opcache/ZendAccelerator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ ZEND_TSRMLS_CACHE_EXTERN()
305305
extern zend_accel_globals accel_globals;
306306
#endif
307307

308-
extern char *zps_api_failure_reason;
308+
extern const char *zps_api_failure_reason;
309309

310310
BEGIN_EXTERN_C()
311311

‎ext/opcache/shared_alloc_mmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ static void *find_prefered_mmap_base(size_t requested_size)
154154
}
155155
#endif
156156

157-
static int create_segments(size_t requested_size, zend_shared_segment ***shared_segments_p, int *shared_segments_count, char **error_in)
157+
static int create_segments(size_t requested_size, zend_shared_segment ***shared_segments_p, int *shared_segments_count, const char **error_in)
158158
{
159159
zend_shared_segment *shared_segment;
160160
int flags = PROT_READ | PROT_WRITE, fd = -1;

‎ext/opcache/shared_alloc_posix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ typedef struct {
3636
int shm_fd;
3737
} zend_shared_segment_posix;
3838

39-
static int create_segments(size_t requested_size, zend_shared_segment_posix ***shared_segments_p, int *shared_segments_count, char **error_in)
39+
static int create_segments(size_t requested_size, zend_shared_segment_posix ***shared_segments_p, int *shared_segments_count, const char **error_in)
4040
{
4141
zend_shared_segment_posix *shared_segment;
4242
char shared_segment_name[sizeof("/ZendAccelerator.") + 20];

‎ext/opcache/shared_alloc_shm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ typedef struct {
5050
int shm_id;
5151
} zend_shared_segment_shm;
5252

53-
static int create_segments(size_t requested_size, zend_shared_segment_shm ***shared_segments_p, int *shared_segments_count, char **error_in)
53+
static int create_segments(size_t requested_size, zend_shared_segment_shm ***shared_segments_p, int *shared_segments_count, const char **error_in)
5454
{
5555
int i;
5656
size_t allocate_size = 0, remaining_bytes = requested_size, seg_allocate_size;

‎ext/opcache/shared_alloc_win32.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ void zend_shared_alloc_unlock_win32(void)
112112
ReleaseMutex(memory_mutex);
113113
}
114114

115-
static int zend_shared_alloc_reattach(size_t requested_size, char **error_in)
115+
static int zend_shared_alloc_reattach(size_t requested_size, const char **error_in)
116116
{
117117
int err;
118118
void *wanted_mapping_base;
@@ -199,7 +199,7 @@ static int zend_shared_alloc_reattach(size_t requested_size, char **error_in)
199199
return SUCCESSFULLY_REATTACHED;
200200
}
201201

202-
static int create_segments(size_t requested_size, zend_shared_segment ***shared_segments_p, int *shared_segments_count, char **error_in)
202+
static int create_segments(size_t requested_size, zend_shared_segment ***shared_segments_p, int *shared_segments_count, const char **error_in)
203203
{
204204
int err = 0, ret;
205205
zend_shared_segment *shared_segment;

‎ext/opcache/zend_shared_alloc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ void zend_shared_alloc_create_lock(char *lockfile_path)
9797
}
9898
#endif
9999

100-
static void no_memory_bailout(size_t allocate_size, char *error)
100+
static void no_memory_bailout(size_t allocate_size, const char *error)
101101
{
102102
zend_accel_error_noreturn(ACCEL_LOG_FATAL, "Unable to allocate shared memory segment of %zu bytes: %s: %s (%d)", allocate_size, error?error:"unknown", strerror(errno), errno );
103103
}
@@ -117,7 +117,7 @@ static void copy_shared_segments(void *to, void *from, int count, int size)
117117
}
118118
}
119119

120-
static int zend_shared_alloc_try(const zend_shared_memory_handler_entry *he, size_t requested_size, zend_shared_segment ***shared_segments_p, int *shared_segments_count, char **error_in)
120+
static int zend_shared_alloc_try(const zend_shared_memory_handler_entry *he, size_t requested_size, zend_shared_segment ***shared_segments_p, int *shared_segments_count, const char **error_in)
121121
{
122122
int res;
123123
g_shared_alloc_handler = he->handler;
@@ -151,7 +151,7 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)
151151
zend_shared_segment **tmp_shared_segments;
152152
size_t shared_segments_array_size;
153153
zend_smm_shared_globals tmp_shared_globals, *p_tmp_shared_globals;
154-
char *error_in = NULL;
154+
const char *error_in = NULL;
155155
const zend_shared_memory_handler_entry *he;
156156
int res = ALLOC_FAILURE;
157157
int i;
@@ -169,7 +169,7 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)
169169
#endif
170170

171171
if (ZCG(accel_directives).memory_model && ZCG(accel_directives).memory_model[0]) {
172-
char *model = ZCG(accel_directives).memory_model;
172+
const char *model = ZCG(accel_directives).memory_model;
173173
/* "cgi" is really "shm"... */
174174
if (strncmp(ZCG(accel_directives).memory_model, "cgi", sizeof("cgi")) == 0) {
175175
model = "shm";

‎ext/opcache/zend_shared_alloc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ typedef struct _zend_shared_segment {
8080
void *p;
8181
} zend_shared_segment;
8282

83-
typedef int (*create_segments_t)(size_t requested_size, zend_shared_segment ***shared_segments, int *shared_segment_count, char **error_in);
83+
typedef int (*create_segments_t)(size_t requested_size, zend_shared_segment ***shared_segments, int *shared_segment_count, const char **error_in);
8484
typedef int (*detach_segment_t)(zend_shared_segment *shared_segment);
8585

8686
typedef struct {

‎ext/sqlite3/sqlite3.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,7 +1234,7 @@ PHP_METHOD(SQLite3, openBlob)
12341234
{
12351235
php_sqlite3_db_object *db_obj;
12361236
zval *object = ZEND_THIS;
1237-
char *table, *column, *dbname = "main", *mode = "rb";
1237+
const char *table, *column, *dbname = "main", *mode = "rb";
12381238
size_t table_len, column_len, dbname_len;
12391239
zend_long rowid, flags = SQLITE_OPEN_READONLY, sqlite_flags = 0;
12401240
sqlite3_blob *blob = NULL;
@@ -1338,7 +1338,7 @@ PHP_METHOD(SQLite3, backup)
13381338
{
13391339
php_sqlite3_db_object *source_obj;
13401340
php_sqlite3_db_object *destination_obj;
1341-
char *source_dbname = "main", *destination_dbname = "main";
1341+
const char *source_dbname = "main", *destination_dbname = "main";
13421342
size_t source_dbname_length, destination_dbname_length;
13431343
zval *source_zval = ZEND_THIS;
13441344
zval *destination_zval;

0 commit comments

Comments
 (0)