From: Alexandru Ardelean Date: Tue, 31 Mar 2015 09:25:06 +0000 (+0300) Subject: lib/atom-private.c: move 'struct atom-builder' to private.h X-Git-Tag: 0.7.15~47^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9bec20443e7eb301b204308d1a11fe4b3e7c5bba;p=thirdparty%2Flldpd.git lib/atom-private.c: move 'struct atom-builder' to private.h Move this here, before splitting lib/atom-private.c. Signed-off-by: Alexandru Ardelean --- diff --git a/src/lib/atom-private.c b/src/lib/atom-private.c index 70c7d1ee..976d262b 100644 --- a/src/lib/atom-private.c +++ b/src/lib/atom-private.c @@ -2577,28 +2577,6 @@ _lldpctl_atom_set_str_med_power(lldpctl_atom_t *atom, lldpctl_key_t key, } #endif -struct atom_builder { - atom_t type; /* Atom type */ - size_t size; /* Size of structure to allocate */ - int (*init)(lldpctl_atom_t *, va_list); /* Optional additional init steps */ - void (*free)(lldpctl_atom_t *); /* Optional deallocation steps */ - - lldpctl_atom_iter_t* (*iter)(lldpctl_atom_t *); /* Optional, return an iterator for this object */ - lldpctl_atom_iter_t* (*next)(lldpctl_atom_t *, lldpctl_atom_iter_t *); /* Return the next object for the provided iterator */ - lldpctl_atom_t* (*value)(lldpctl_atom_t *, lldpctl_atom_iter_t *); /* Return the current object for the provided iterator */ - - lldpctl_atom_t* (*get)(lldpctl_atom_t *, lldpctl_key_t); - const char* (*get_str)(lldpctl_atom_t *, lldpctl_key_t); - const u_int8_t* (*get_buffer)(lldpctl_atom_t *, lldpctl_key_t, size_t *); - long int (*get_int)(lldpctl_atom_t *, lldpctl_key_t); - - lldpctl_atom_t* (*set)(lldpctl_atom_t *, lldpctl_key_t, lldpctl_atom_t *); - lldpctl_atom_t* (*set_str)(lldpctl_atom_t *, lldpctl_key_t, const char *); - lldpctl_atom_t* (*set_buffer)(lldpctl_atom_t *, lldpctl_key_t, const u_int8_t *, size_t); - lldpctl_atom_t* (*set_int)(lldpctl_atom_t *, lldpctl_key_t, long int); - lldpctl_atom_t* (*create)(lldpctl_atom_t *); -}; - struct atom_builder builders[] = { { atom_config, sizeof(struct _lldpctl_atom_config_t), .init = _lldpctl_atom_new_config, diff --git a/src/lib/private.h b/src/lib/private.h index 370aa915..1d691c5f 100644 --- a/src/lib/private.h +++ b/src/lib/private.h @@ -249,3 +249,25 @@ struct _lldpctl_atom_med_power_t { #endif struct lldpctl_atom_t *_lldpctl_new_atom(lldpctl_conn_t *conn, atom_t type, ...); + +struct atom_builder { + atom_t type; /* Atom type */ + size_t size; /* Size of structure to allocate */ + int (*init)(lldpctl_atom_t *, va_list); /* Optional additional init steps */ + void (*free)(lldpctl_atom_t *); /* Optional deallocation steps */ + + lldpctl_atom_iter_t* (*iter)(lldpctl_atom_t *); /* Optional, return an iterator for this object */ + lldpctl_atom_iter_t* (*next)(lldpctl_atom_t *, lldpctl_atom_iter_t *); /* Return the next object for the provided iterator */ + lldpctl_atom_t* (*value)(lldpctl_atom_t *, lldpctl_atom_iter_t *); /* Return the current object for the provided iterator */ + + lldpctl_atom_t* (*get)(lldpctl_atom_t *, lldpctl_key_t); + const char* (*get_str)(lldpctl_atom_t *, lldpctl_key_t); + const u_int8_t* (*get_buffer)(lldpctl_atom_t *, lldpctl_key_t, size_t *); + long int (*get_int)(lldpctl_atom_t *, lldpctl_key_t); + + lldpctl_atom_t* (*set)(lldpctl_atom_t *, lldpctl_key_t, lldpctl_atom_t *); + lldpctl_atom_t* (*set_str)(lldpctl_atom_t *, lldpctl_key_t, const char *); + lldpctl_atom_t* (*set_buffer)(lldpctl_atom_t *, lldpctl_key_t, const u_int8_t *, size_t); + lldpctl_atom_t* (*set_int)(lldpctl_atom_t *, lldpctl_key_t, long int); + lldpctl_atom_t* (*create)(lldpctl_atom_t *); +};