From 9a9c04f861223b459794ab946e45d02fcdadeb91 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 15 Aug 2012 13:24:08 -0400 Subject: SYSDB: Make sysdb_attrs_get_el_int() public Also rename it to sysdb_attrs_get_el_ext() --- src/db/sysdb.c | 14 +++++++------- src/db/sysdb.h | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/db/sysdb.c b/src/db/sysdb.c index 009e49d4e..3793ccbf5 100644 --- a/src/db/sysdb.c +++ b/src/db/sysdb.c @@ -245,8 +245,8 @@ struct sysdb_attrs *sysdb_new_attrs(TALLOC_CTX *memctx) return talloc_zero(memctx, struct sysdb_attrs); } -static int sysdb_attrs_get_el_int(struct sysdb_attrs *attrs, const char *name, - bool alloc, struct ldb_message_element **el) +int sysdb_attrs_get_el_ext(struct sysdb_attrs *attrs, const char *name, + bool alloc, struct ldb_message_element **el) { struct ldb_message_element *e = NULL; int i; @@ -285,7 +285,7 @@ static int sysdb_attrs_get_el_int(struct sysdb_attrs *attrs, const char *name, int sysdb_attrs_get_el(struct sysdb_attrs *attrs, const char *name, struct ldb_message_element **el) { - return sysdb_attrs_get_el_int(attrs, name, true, el); + return sysdb_attrs_get_el_ext(attrs, name, true, el); } int sysdb_attrs_get_string(struct sysdb_attrs *attrs, const char *name, @@ -294,7 +294,7 @@ int sysdb_attrs_get_string(struct sysdb_attrs *attrs, const char *name, struct ldb_message_element *el; int ret; - ret = sysdb_attrs_get_el_int(attrs, name, false, &el); + ret = sysdb_attrs_get_el_ext(attrs, name, false, &el); if (ret) { return ret; } @@ -315,7 +315,7 @@ int sysdb_attrs_get_uint32_t(struct sysdb_attrs *attrs, const char *name, char *endptr; uint32_t val; - ret = sysdb_attrs_get_el_int(attrs, name, false, &el); + ret = sysdb_attrs_get_el_ext(attrs, name, false, &el); if (ret) { return ret; } @@ -339,7 +339,7 @@ errno_t sysdb_attrs_get_bool(struct sysdb_attrs *attrs, const char *name, struct ldb_message_element *el; int ret; - ret = sysdb_attrs_get_el_int(attrs, name, false, &el); + ret = sysdb_attrs_get_el_ext(attrs, name, false, &el); if (ret) { return ret; } @@ -363,7 +363,7 @@ int sysdb_attrs_get_string_array(struct sysdb_attrs *attrs, const char *name, unsigned int u; const char **a; - ret = sysdb_attrs_get_el_int(attrs, name, false, &el); + ret = sysdb_attrs_get_el_ext(attrs, name, false, &el); if (ret) { return ret; } diff --git a/src/db/sysdb.h b/src/db/sysdb.h index 7f2e41f9d..90ec551c8 100644 --- a/src/db/sysdb.h +++ b/src/db/sysdb.h @@ -196,6 +196,8 @@ int sysdb_attrs_add_time_t(struct sysdb_attrs *attrs, const char *name, time_t value); int sysdb_attrs_get_el(struct sysdb_attrs *attrs, const char *name, struct ldb_message_element **el); +int sysdb_attrs_get_el_ext(struct sysdb_attrs *attrs, const char *name, + bool alloc, struct ldb_message_element **el); int sysdb_attrs_steal_string(struct sysdb_attrs *attrs, const char *name, char *str); int sysdb_attrs_get_string(struct sysdb_attrs *attrs, const char *name, -- cgit