From: Petteri Aimonen <jpa@git.mail.kapsi.fi>
Date: Tue, 29 Oct 2013 13:32:51 +0000 (+0200)
Subject: Rename some internal functions to have unique names
X-Git-Tag: 3.99.1~14^2~332
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=cd3af3272d170f4990ef745316faa7600571ef4e;p=apps%2Flow-level-can-service.git

Rename some internal functions to have unique names
---

diff --git a/pb_decode.c b/pb_decode.c
index e3be412..9ad77e9 100644
--- a/pb_decode.c
+++ b/pb_decode.c
@@ -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
  * 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)
 {
     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)
             status = extension->type->decode(stream, extension, tag, wire_type);
         else
-            status = default_extension_handler(stream, extension, tag, wire_type);
+            status = default_extension_decoder(stream, extension, tag, wire_type);
 
         if (!status)
             return false;
diff --git a/pb_encode.c b/pb_encode.c
index 563c1bb..e97d04f 100644
--- a/pb_encode.c
+++ b/pb_encode.c
@@ -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
  * 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_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)
             status = extension->type->encode(stream, extension);
         else
-            status = default_extension_handler(stream, extension);
+            status = default_extension_encoder(stream, extension);
 
         if (!status)
             return false;