update it

This commit is contained in:
Sukchan Lee 2017-03-15 20:14:43 +09:00
parent b0497920bf
commit a18612e186
2 changed files with 11 additions and 11 deletions

View file

@ -49,7 +49,7 @@ extern tlv_desc_t tlv_desc_more7;
extern tlv_desc_t tlv_desc_more8;
typedef struct _tlv_header_t {
c_uint64_t present;
c_uint64_t presence;
} tlv_header_t;
/* 8-bit Unsigned integer */
@ -115,7 +115,7 @@ typedef struct _tlv_null {
#define tlv_get_value(__tlv) (__tlv).v
#define tlv_set_value(__m, __value) \
__m.v = __value; __m.h.present = 1
__m.v = __value; __m.h.presence = 1
#define tlv_copy_value(__t_tlv, __s_tlv) \
(__t_tlv).h = (__s_tlv).h; (__t_tlv).v = (__s_tlv).v
@ -124,15 +124,15 @@ typedef struct _tlv_null {
__value = (__tlv).v; __length = (__tlv).l
#define tlv_set_octet(__m, __value, __length) \
__m.v = __value; __m.l = __length; __m.h.present = 1
__m.v = __value; __m.l = __length; __m.h.presence = 1
#define tlv_copy_octet(__t_tlv, __s_tlv) \
(__t_tlv).h = (__s_tlv).h; (__t_tlv).v = (__s_tlv).v; \
(__t_tlv).l = (__s_tlv).l
#define tlv_set_present(__m) __m.h.present = 1
#define tlv_unset_present(__m) __m.h.present = 0
#define tlv_is_present(__m) __m.h.present
#define tlv_set_present(__m) __m.h.presence = 1
#define tlv_unset_present(__m) __m.h.presence = 0
#define tlv_is_present(__m) __m.h.presence
CORE_DECLARE(status_t) tlv_build_msg(
pkbuf_t **pkbuf, tlv_desc_t *desc, void *msg, int mode);

View file

@ -173,7 +173,7 @@ static c_uint32_t _tlv_add_compound(tlv_t **root, tlv_t *parent_tlv,
{
h = (tlv_header_t *)(p + offset2);
if (h->present == 0)
if (h->presence == 0)
break;
if (desc->ctype == TLV_COMPOUND)
@ -218,7 +218,7 @@ static c_uint32_t _tlv_add_compound(tlv_t **root, tlv_t *parent_tlv,
{
h = (tlv_header_t *)(p + offset);
if (h->present)
if (h->presence)
{
if (desc->ctype == TLV_COMPOUND)
{
@ -490,7 +490,7 @@ static status_t _tlv_parse_compound(void *msg, tlv_desc_t *parent_desc,
for (j = 0; j < next_desc->length; j++)
{
h = (tlv_header_t *)(p + offset + desc->vsize * j);
if (h->present == 0)
if (h->presence == 0)
{
offset += desc->vsize * j;
break;
@ -527,7 +527,7 @@ static status_t _tlv_parse_compound(void *msg, tlv_desc_t *parent_desc,
return CORE_ERROR;
}
h->present = 1;
h->presence = 1;
}
else
{
@ -543,7 +543,7 @@ static status_t _tlv_parse_compound(void *msg, tlv_desc_t *parent_desc,
return CORE_ERROR;
}
h->present = 1;
h->presence = 1;
}
tlv = tlv->next;