Skip to content

Commit f4c173f

Browse files
committed
code cleaning
1 parent 6715ca6 commit f4c173f

File tree

5 files changed

+14
-28
lines changed

5 files changed

+14
-28
lines changed

bdict.cc

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,7 @@ size_t bdict::count() const {
186186
zval * bdict::parse(const std::string &ben, size_t &pt) {
187187
if (ben[pt] != 'd')
188188
return bitem::throw_general_exception("Error parsing bdict");
189-
zval _zv;
190-
zval *zv = &_zv;
189+
zval *zv = new zval();
191190
zend_object *zo = zend_container::bdict_object_new(zend_container::bdict_ce);
192191
ZVAL_OBJ(zv, zo);
193192
bdict_object *intern = zend_container::bdict_fetch_object(Z_OBJ_P(zv));
@@ -248,8 +247,7 @@ std::string bdict::encode() const {
248247
}
249248

250249
zval * bdict::to_array(const bool include_meta) const {
251-
zval _zv;
252-
zval *zv = &_zv;
250+
zval *zv = new zval();
253251
array_init(zv);
254252

255253
for(zend_hash_internal_pointer_reset(_data);
@@ -287,8 +285,7 @@ zval * bdict::to_array(const bool include_meta) const {
287285
char *_type_data = estrdup("bdict");
288286
char *_length = estrdup("_length");
289287
char *_data = estrdup("_data");
290-
zval _zv_outer;
291-
zval *zv_outer = &_zv_outer;
288+
zval *zv_outer = new zval();
292289
array_init(zv_outer);
293290
add_assoc_string(zv_outer, _type, _type_data);
294291
add_assoc_long(zv_outer, _length, length());
@@ -311,8 +308,7 @@ zval * bdict::search(const std::string &needle, const long &mode, const std::str
311308
else
312309
modev = true;
313310

314-
zval _zv;
315-
zval *zv = &_zv;
311+
zval *zv = new zval();
316312
array_init(zv);
317313

318314
for(zend_hash_internal_pointer_reset(_data);

bint.cc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ zval * bint::parse(const std::string &ben, size_t &pt) {
3333
long result = std::stoll(strint);
3434
++pt;
3535

36-
zval _zv;
37-
zval *zv = &_zv;
36+
zval *zv = new zval();
3837
zend_object *zo = zend_container::bint_object_new(zend_container::bint_ce);
3938
ZVAL_OBJ(zv, zo);
4039
bint_object *intern = zend_container::bint_fetch_object(Z_OBJ_P(zv));
@@ -47,8 +46,7 @@ std::string bint::encode() const {
4746
}
4847

4948
zval * bint::to_array(const bool include_meta) const {
50-
zval _zv;
51-
zval *zv = &_zv;
49+
zval *zv = new zval();
5250
if (include_meta) {
5351
array_init(zv);
5452
char *_type = estrdup("_type");

bitem.cc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ zval * bitem::throw_general_exception(const std::string message) {
1212
}
1313

1414
zval * bitem::get_zval_bool(const bool value) {
15-
zval _zv;
16-
zval *zv = &_zv;
15+
zval *zv = new zval();
1716
ZVAL_BOOL(zv, value);
1817
return zv;
1918
}
@@ -90,8 +89,7 @@ zval * bitem::load(const std::string &file_path) {
9089
std::string ben((std::istreambuf_iterator<char>(ben_file)),
9190
(std::istreambuf_iterator<char>()));
9291
ben_file.close();
93-
zval _result = *parse(ben);
94-
zval *result = &_result;
92+
zval *result = parse(ben);
9593
return result;
9694
}
9795

blist.cc

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,7 @@ zval * blist::parse(const std::string &ben, size_t &pt) {
225225
if (ben[pt] != 'l')
226226
return bitem::throw_general_exception("Error parsing blist");
227227
++pt;
228-
zval _zv;
229-
zval *zv = &_zv;
228+
zval *zv = new zval();
230229
zend_object *zo = zend_container::blist_object_new(zend_container::blist_ce);
231230
ZVAL_OBJ(zv, zo);
232231
blist_object *intern = zend_container::blist_fetch_object(Z_OBJ_P(zv));
@@ -275,8 +274,7 @@ std::string blist::encode() const {
275274
}
276275

277276
zval * blist::to_array(const bool include_meta) const {
278-
zval _zv;
279-
zval *zv = &_zv;
277+
zval *zv = new zval();
280278
array_init(zv);
281279

282280
for(zend_hash_internal_pointer_reset(_data);
@@ -308,8 +306,7 @@ zval * blist::to_array(const bool include_meta) const {
308306
char *_type_data = estrdup("blist");
309307
char *_length = estrdup("_length");
310308
char *_data = estrdup("_data");
311-
zval _zv_outer;
312-
zval *zv_outer = &_zv_outer;
309+
zval *zv_outer = new zval();
313310
array_init(zv_outer);
314311
add_assoc_string(zv_outer, _type, _type_data);
315312
add_assoc_long(zv_outer, _length, length());
@@ -332,8 +329,7 @@ zval * blist::search(const std::string &needle, const long &mode, const std::str
332329
else
333330
modev = true;
334331

335-
zval _zv;
336-
zval *zv = &_zv;
332+
zval *zv = new zval();
337333
array_init(zv);
338334

339335
for(zend_hash_internal_pointer_reset(_data);

bstr.cc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ zval * bstr::parse(const std::string &ben, size_t &pt) {
3131
std::string len = ben.substr(start, pt - start);
3232
++pt;
3333

34-
zval _zv;
35-
zval *zv = &_zv;
34+
zval *zv = new zval();
3635
zend_object *zo = zend_container::bstr_object_new(zend_container::bstr_ce);
3736
ZVAL_OBJ(zv, zo);
3837
bstr_object *intern = zend_container::bstr_fetch_object(Z_OBJ_P(zv));
@@ -46,8 +45,7 @@ std::string bstr::encode() const {
4645
}
4746

4847
zval * bstr::to_array(const bool include_meta) const {
49-
zval _zv;
50-
zval *zv = &_zv;
48+
zval *zv = new zval();
5149
if (include_meta) {
5250
array_init(zv);
5351
if (_value.length() == 0) return zv;

0 commit comments

Comments
 (0)