Skip to content

Commit 7be328a

Browse files
chobiechobie
committed
fixed typo
1 parent 2553701 commit 7be328a

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

‎core.c‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ static int single_property_name_default_len = sizeof("_properties");
1111
static char *unknown_property_name_default = "_unknown";
1212
static int unknown_property_name_default_len = sizeof("_unknown");
1313

14-
const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, const char *data, const char *data_end, php_protocolbuffers_scheme_container *container, int native_scalar, zval **result);
14+
const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, const char *data, const char *data_end, php_protocolbuffers_scheme_container *container, int native_scalars, zval **result);
1515

1616
int php_protocolbuffers_read_protected_property(zval *instance, char *name, size_t name_len, zval **result TSRMLS_DC)
1717
{
@@ -255,14 +255,14 @@ void php_protocolbuffers_process_unknown_field_bytes(INTERNAL_FUNCTION_PARAMETER
255255
}
256256
}
257257

258-
void php_protocolbuffers_format_string(zval *result, pbf *payload, int native_scalar TSRMLS_DC)
258+
void php_protocolbuffers_format_string(zval *result, pbf *payload, int native_scalars TSRMLS_DC)
259259
{
260260
char __buffer[64] = {0};
261261
char *buffer = __buffer;
262262
int free = 0;
263263
size_t size = 0;
264264

265-
if (native_scalar == 1) {
265+
if (native_scalars == 1) {
266266
switch (payload->type) {
267267
case TYPE_SINT32:
268268
case TYPE_INT32:
@@ -355,7 +355,7 @@ void php_protocolbuffers_format_string(zval *result, pbf *payload, int native_sc
355355
}
356356
}
357357

358-
const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, const char *data, const char *data_end, php_protocolbuffers_scheme_container *container, int native_scalar, zval **result)
358+
const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, const char *data, const char *data_end, php_protocolbuffers_scheme_container *container, int native_scalars, zval **result)
359359
{
360360
uint32_t payload = 0, tag = 0, wiretype = 0;
361361
uint64_t value = 0;
@@ -410,13 +410,13 @@ const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, con
410410
case WIRETYPE_VARINT:
411411
{
412412
data = ReadVarint64FromArray(data, &value, data_end);
413-
if (!php_protocolbuffers_process_varint(INTERNAL_FUNCTION_PARAM_PASSTHRU, wiretype, tag, container, s, value, hresult, native_scalar)) {
413+
if (!php_protocolbuffers_process_varint(INTERNAL_FUNCTION_PARAM_PASSTHRU, wiretype, tag, container, s, value, hresult, native_scalars)) {
414414
return NULL;
415415
}
416416
}
417417
break;
418418
case WIRETYPE_FIXED64:
419-
if (!php_protocolbuffers_process_fixed64(INTERNAL_FUNCTION_PARAM_PASSTHRU, wiretype, tag, container, s, data, hresult, native_scalar)) {
419+
if (!php_protocolbuffers_process_fixed64(INTERNAL_FUNCTION_PARAM_PASSTHRU, wiretype, tag, container, s, data, hresult, native_scalars)) {
420420
return NULL;
421421
}
422422
data += 8;
@@ -491,7 +491,7 @@ const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, con
491491
}
492492
}
493493

494-
php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAM_PASSTHRU, data, n_buffer_end, c_container, PBG(native_scalar), &z_obj);
494+
php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAM_PASSTHRU, data, n_buffer_end, c_container, PBG(native_scalars), &z_obj);
495495

496496
if (c_container->use_wakeup_and_sleep > 0) {
497497
php_protocolbuffers_execute_wakeup(z_obj, c_container TSRMLS_CC);
@@ -540,7 +540,7 @@ const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, con
540540
MAKE_STD_ZVAL(dz);
541541

542542
__payload.type = TYPE_DOUBLE;__payload.value.d = d;
543-
php_protocolbuffers_format_string(dz, &__payload, native_scalar TSRMLS_CC);
543+
php_protocolbuffers_format_string(dz, &__payload, native_scalars TSRMLS_CC);
544544
php_protocolbuffers_decode_add_value_and_consider_repeated(container, s, hresult, dz TSRMLS_CC);
545545

546546
data += 8;
@@ -557,7 +557,7 @@ const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, con
557557
MAKE_STD_ZVAL(dz);
558558

559559
__payload.type = TYPE_DOUBLE;__payload.value.d = a;
560-
php_protocolbuffers_format_string(dz, &__payload, native_scalar TSRMLS_CC);
560+
php_protocolbuffers_format_string(dz, &__payload, native_scalars TSRMLS_CC);
561561

562562
php_protocolbuffers_decode_add_value_and_consider_repeated(container, s, hresult, dz TSRMLS_CC);
563563

@@ -572,7 +572,7 @@ const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, con
572572
MAKE_STD_ZVAL(dz);
573573

574574
__payload.type = TYPE_INT64;__payload.value.int64 = v2;
575-
php_protocolbuffers_format_string(dz, &__payload, native_scalar TSRMLS_CC);
575+
php_protocolbuffers_format_string(dz, &__payload, native_scalars TSRMLS_CC);
576576

577577
php_protocolbuffers_decode_add_value_and_consider_repeated(container, s, hresult, dz TSRMLS_CC);
578578
}
@@ -585,7 +585,7 @@ const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, con
585585
MAKE_STD_ZVAL(dz);
586586

587587
__payload.type = TYPE_UINT64;__payload.value.uint64 = v2;
588-
php_protocolbuffers_format_string(dz, &__payload, native_scalar TSRMLS_CC);
588+
php_protocolbuffers_format_string(dz, &__payload, native_scalars TSRMLS_CC);
589589

590590
php_protocolbuffers_decode_add_value_and_consider_repeated(container, s, hresult, dz TSRMLS_CC);
591591
}
@@ -597,7 +597,7 @@ const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, con
597597
MAKE_STD_ZVAL(dz);
598598

599599
__payload.type = TYPE_INT32;__payload.value.int32 = (int32_t)payload;
600-
php_protocolbuffers_format_string(dz, &__payload, native_scalar TSRMLS_CC);
600+
php_protocolbuffers_format_string(dz, &__payload, native_scalars TSRMLS_CC);
601601

602602
php_protocolbuffers_decode_add_value_and_consider_repeated(container, s, hresult, dz TSRMLS_CC);
603603
break;
@@ -608,7 +608,7 @@ const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, con
608608

609609
MAKE_STD_ZVAL(dz);
610610
__payload.type = TYPE_UINT64;__payload.value.uint64 = l;
611-
php_protocolbuffers_format_string(dz, &__payload, native_scalar TSRMLS_CC);
611+
php_protocolbuffers_format_string(dz, &__payload, native_scalars TSRMLS_CC);
612612

613613
php_protocolbuffers_decode_add_value_and_consider_repeated(container, s, hresult, dz TSRMLS_CC);
614614
data += 8;
@@ -621,7 +621,7 @@ const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, con
621621

622622
MAKE_STD_ZVAL(dz);
623623
__payload.type = TYPE_UINT32;__payload.value.uint32 = l;
624-
php_protocolbuffers_format_string(dz, &__payload, native_scalar TSRMLS_CC);
624+
php_protocolbuffers_format_string(dz, &__payload, native_scalars TSRMLS_CC);
625625

626626
php_protocolbuffers_decode_add_value_and_consider_repeated(container, s, hresult, dz TSRMLS_CC);
627627

@@ -641,7 +641,7 @@ const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, con
641641

642642
MAKE_STD_ZVAL(dz);
643643
__payload.type = TYPE_UINT32;__payload.value.uint32 = (uint32_t)payload;
644-
php_protocolbuffers_format_string(dz, &__payload, native_scalar TSRMLS_CC);
644+
php_protocolbuffers_format_string(dz, &__payload, native_scalars TSRMLS_CC);
645645

646646
php_protocolbuffers_decode_add_value_and_consider_repeated(container, s, hresult, dz TSRMLS_CC);
647647
break;
@@ -661,7 +661,7 @@ const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, con
661661
MAKE_STD_ZVAL(dz);
662662

663663
__payload.type = TYPE_INT32;__payload.value.int32 = l;
664-
php_protocolbuffers_format_string(dz, &__payload, native_scalar TSRMLS_CC);
664+
php_protocolbuffers_format_string(dz, &__payload, native_scalars TSRMLS_CC);
665665

666666
php_protocolbuffers_decode_add_value_and_consider_repeated(container, s, hresult, dz TSRMLS_CC);
667667
data += 4;
@@ -674,7 +674,7 @@ const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, con
674674

675675
MAKE_STD_ZVAL(dz);
676676
__payload.type = TYPE_INT64;__payload.value.int64 = l;
677-
php_protocolbuffers_format_string(dz, &__payload, native_scalar TSRMLS_CC);
677+
php_protocolbuffers_format_string(dz, &__payload, native_scalars TSRMLS_CC);
678678

679679
php_protocolbuffers_decode_add_value_and_consider_repeated(container, s, hresult, dz TSRMLS_CC);
680680

@@ -686,7 +686,7 @@ const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, con
686686

687687
MAKE_STD_ZVAL(dz);
688688
__payload.type = TYPE_INT32;__payload.value.int32 = (int32_t)zigzag_decode32(payload);
689-
php_protocolbuffers_format_string(dz, &__payload, native_scalar TSRMLS_CC);
689+
php_protocolbuffers_format_string(dz, &__payload, native_scalars TSRMLS_CC);
690690

691691
php_protocolbuffers_decode_add_value_and_consider_repeated(container, s, hresult, dz TSRMLS_CC);
692692
break;
@@ -698,7 +698,7 @@ const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, con
698698
MAKE_STD_ZVAL(dz);
699699

700700
__payload.type = TYPE_SINT64;__payload.value.int64 = (int64_t)zigzag_decode64(v2);
701-
php_protocolbuffers_format_string(dz, &__payload, native_scalar TSRMLS_CC);
701+
php_protocolbuffers_format_string(dz, &__payload, native_scalars TSRMLS_CC);
702702

703703
php_protocolbuffers_decode_add_value_and_consider_repeated(container, s, hresult, dz TSRMLS_CC);
704704
}
@@ -717,7 +717,7 @@ const char* php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAMETERS, con
717717
data += payload;
718718
break;
719719
case WIRETYPE_FIXED32: {
720-
if (!php_protocolbuffers_process_fixed32(INTERNAL_FUNCTION_PARAM_PASSTHRU, wiretype, tag, container, s, data, hresult, native_scalar)) {
720+
if (!php_protocolbuffers_process_fixed32(INTERNAL_FUNCTION_PARAM_PASSTHRU, wiretype, tag, container, s, data, hresult, native_scalars)) {
721721
return NULL;
722722
}
723723
data += 4;
@@ -857,7 +857,7 @@ int php_protocolbuffers_decode(INTERNAL_FUNCTION_PARAMETERS, const char *data, i
857857
efree(unknown_name);
858858
}
859859

860-
res = php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAM_PASSTHRU, data, data_end, container, PBG(native_scalar), &obj);
860+
res = php_protocolbuffers_decode_message(INTERNAL_FUNCTION_PARAM_PASSTHRU, data, data_end, container, PBG(native_scalars), &obj);
861861
if (res == NULL) {
862862
if (obj != NULL) {
863863
zval_ptr_dtor(&obj);

‎php_protocolbuffers.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ ZEND_BEGIN_MODULE_GLOBALS(protocolbuffers)
9191
zval *extension_registry;
9292
long strict_mode;
9393
int validate_string;
94-
int native_scalar;
94+
int native_scalars;
9595
ZEND_END_MODULE_GLOBALS(protocolbuffers)
9696

9797
ZEND_EXTERN_MODULE_GLOBALS(protocolbuffers)

‎protocolbuffers.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ PHP_MINFO_FUNCTION(protocolbuffers)
280280
PHP_INI_BEGIN()
281281
STD_PHP_INI_BOOLEAN("protocolbuffers.strict_mode", "1", PHP_INI_ALL, OnUpdateLong, strict_mode, zend_protocolbuffers_globals, protocolbuffers_globals)
282282
STD_PHP_INI_BOOLEAN("protocolbuffers.validate_string", "1", PHP_INI_ALL, OnUpdateLong, validate_string, zend_protocolbuffers_globals, protocolbuffers_globals)
283-
STD_PHP_INI_BOOLEAN("protocolbuffers.native_scalar", "0", PHP_INI_ALL, OnUpdateLong, native_scalar, zend_protocolbuffers_globals, protocolbuffers_globals)
283+
STD_PHP_INI_BOOLEAN("protocolbuffers.native_scalars", "0", PHP_INI_ALL, OnUpdateLong, native_scalars, zend_protocolbuffers_globals, protocolbuffers_globals)
284284
PHP_INI_END()
285285

286286
static PHP_GINIT_FUNCTION(protocolbuffers)
@@ -322,7 +322,7 @@ PHP_RINIT_FUNCTION(protocolbuffers)
322322
zend_hash_init(PBG(classes), 0, NULL, NULL, 0);
323323
}
324324
PBG(validate_string) = 1;
325-
PBG(native_scalar) = 0;
325+
PBG(native_scalars) = 0;
326326

327327
return SUCCESS;
328328
}

‎unknown_field.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -330,47 +330,47 @@ PHP_METHOD(protocolbuffers_unknown_field, getType)
330330
*/
331331
PHP_METHOD(protocolbuffers_unknown_field, getAsVarintList)
332332
{
333-
php_protocolbuffers_unknown_field_get_as(INTERNAL_FUNCTION_PARAM_PASSTHRU, WIRETYPE_VARINT, -1, PBG(native_scalar));
333+
php_protocolbuffers_unknown_field_get_as(INTERNAL_FUNCTION_PARAM_PASSTHRU, WIRETYPE_VARINT, -1, PBG(native_scalars));
334334
}
335335
/* }}} */
336336

337337
/* {{{ proto string ProtocolBuffersUnknownField::getAsLengthDelimitedList()
338338
*/
339339
PHP_METHOD(protocolbuffers_unknown_field, getAsLengthDelimitedList)
340340
{
341-
php_protocolbuffers_unknown_field_get_as(INTERNAL_FUNCTION_PARAM_PASSTHRU, WIRETYPE_LENGTH_DELIMITED, -1, PBG(native_scalar));
341+
php_protocolbuffers_unknown_field_get_as(INTERNAL_FUNCTION_PARAM_PASSTHRU, WIRETYPE_LENGTH_DELIMITED, -1, PBG(native_scalars));
342342
}
343343
/* }}} */
344344

345345
/* {{{ proto long ProtocolBuffersUnknownField::getAsFixed32List()
346346
*/
347347
PHP_METHOD(protocolbuffers_unknown_field, getAsFixed32List)
348348
{
349-
php_protocolbuffers_unknown_field_get_as(INTERNAL_FUNCTION_PARAM_PASSTHRU, WIRETYPE_FIXED32, -1, PBG(native_scalar));
349+
php_protocolbuffers_unknown_field_get_as(INTERNAL_FUNCTION_PARAM_PASSTHRU, WIRETYPE_FIXED32, -1, PBG(native_scalars));
350350
}
351351
/* }}} */
352352

353353
/* {{{ proto long ProtocolBuffersUnknownField::getAsFixed64List()
354354
*/
355355
PHP_METHOD(protocolbuffers_unknown_field, getAsFixed64List)
356356
{
357-
php_protocolbuffers_unknown_field_get_as(INTERNAL_FUNCTION_PARAM_PASSTHRU, WIRETYPE_FIXED64, -1, PBG(native_scalar));
357+
php_protocolbuffers_unknown_field_get_as(INTERNAL_FUNCTION_PARAM_PASSTHRU, WIRETYPE_FIXED64, -1, PBG(native_scalars));
358358
}
359359
/* }}} */
360360

361361
/* {{{ proto long ProtocolBuffersUnknownField::getAsFloatList()
362362
*/
363363
PHP_METHOD(protocolbuffers_unknown_field, getAsFloatList)
364364
{
365-
php_protocolbuffers_unknown_field_get_as(INTERNAL_FUNCTION_PARAM_PASSTHRU, WIRETYPE_FIXED32, TYPE_FLOAT, PBG(native_scalar));
365+
php_protocolbuffers_unknown_field_get_as(INTERNAL_FUNCTION_PARAM_PASSTHRU, WIRETYPE_FIXED32, TYPE_FLOAT, PBG(native_scalars));
366366
}
367367
/* }}} */
368368

369369
/* {{{ proto long ProtocolBuffersUnknownField::getAsDoubleList()
370370
*/
371371
PHP_METHOD(protocolbuffers_unknown_field, getAsDoubleList)
372372
{
373-
php_protocolbuffers_unknown_field_get_as(INTERNAL_FUNCTION_PARAM_PASSTHRU, WIRETYPE_FIXED64, TYPE_DOUBLE, PBG(native_scalar));
373+
php_protocolbuffers_unknown_field_get_as(INTERNAL_FUNCTION_PARAM_PASSTHRU, WIRETYPE_FIXED64, TYPE_DOUBLE, PBG(native_scalars));
374374
}
375375
/* }}} */
376376

0 commit comments

Comments
 (0)