interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #189 from wtoorop/devel/codebase-maintenance 

s/inline static/static inline/g

Small change and "static inline" is the only portable (C99) construct
This commit is contained in:
wtoorop 2016-06-28 11:49:14 +02:00 committed by GitHub
parent b56fbbb604 734a6625c4
commit 771a7dd43c
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dict.h
View File

@ -61,7 +61,7 @@ struct getdns_dict
struct mem_funcs mf; struct mem_funcs mf;
}; };
inline static getdns_dict *_getdns_dict_create_with_mf(struct mem_funcs *mf) static inline getdns_dict *_getdns_dict_create_with_mf(struct mem_funcs *mf)
{ return getdns_dict_create_with_extended_memory_functions( { return getdns_dict_create_with_extended_memory_functions(
mf->mf_arg, mf->mf.ext.malloc, mf->mf.ext.realloc, mf->mf.ext.free); } mf->mf_arg, mf->mf.ext.malloc, mf->mf.ext.realloc, mf->mf.ext.free); }

20
src/dnssec.c
View File

@ -217,7 +217,7 @@
/******************* Frequently Used Utility Functions ********************* /******************* Frequently Used Utility Functions *********************
*****************************************************************************/ *****************************************************************************/
inline static size_t _dname_len(const uint8_t *name) static inline size_t _dname_len(const uint8_t *name)
{ {
const uint8_t *p; const uint8_t *p;
for (p = name; *p; p += *p + 1) for (p = name; *p; p += *p + 1)
@ -226,7 +226,7 @@ inline static size_t _dname_len(const uint8_t *name)
return p - name + 1; return p - name + 1;
} }
inline static size_t _dname_label_count(const uint8_t *name) static inline size_t _dname_label_count(const uint8_t *name)
{ {
size_t c; size_t c;
for (c = 0; *name; name += *name + 1, c++) for (c = 0; *name; name += *name + 1, c++)
@ -235,7 +235,7 @@ inline static size_t _dname_label_count(const uint8_t *name)
return c; return c;
} }
inline static int _dname_equal(const uint8_t *left, const uint8_t *right) static inline int _dname_equal(const uint8_t *left, const uint8_t *right)
{ {
return _getdns_dname_equal(left, right); return _getdns_dname_equal(left, right);
} }
@ -382,7 +382,7 @@ static int bitmap_has_type(_getdns_rdf_iter *bitmap, uint16_t rr_type)
} }
#if defined(SEC_DEBUG) && SEC_DEBUG #if defined(SEC_DEBUG) && SEC_DEBUG
inline static void debug_sec_print_rr(const char *msg, _getdns_rr_iter *rr) static inline void debug_sec_print_rr(const char *msg, _getdns_rr_iter *rr)
{ {
char str_spc[8192], *str = str_spc; char str_spc[8192], *str = str_spc;
size_t str_len = sizeof(str_spc); size_t str_len = sizeof(str_spc);
@ -398,7 +398,7 @@ inline static void debug_sec_print_rr(const char *msg, _getdns_rr_iter *rr)
(UNCONST_UINT8_p) rr->pkt, rr->pkt_end - rr->pkt); (UNCONST_UINT8_p) rr->pkt, rr->pkt_end - rr->pkt);
DEBUG_SEC("%s%s", msg, str_spc); DEBUG_SEC("%s%s", msg, str_spc);
} }
inline static void debug_sec_print_dname(const char *msg, const uint8_t *label) static inline void debug_sec_print_dname(const char *msg, const uint8_t *label)
{ {
char str[1024]; char str[1024];
@ -1232,7 +1232,7 @@ typedef struct canon_rdata_iter {
size_t len; size_t len;
} canon_rdata_iter; } canon_rdata_iter;
inline static void canon_rdata_iter_field_init(canon_rdata_iter *i) static inline void canon_rdata_iter_field_init(canon_rdata_iter *i)
{ {
for (;;) { for (;;) {
if ((i->rdf->rdd_pos->type & GETDNS_RDF_N) == GETDNS_RDF_N) { if ((i->rdf->rdd_pos->type & GETDNS_RDF_N) == GETDNS_RDF_N) {
@ -1251,23 +1251,23 @@ inline static void canon_rdata_iter_field_init(canon_rdata_iter *i)
} }
} }
inline static void canon_rdata_iter_init(canon_rdata_iter*i,_getdns_rr_iter*rr) static inline void canon_rdata_iter_init(canon_rdata_iter*i,_getdns_rr_iter*rr)
{ {
if ((i->rdf = _getdns_rdf_iter_init(&i->rdf_spc, rr))) if ((i->rdf = _getdns_rdf_iter_init(&i->rdf_spc, rr)))
canon_rdata_iter_field_init(i); canon_rdata_iter_field_init(i);
} }
inline static int canon_rdata_iter_data(canon_rdata_iter *i) static inline int canon_rdata_iter_data(canon_rdata_iter *i)
{ {
return i->rdf != NULL; return i->rdf != NULL;
} }
inline static uint8_t canon_rdata_iter_byte(canon_rdata_iter *i) static inline uint8_t canon_rdata_iter_byte(canon_rdata_iter *i)
{ {
return *i->pos; return *i->pos;
} }
inline static void canon_rdata_iter_next(canon_rdata_iter *i) static inline void canon_rdata_iter_next(canon_rdata_iter *i)
{ {
if (--i->len == 0 && (i->rdf = _getdns_rdf_iter_next(i->rdf))) if (--i->len == 0 && (i->rdf = _getdns_rdf_iter_next(i->rdf)))
canon_rdata_iter_field_init(i); canon_rdata_iter_field_init(i);

2
src/dnssec.h
View File

@ -49,7 +49,7 @@ void _getdns_get_validation_chain(getdns_dns_req *dns_req);
uint16_t _getdns_parse_ta_file(time_t *ta_mtime, gldns_buffer *gbuf); uint16_t _getdns_parse_ta_file(time_t *ta_mtime, gldns_buffer *gbuf);
inline static int _dnssec_rdata_to_canonicalize(uint16_t rr_type) static inline int _dnssec_rdata_to_canonicalize(uint16_t rr_type)
{ {
return rr_type == GLDNS_RR_TYPE_NS || rr_type == GLDNS_RR_TYPE_MD return rr_type == GLDNS_RR_TYPE_NS || rr_type == GLDNS_RR_TYPE_MD
|| rr_type == GLDNS_RR_TYPE_MF || rr_type == GLDNS_RR_TYPE_CNAME || rr_type == GLDNS_RR_TYPE_MF || rr_type == GLDNS_RR_TYPE_CNAME

2
src/list.h
View File

@ -59,7 +59,7 @@ struct getdns_list
struct mem_funcs mf; struct mem_funcs mf;
}; };
inline static getdns_list *_getdns_list_create_with_mf(struct mem_funcs *mf) static inline getdns_list *_getdns_list_create_with_mf(struct mem_funcs *mf)
{ return getdns_list_create_with_extended_memory_functions( { return getdns_list_create_with_extended_memory_functions(
mf->mf_arg, mf->mf.ext.malloc, mf->mf.ext.realloc, mf->mf.ext.free); } mf->mf_arg, mf->mf.ext.malloc, mf->mf.ext.realloc, mf->mf.ext.free); }

2
src/ub_loop.h
View File

@ -69,7 +69,7 @@ typedef struct _getdns_ub_loop {
void _getdns_ub_loop_init(_getdns_ub_loop *loop, struct mem_funcs *mf, getdns_eventloop *extension); void _getdns_ub_loop_init(_getdns_ub_loop *loop, struct mem_funcs *mf, getdns_eventloop *extension);
inline static int _getdns_ub_loop_enabled(_getdns_ub_loop *loop) static inline int _getdns_ub_loop_enabled(_getdns_ub_loop *loop)
{ return loop->super.vmt ? 1 : 0; } { return loop->super.vmt ? 1 : 0; }
#endif /* HAVE_UNBOUND_EVENT_API */ #endif /* HAVE_UNBOUND_EVENT_API */

4
src/util-internal.c
View File

@ -438,7 +438,7 @@ _getdns_rr_iter2rr_dict(struct mem_funcs *mf, _getdns_rr_iter *i)
} }
inline static getdns_dict * static inline getdns_dict *
set_dict(getdns_dict **var, getdns_dict *value) set_dict(getdns_dict **var, getdns_dict *value)
{ {
if (*var) if (*var)
@ -446,7 +446,7 @@ set_dict(getdns_dict **var, getdns_dict *value)
return *var = value; return *var = value;
} }
inline static int has_all_numeric_label(const uint8_t *dname) static inline int has_all_numeric_label(const uint8_t *dname)
{ {
size_t i; size_t i;