Rename some internal functions to have unique names
This commit is contained in:
@@ -478,7 +478,7 @@ static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_t
|
|||||||
|
|
||||||
/* Default handler for extension fields. Expects a pb_field_t structure
|
/* Default handler for extension fields. Expects a pb_field_t structure
|
||||||
* in extension->type->arg. */
|
* in extension->type->arg. */
|
||||||
static bool checkreturn default_extension_handler(pb_istream_t *stream,
|
static bool checkreturn default_extension_decoder(pb_istream_t *stream,
|
||||||
pb_extension_t *extension, uint32_t tag, pb_wire_type_t wire_type)
|
pb_extension_t *extension, uint32_t tag, pb_wire_type_t wire_type)
|
||||||
{
|
{
|
||||||
const pb_field_t *field = (const pb_field_t*)extension->type->arg;
|
const pb_field_t *field = (const pb_field_t*)extension->type->arg;
|
||||||
@@ -513,7 +513,7 @@ static bool checkreturn decode_extension(pb_istream_t *stream,
|
|||||||
if (extension->type->decode)
|
if (extension->type->decode)
|
||||||
status = extension->type->decode(stream, extension, tag, wire_type);
|
status = extension->type->decode(stream, extension, tag, wire_type);
|
||||||
else
|
else
|
||||||
status = default_extension_handler(stream, extension, tag, wire_type);
|
status = default_extension_decoder(stream, extension, tag, wire_type);
|
||||||
|
|
||||||
if (!status)
|
if (!status)
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -245,7 +245,7 @@ static bool checkreturn encode_field(pb_ostream_t *stream,
|
|||||||
|
|
||||||
/* Default handler for extension fields. Expects to have a pb_field_t
|
/* Default handler for extension fields. Expects to have a pb_field_t
|
||||||
* pointer in the extension->type->arg field. */
|
* pointer in the extension->type->arg field. */
|
||||||
static bool checkreturn default_extension_handler(pb_ostream_t *stream,
|
static bool checkreturn default_extension_encoder(pb_ostream_t *stream,
|
||||||
const pb_extension_t *extension)
|
const pb_extension_t *extension)
|
||||||
{
|
{
|
||||||
const pb_field_t *field = (const pb_field_t*)extension->type->arg;
|
const pb_field_t *field = (const pb_field_t*)extension->type->arg;
|
||||||
@@ -266,7 +266,7 @@ static bool checkreturn encode_extension_field(pb_ostream_t *stream,
|
|||||||
if (extension->type->encode)
|
if (extension->type->encode)
|
||||||
status = extension->type->encode(stream, extension);
|
status = extension->type->encode(stream, extension);
|
||||||
else
|
else
|
||||||
status = default_extension_handler(stream, extension);
|
status = default_extension_encoder(stream, extension);
|
||||||
|
|
||||||
if (!status)
|
if (!status)
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
Reference in New Issue
Block a user