Skip to content

Commit ef6fff3

Browse files
committed
ext/dba: switch dba_handlers full_info path to zend_string API
1 parent 4fffd89 commit ef6fff3

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

ext/dba/dba_cdb.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,15 +318,17 @@ DBA_SYNC_FUNC(cdb)
318318
DBA_INFO_FUNC(cdb)
319319
{
320320
#ifdef DBA_CDB_BUILTIN
321-
char* version_str = NULL;
321+
const char *version_str;
322+
322323
if (!strcmp(hnd->name, "cdb")) {
323-
version_str = (char*)cdb_version();
324+
version_str = cdb_version();
324325
} else {
325-
version_str = (char*)cdb_make_version();
326+
version_str = cdb_make_version();
326327
}
327-
return zend_string_init(cdb_version, strlen(cdb_version), false);
328+
329+
return zend_string_init(version_str, strlen(version_str), 0);
328330
#else
329-
return zend_string_init("External", strlen("External"), false);
331+
return zend_string_init("External", sizeof("External") - 1, 0);
330332
#endif
331333
}
332334

ext/dba/dba_dbm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ DBA_INFO_FUNC(dbm)
188188
{
189189
#ifdef DBA_GDBM
190190
if (!strcmp(DBM_VERSION, "GDBM"))
191-
{
191+
{
192192
return dba_info_gdbm(hnd, info);
193193
}
194194
#endif

ext/dba/dba_flatfile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ DBA_SYNC_FUNC(flatfile)
167167

168168
DBA_INFO_FUNC(flatfile)
169169
{
170-
char* version = flatfile_version();
170+
const char* version = flatfile_version();
171171
return zend_string_init(version, strlen(version), false);
172172
}
173173

0 commit comments

Comments
 (0)