ext/dba: make string pointers const

Author: MaxKellermann

ext/dba/dba.c

@@ -462,10 +462,10 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
 	dba_mode_t modenr;
 	dba_info *info, *other;
 	const dba_handler *hptr;
-	char *error = NULL;
+	const char *error = NULL;
 	int lock_mode, lock_flag = 0;
-	char *file_mode;
-	char *lock_file_mode = NULL;
+	const char *file_mode;
+	const char *lock_file_mode = NULL;
 	int persistent_flag = persistent ? STREAM_OPEN_PERSISTENT : 0;
 	zend_string *opened_path = NULL;
 	char *lock_name;

ext/dba/libcdb/cdb.c

@@ -185,7 +185,7 @@ int cdb_find(struct cdb *c, char *key, unsigned int len)
 /* }}} */
 
 /* {{{ cdb_version */
-char *cdb_version()
+const char *cdb_version()
 {
 	return "0.75, $Id$";
 }

ext/dba/libcdb/cdb.h

@@ -48,6 +48,6 @@ int cdb_find(struct cdb *, char *, unsigned int);
 #define cdb_datapos(c) ((c)->dpos)
 #define cdb_datalen(c) ((c)->dlen)
 
-char *cdb_version(void);
+const char *cdb_version(void);
 
 #endif

ext/dba/libcdb/cdb_make.c

@@ -236,7 +236,7 @@ int cdb_make_finish(struct cdb_make *c)
 /* }}} */
 
 /* {{{ cdb_make_version */
-char *cdb_make_version()
+const char *cdb_make_version()
 {
 	return "0.75, $Id$";
 }

ext/dba/libcdb/cdb_make.h

@@ -55,6 +55,6 @@ int cdb_make_addbegin(struct cdb_make *, unsigned int, unsigned int);
 int cdb_make_addend(struct cdb_make *, unsigned int, unsigned int, uint32);
 int cdb_make_add(struct cdb_make *, char *, unsigned int, char *, unsigned int);
 int cdb_make_finish(struct cdb_make *);
-char *cdb_make_version(void);
+const char *cdb_make_version(void);
 
 #endif

ext/dba/libflatfile/flatfile.c

@@ -276,7 +276,7 @@ datum flatfile_nextkey(flatfile *dba) {
 /* }}} */
 
 /* {{{ flatfile_version */
-char *flatfile_version()
+const char *flatfile_version()
 {
 	return "1.0, $Id$";
 }

ext/dba/libflatfile/flatfile.h

@@ -39,6 +39,6 @@ int flatfile_delete(flatfile *dba, datum key_datum);
 int flatfile_findkey(flatfile *dba, datum key_datum);
 datum flatfile_firstkey(flatfile *dba);
 datum flatfile_nextkey(flatfile *dba);
-char *flatfile_version(void);
+const char *flatfile_version(void);
 
 #endif

ext/dba/libinifile/inifile.c

@@ -38,7 +38,7 @@
  */
 
 /* {{{ inifile_version */
-char *inifile_version()
+const char *inifile_version()
 {
 	return "1.0, $Id$";
 }

ext/dba/libinifile/inifile.h

@@ -49,7 +49,7 @@ int inifile_delete_ex(inifile *dba, const key_type *key, bool *found);
 int inifile_replace(inifile *dba, const key_type *key, const val_type *val);
 int inifile_replace_ex(inifile *dba, const key_type *key, const val_type *val, bool *found);
 int inifile_append(inifile *dba, const key_type *key, const val_type *val);
-char *inifile_version(void);
+const char *inifile_version(void);
 
 key_type inifile_key_split(const char *group_name);
 char * inifile_key_string(const key_type *key);

ext/dba/php_dba.h

@@ -73,9 +73,9 @@ extern zend_module_entry dba_module_entry;
 #define dba_module_ptr &dba_module_entry
 
 typedef struct dba_handler {
-	char *name; /* handler name */
+	const char *name; /* handler name */
 	int flags; /* whether and how dba does locking and other flags*/
-	zend_result (*open)(dba_info *, char **error);
+	zend_result (*open)(dba_info *, const char **error);
 	void (*close)(dba_info *);
 	zend_string* (*fetch)(dba_info *, zend_string *, int);
 	zend_result (*update)(dba_info *, zend_string *, zend_string *, int);
@@ -92,7 +92,7 @@ typedef struct dba_handler {
 /* common prototypes which must be supplied by modules */
 
 #define DBA_OPEN_FUNC(x) \
-	zend_result dba_open_##x(dba_info *info, char **error)
+	zend_result dba_open_##x(dba_info *info, const char **error)
 #define DBA_CLOSE_FUNC(x) \
 	void dba_close_##x(dba_info *info)
 #define DBA_FETCH_FUNC(x) \