Skip to content

Commit 815c9d4

Browse files
committed
ext/dba: switch dba_handlers full_info path to zend_string API
1 parent 31d3875 commit 815c9d4

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

ext/dba/dba_cdb.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,14 +318,13 @@ 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 = NULL;
322322
if (!strcmp(hnd->name, "cdb")) {
323323
version_str = cdb_version();
324-
return zend_string_init(cdb_version, strlen(cdb_version), false);
325324
} else {
326325
version_str = cdb_make_version();
327-
return zend_string_init(cdb_version, strlen(cdb_version), false);
328326
}
327+
return zend_string_init(cdb_version, strlen(cdb_version), false);
329328
#else
330329
return zend_string_init("External", strlen("External"), false);
331330
#endif

ext/dba/dba_gdbm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ DBA_SYNC_FUNC(gdbm)
189189

190190
DBA_INFO_FUNC(gdbm)
191191
{
192-
return estrdup(gdbm_version);
192+
return zend_string_init(gdbm_version, strlen(gdbm_version), false);
193193
}
194194

195195
#endif

ext/dba/dba_tcadb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ DBA_SYNC_FUNC(tcadb)
193193

194194
DBA_INFO_FUNC(tcadb)
195195
{
196-
return zend_string_init(tcversion, strlen(tcversion), false);;
196+
return zend_string_init(tcversion, strlen(tcversion), false);
197197
}
198198

199199
#endif

0 commit comments

Comments
 (0)