Skip to content

Commit 96ff88e

Browse files
GirgiasGirgias
committed
Use zend_string for DBA delete handler
1 parent cd98e46 commit 96ff88e

14 files changed

+27
-26
lines changed

‎ext/dba/dba.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@ PHP_FUNCTION(dba_delete)
10941094
}
10951095
}
10961096

1097-
RETVAL_BOOL(info->hnd->delete(info, ZSTR_VAL(key_str), ZSTR_LEN(key_str)) == SUCCESS);
1097+
RETVAL_BOOL(info->hnd->delete(info, key_str) == SUCCESS);
10981098
DBA_RELEASE_HT_KEY_CREATION();
10991099
}
11001100
/* }}} */

‎ext/dba/dba_db1.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ DBA_DELETE_FUNC(db1)
130130
dba_db1_data *dba = info->dbf;
131131
DBT gkey;
132132

133-
gkey.data = (char *) key;
134-
gkey.size = keylen;
133+
gkey.data = ZSTR_VAL(key);
134+
gkey.size = ZSTR_LEN(key);
135135

136136
return dba->dbp->del(dba->dbp, &gkey, 0) != RET_SUCCESS ? FAILURE : SUCCESS;
137137
}

‎ext/dba/dba_db2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ DBA_DELETE_FUNC(db2)
136136
dba_db2_data *dba = info->dbf;
137137
DBT gkey = {0};
138138

139-
gkey.data = (char *) key;
140-
gkey.size = keylen;
139+
gkey.data = ZSTR_VAL(key);
140+
gkey.size = ZSTR_LEN(key);
141141

142142
return dba->dbp->del(dba->dbp, NULL, &gkey, 0) ? FAILURE : SUCCESS;
143143
}

‎ext/dba/dba_db3.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ DBA_DELETE_FUNC(db3)
174174
DBT gkey;
175175

176176
memset(&gkey, 0, sizeof(gkey));
177-
gkey.data = (char *) key; gkey.size = keylen;
177+
gkey.data = ZSTR_VAL(key);
178+
gkey.size = ZSTR_LEN(key);
178179

179180
return dba->dbp->del(dba->dbp, NULL, &gkey, 0) ? FAILURE : SUCCESS;
180181
}

‎ext/dba/dba_db4.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ DBA_DELETE_FUNC(db4)
218218
DBT gkey;
219219

220220
memset(&gkey, 0, sizeof(gkey));
221-
gkey.data = (char *) key;
222-
gkey.size = keylen;
221+
gkey.data = ZSTR_VAL(key);
222+
gkey.size = ZSTR_LEN(key);
223223

224224
return dba->dbp->del(dba->dbp, NULL, &gkey, 0) ? FAILURE : SUCCESS;
225225
}

‎ext/dba/dba_dbm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ DBA_DELETE_FUNC(dbm)
136136
{
137137
datum gkey;
138138

139-
gkey.dptr = (char *) key;
140-
gkey.dsize = keylen;
139+
gkey.dptr = ZSTR_VAL(key);
140+
gkey.dsize = ZSTR_LEN(key);
141141
return(delete(gkey) == -1 ? FAILURE : SUCCESS);
142142
}
143143

‎ext/dba/dba_flatfile.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ DBA_DELETE_FUNC(flatfile)
118118
flatfile *dba = info->dbf;
119119
datum gkey;
120120

121-
gkey.dptr = (char *) key;
122-
gkey.dsize = keylen;
121+
gkey.dptr = ZSTR_VAL(key);
122+
gkey.dsize = ZSTR_LEN(key);
123123
return(flatfile_delete(dba, gkey) == -1 ? FAILURE : SUCCESS);
124124
}
125125

‎ext/dba/dba_gdbm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ DBA_DELETE_FUNC(gdbm)
128128
dba_gdbm_data *dba = info->dbf;
129129
datum gkey;
130130

131-
gkey.dptr = (char *) key;
132-
gkey.dsize = keylen;
131+
gkey.dptr = ZSTR_VAL(key);
132+
gkey.dsize = ZSTR_LEN(key);
133133

134134
return gdbm_delete(dba->dbf, gkey) == -1 ? FAILURE : SUCCESS;
135135
}

‎ext/dba/dba_inifile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ DBA_DELETE_FUNC(inifile)
134134
php_error_docref(NULL, E_WARNING, "No key specified");
135135
return 0;
136136
}
137-
ini_key = inifile_key_split((char*)key); /* keylen not needed here */
137+
ini_key = inifile_key_split(ZSTR_VAL(key)); /* keylen not needed here */
138138

139139
res = inifile_delete_ex(dba, &ini_key, &found);
140140

‎ext/dba/dba_lmdb.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,25 +223,25 @@ DBA_DELETE_FUNC(lmdb)
223223

224224
rc = mdb_txn_begin(LMDB_IT(env), NULL, 0, &LMDB_IT(txn));
225225
if (rc) {
226-
php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc));
226+
php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
227227
return FAILURE;
228228
}
229229

230-
k.mv_size = keylen;
231-
k.mv_data = key;
230+
k.mv_size = ZSTR_LEN(key);
231+
k.mv_data = ZSTR_VAL(key);
232232

233233
rc = mdb_del(LMDB_IT(txn), LMDB_IT(dbi), &k, NULL);
234234
if (!rc) {
235235
rc = mdb_txn_commit(LMDB_IT(txn));
236236
if (rc) {
237-
php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc));
237+
php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
238238
mdb_txn_abort(LMDB_IT(txn));
239239
return FAILURE;
240240
}
241241
return SUCCESS;
242242
}
243243

244-
php_error_docref1(NULL, key, E_WARNING, "%s", mdb_strerror(rc));
244+
php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
245245

246246
return FAILURE;
247247
}

‎ext/dba/dba_ndbm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ DBA_DELETE_FUNC(ndbm)
110110
{
111111
datum gkey;
112112

113-
gkey.dptr = (char *) key;
114-
gkey.dsize = keylen;
113+
gkey.dptr = ZSTR_VAL(key);
114+
gkey.dsize = ZSTR_LEN(key);
115115
return(dbm_delete(info->dbf, gkey) == -1 ? FAILURE : SUCCESS);
116116
}
117117

‎ext/dba/dba_qdbm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ DBA_DELETE_FUNC(qdbm)
120120
{
121121
dba_qdbm_data *dba = info->dbf;
122122

123-
return dpout(dba->dbf, key, keylen) ? SUCCESS : FAILURE;
123+
return dpout(dba->dbf, ZSTR_VAL(key), ZSTR_LEN(key)) ? SUCCESS : FAILURE;
124124
}
125125

126126
DBA_FIRSTKEY_FUNC(qdbm)

‎ext/dba/dba_tcadb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ DBA_DELETE_FUNC(tcadb)
138138
{
139139
dba_tcadb_data *dba = info->dbf;
140140

141-
return tcadbout(dba->tcadb, key, keylen) ? SUCCESS : FAILURE;
141+
return tcadbout(dba->tcadb, ZSTR_VAL(key), ZSTR_LEN(key)) ? SUCCESS : FAILURE;
142142
}
143143

144144
DBA_FIRSTKEY_FUNC(tcadb)

‎ext/dba/php_dba.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ typedef struct dba_handler {
7676
zend_string* (*fetch)(dba_info *, zend_string *, int);
7777
zend_result (*update)(dba_info *, zend_string *, zend_string *, int);
7878
zend_result (*exists)(dba_info *, zend_string *);
79-
zend_result (*delete)(dba_info *, char *, size_t);
79+
zend_result (*delete)(dba_info *, zend_string *);
8080
char* (*firstkey)(dba_info *, size_t *);
8181
char* (*nextkey)(dba_info *, size_t *);
8282
zend_result (*optimize)(dba_info *);
@@ -98,7 +98,7 @@ typedef struct dba_handler {
9898
#define DBA_EXISTS_FUNC(x) \
9999
zend_result dba_exists_##x(dba_info *info, zend_string *key)
100100
#define DBA_DELETE_FUNC(x) \
101-
zend_result dba_delete_##x(dba_info *info, char *key, size_t keylen)
101+
zend_result dba_delete_##x(dba_info *info, zend_string *key)
102102
#define DBA_FIRSTKEY_FUNC(x) \
103103
char *dba_firstkey_##x(dba_info *info, size_t *newlen)
104104
#define DBA_NEXTKEY_FUNC(x) \

0 commit comments

Comments
 (0)