Commit a710f617 authored by Pavel Emelyanov's avatar Pavel Emelyanov

pb: Clean pb callback pointers typedefs

Use more classical version with asterisk in type definition
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 656a4637
...@@ -19,17 +19,17 @@ ...@@ -19,17 +19,17 @@
* to match this typedefs. * to match this typedefs.
*/ */
typedef size_t (pb_getpksize_t)(void *obj); typedef size_t (*pb_getpksize_t)(void *obj);
typedef size_t (pb_pack_t)(void *obj, void *where); typedef size_t (*pb_pack_t)(void *obj, void *where);
typedef void *(pb_unpack_t)(void *allocator, size_t size, void *from); typedef void *(*pb_unpack_t)(void *allocator, size_t size, void *from);
extern int pb_read_object_with_header(int fd, void **pobj, extern int pb_read_object_with_header(int fd, void **pobj,
pb_unpack_t *unpack, pb_unpack_t unpack,
bool eof); bool eof);
#define PB_UNPACK_TYPECHECK(__op, __fn) ({ if (0) *__op = __fn(NULL, 0, NULL); (pb_unpack_t *)&__fn; }) #define PB_UNPACK_TYPECHECK(__op, __fn) ({ if (0) *__op = __fn(NULL, 0, NULL); (pb_unpack_t)&__fn; })
#define PB_PACK_TYPECHECK(__o, __fn) ({ if (0) __fn(__o, NULL); (pb_pack_t *)&__fn; }) #define PB_PACK_TYPECHECK(__o, __fn) ({ if (0) __fn(__o, NULL); (pb_pack_t)&__fn; })
#define PB_GPS_TYPECHECK(__o, __fn) ({ if (0) __fn(__o); (pb_getpksize_t *)&__fn; }) #define PB_GPS_TYPECHECK(__o, __fn) ({ if (0) __fn(__o); (pb_getpksize_t)&__fn; })
#define pb_read(__fd, __obj_pptr, __proto_message_name) \ #define pb_read(__fd, __obj_pptr, __proto_message_name) \
pb_read_object_with_header(__fd, (void **)__obj_pptr, \ pb_read_object_with_header(__fd, (void **)__obj_pptr, \
...@@ -40,8 +40,8 @@ extern int pb_read_object_with_header(int fd, void **pobj, ...@@ -40,8 +40,8 @@ extern int pb_read_object_with_header(int fd, void **pobj,
PB_UNPACK_TYPECHECK(__obj_pptr, __proto_message_name ##__unpack), true) PB_UNPACK_TYPECHECK(__obj_pptr, __proto_message_name ##__unpack), true)
extern int pb_write_object_with_header(int fd, void *obj, extern int pb_write_object_with_header(int fd, void *obj,
pb_getpksize_t *getpksize, pb_getpksize_t getpksize,
pb_pack_t *pack); pb_pack_t pack);
#define pb_write(__fd, __obj, __proto_message_name) \ #define pb_write(__fd, __obj, __proto_message_name) \
pb_write_object_with_header(__fd, __obj, \ pb_write_object_with_header(__fd, __obj, \
......
...@@ -153,7 +153,7 @@ void pb_show_msg(const void *msg, const void *msg_desc) ...@@ -153,7 +153,7 @@ void pb_show_msg(const void *msg, const void *msg_desc)
* *
* Don't forget to free memory granted to unpacked object in calling code if needed * Don't forget to free memory granted to unpacked object in calling code if needed
*/ */
int pb_read_object_with_header(int fd, void **pobj, pb_unpack_t *unpack, bool eof) int pb_read_object_with_header(int fd, void **pobj, pb_unpack_t unpack, bool eof)
{ {
u8 local[PB_PKOBJ_LOCAL_SIZE]; u8 local[PB_PKOBJ_LOCAL_SIZE];
void *buf = (void *)&local; void *buf = (void *)&local;
...@@ -215,7 +215,7 @@ err: ...@@ -215,7 +215,7 @@ err:
* 0 on success * 0 on success
* -1 on error * -1 on error
*/ */
int pb_write_object_with_header(int fd, void *obj, pb_getpksize_t *getpksize, pb_pack_t *pack) int pb_write_object_with_header(int fd, void *obj, pb_getpksize_t getpksize, pb_pack_t pack)
{ {
u8 local[PB_PKOBJ_LOCAL_SIZE]; u8 local[PB_PKOBJ_LOCAL_SIZE];
void *buf = (void *)&local; void *buf = (void *)&local;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment