From 6e67cb48ef6b4fceee29e5c1cce3d7939c10b02f Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Mon, 2 Mar 2009 11:00:43 -0800 Subject: Fixed bugs that lint caught. --- pbstream.c | 4 ++-- pbstruct.h | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pbstream.c b/pbstream.c index 23cff1d..443ba6c 100644 --- a/pbstream.c +++ b/pbstream.c @@ -20,7 +20,7 @@ #endif #define CHECK(func) do { \ - pbstream_wire_type_t status = func; \ + pbstream_status_t status = func; \ if(status != PBSTREAM_STATUS_OK) return status; \ } while (0) @@ -235,7 +235,7 @@ pbstream_status_t parse_tag(uint8_t **buf, struct pbstream_tag *tag) { uint32_t tag_int; CHECK(get_v_uint32_t(buf, &tag_int)); - tag->wire_type = tag_int & 0x07; + tag->wire_type = (pbstream_wire_type_t)(tag_int & 0x07); tag->field_number = tag_int >> 3; return PBSTREAM_STATUS_OK; } diff --git a/pbstruct.h b/pbstruct.h index 9b12ce3..be6222d 100644 --- a/pbstruct.h +++ b/pbstruct.h @@ -71,30 +71,30 @@ struct pbstruct* pbstruct_new(struct pbstruct_definition *definition); /* Deletes any sub-structs also. */ struct pbstruct* pbstruct_delete(struct pbstruct_definition *definition); -bool pbstruct_is_set(struct pbstruct *s, struct pbstruct_field *f) { +inline bool pbstruct_is_set(struct pbstruct *s, struct pbstruct_field *f) { return s->data[f->isset_byte_offset] & f->isset_byte_mask; } /* These do no existence checks or type checks. */ #define DEFINE_GETTERS(ctype, name) \ - ctype pbstruct_get_ ## name(struct pbstruct *s, struct pbstruct_field *f) { \ + inline ctype pbstruct_get_ ## name(struct pbstruct *s, struct pbstruct_field *f) { \ /* TODO: make sure the compiler knows this is an aligned access. */ \ return *(ctype*)(s->data + f->byte_offset); \ } \ - ctype *pbstruct_get_ ## name ## _array(struct pbstruct *s, \ + inline ctype *pbstruct_get_ ## name ## _array(struct pbstruct *s, \ struct pbstruct_field *f) { \ /* TODO: make sure the compiler knows this is an aligned access. */ \ return *(ctype**)(s->data + f->byte_offset); \ } -DEFINE_GETTERS(double, double); -DEFINE_GETTERS(float, float); -DEFINE_GETTERS(int32_t, int32); -DEFINE_GETTERS(int64_t, int64); -DEFINE_GETTERS(uint32_t, uint32); -DEFINE_GETTERS(uint64_t, uint64); -DEFINE_GETTERS(bool, bool); -DEFINE_GETTERS(struct pbstruct_delimited*, bytes); -DEFINE_GETTERS(struct pbstruct_delimited*, string); -DEFINE_GETTERS(struct pbstruct*, substruct); +DEFINE_GETTERS(double, double) +DEFINE_GETTERS(float, float) +DEFINE_GETTERS(int32_t, int32) +DEFINE_GETTERS(int64_t, int64) +DEFINE_GETTERS(uint32_t, uint32) +DEFINE_GETTERS(uint64_t, uint64) +DEFINE_GETTERS(bool, bool) +DEFINE_GETTERS(struct pbstruct_delimited*, bytes) +DEFINE_GETTERS(struct pbstruct_delimited*, string) +DEFINE_GETTERS(struct pbstruct*, substruct) -- cgit v1.2.3