diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/netlink-local.h | 18 | ||||
| -rw-r--r-- | include/netlink/types.h | 17 | ||||
| -rw-r--r-- | include/netlink/utils.h | 4 |
3 files changed, 21 insertions, 18 deletions
diff --git a/include/netlink-local.h b/include/netlink-local.h index f3b971a..10619ac 100644 --- a/include/netlink-local.h +++ b/include/netlink-local.h @@ -119,7 +119,7 @@ static inline int __assert_error(const char *file, int line, char *func, #define nl_errno(E) nl_error(E, NULL) /* backwards compat */ -#define dp_new_line(params, line) nl_new_line(params, line) +#define dp_new_line(params, line) nl_new_line(params) #define dp_dump(params, fmt, arg...) nl_dump(params, fmt, ##arg) static inline int __trans_list_add(int i, const char *a, @@ -284,17 +284,7 @@ static inline void __dp_dump(struct nl_dump_params *parms, const char *fmt, } } -static inline void dp_dump_line(struct nl_dump_params *parms, int line, - const char *fmt, ...) -{ - va_list args; - - nl_new_line(parms, line); - - va_start(args, fmt); - __dp_dump(parms, fmt, args); - va_end(args); -} +#define dp_dump_line(params, line, fmt, arg...) nl_dump_line(params, fmt, ##arg) static inline void dump_from_ops(struct nl_object *obj, struct nl_dump_params *params) @@ -304,6 +294,8 @@ static inline void dump_from_ops(struct nl_object *obj, if (type < 0 || type > NL_DUMP_MAX) BUG(); + params->dp_line = 0; + if (params->dp_dump_msgtype) { #if 0 /* XXX */ @@ -317,7 +309,7 @@ static inline void dump_from_ops(struct nl_object *obj, #endif params->dp_pre_dump = 1; } else - dp_new_line(params, 0); + nl_new_line(params); if (obj->ce_ops->oo_dump[type]) obj->ce_ops->oo_dump[type](obj, params); diff --git a/include/netlink/types.h b/include/netlink/types.h index 903028e..04209b6 100644 --- a/include/netlink/types.h +++ b/include/netlink/types.h @@ -19,16 +19,19 @@ * @ingroup utils */ enum nl_dump_type { - NL_DUMP_BRIEF, /**< Dump object in a brief one-liner */ - NL_DUMP_FULL, /**< Dump all attributes but no statistics */ + NL_DUMP_ONELINE, /**< Dump object briefly on one line */ + NL_DUMP_DETAILS, /**< Dump all attributes but no statistics */ NL_DUMP_STATS, /**< Dump all attributes including statistics */ NL_DUMP_XML, /**< Dump all attribtes in XML format */ NL_DUMP_ENV, /**< Dump all attribtues as env variables */ - NL_DUMP_EVENTS, /**< Dump event */ __NL_DUMP_MAX, }; #define NL_DUMP_MAX (__NL_DUMP_MAX - 1) +/* backards compat */ +#define NL_DUMP_BRIEF NL_DUMP_ONELINE +#define NL_DUMP_FULL NL_DUMP_DETAILS + /** * Dumping parameters * @ingroup utils @@ -100,6 +103,14 @@ struct nl_dump_params * Set if a dump was performed prior to the actual dump handler. */ int dp_pre_dump; + + /** + * PRIVATE + * Owned by the current caller + */ + int dp_ivar; + + unsigned int dp_line; }; #endif diff --git a/include/netlink/utils.h b/include/netlink/utils.h index 0351d38..207e8ec 100644 --- a/include/netlink/utils.h +++ b/include/netlink/utils.h @@ -70,9 +70,9 @@ extern char * nl_ip_proto2str(int, char *, size_t); extern int nl_str2ip_proto(const char *); /* Dumping helpers */ -extern void nl_new_line(struct nl_dump_params *, int); +extern void nl_new_line(struct nl_dump_params *); extern void nl_dump(struct nl_dump_params *, const char *, ...); -extern void nl_dump_line(struct nl_dump_params *, int, const char *, ...); +extern void nl_dump_line(struct nl_dump_params *, const char *, ...); #ifdef __cplusplus } |