From 3b7dc27fb5497903145a52413116fad25fbaf138 Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Tue, 24 Jan 2017 10:00:28 -0800 Subject: Fixed amalgamated build and added test. --- upb/msg.c | 23 ++++++++++------------- upb/upb.c | 6 +++--- 2 files changed, 13 insertions(+), 16 deletions(-) (limited to 'upb') diff --git a/upb/msg.c b/upb/msg.c index 5fa9bc8..39e3035 100644 --- a/upb/msg.c +++ b/upb/msg.c @@ -26,7 +26,7 @@ void *upb_map_pack(const upb_map *map, void *p, size_t *ofs, size_t size); #define CHARPTR_AT(msg, ofs) ((char*)msg + ofs) #define ENCODE_MAX_NESTING 64 -#define CHECK_RETURN(x) if (!(x)) { return false; } +#define CHECK_TRUE(x) if (!(x)) { return false; } /** upb_msgval ****************************************************************/ @@ -492,7 +492,7 @@ struct upb_visitor { upb_sink *sink; }; -static upb_selector_t getsel(const upb_fielddef *f, upb_handlertype_t type) { +static upb_selector_t getsel2(const upb_fielddef *f, upb_handlertype_t type) { upb_selector_t ret; bool ok = upb_handlers_getselector(f, type, &ret); UPB_ASSERT(ok); @@ -572,34 +572,31 @@ static bool upb_visitor_visitmsg2(const upb_msg *msg, } else if (upb_fielddef_isstring(f)) { /* TODO putstr(); */ } else { - upb_selector_t sel = getsel(f, upb_handlers_getprimitivehandlertype(f)); + upb_selector_t sel = getsel2(f, upb_handlers_getprimitivehandlertype(f)); UPB_ASSERT(upb_fielddef_isprimitive(f)); switch (upb_fielddef_type(f)) { case UPB_TYPE_FLOAT: - CHECK_RETURN(upb_sink_putfloat(sink, sel, upb_msgval_getfloat(val))); + CHECK_TRUE(upb_sink_putfloat(sink, sel, upb_msgval_getfloat(val))); break; case UPB_TYPE_DOUBLE: - CHECK_RETURN( - upb_sink_putdouble(sink, sel, upb_msgval_getdouble(val))); + CHECK_TRUE(upb_sink_putdouble(sink, sel, upb_msgval_getdouble(val))); break; case UPB_TYPE_BOOL: - CHECK_RETURN(upb_sink_putbool(sink, sel, upb_msgval_getbool(val))); + CHECK_TRUE(upb_sink_putbool(sink, sel, upb_msgval_getbool(val))); break; case UPB_TYPE_ENUM: case UPB_TYPE_INT32: - CHECK_RETURN(upb_sink_putint32(sink, sel, upb_msgval_getint32(val))); + CHECK_TRUE(upb_sink_putint32(sink, sel, upb_msgval_getint32(val))); break; case UPB_TYPE_UINT32: - CHECK_RETURN( - upb_sink_putuint32(sink, sel, upb_msgval_getuint32(val))); + CHECK_TRUE(upb_sink_putuint32(sink, sel, upb_msgval_getuint32(val))); break; case UPB_TYPE_INT64: - CHECK_RETURN(upb_sink_putint64(sink, sel, upb_msgval_getint64(val))); + CHECK_TRUE(upb_sink_putint64(sink, sel, upb_msgval_getint64(val))); break; case UPB_TYPE_UINT64: - CHECK_RETURN( - upb_sink_putuint64(sink, sel, upb_msgval_getuint64(val))); + CHECK_TRUE(upb_sink_putuint64(sink, sel, upb_msgval_getuint64(val))); break; case UPB_TYPE_STRING: case UPB_TYPE_BYTES: diff --git a/upb/upb.c b/upb/upb.c index c24ac04..97f6c61 100644 --- a/upb/upb.c +++ b/upb/upb.c @@ -104,7 +104,7 @@ upb_alloc upb_alloc_global = {&upb_global_allocfunc}; /* Be conservative and choose 16 in case anyone is using SSE. */ static const size_t maxalign = 16; -static size_t align_up(size_t size) { +static size_t align_up_max(size_t size) { return ((size + maxalign - 1) / maxalign) * maxalign; } @@ -128,7 +128,7 @@ static void upb_arena_addblock(upb_arena *a, void *ptr, size_t size, block->next = a->block_head; block->size = size; - block->used = align_up(sizeof(mem_block)); + block->used = align_up_max(sizeof(mem_block)); block->owned = owned; a->block_head = block; @@ -161,7 +161,7 @@ static void *upb_arena_doalloc(upb_alloc *alloc, void *ptr, size_t oldsize, return NULL; /* We are an arena, don't need individual frees. */ } - size = align_up(size); + size = align_up_max(size); /* TODO(haberman): special-case if this is a realloc of the last alloc? */ -- cgit v1.2.3