Return NULL when no results returned for realtime_multientry

It was not documented what the return value should be when no entries
were returned with the multientry realtime callback. This change forces
consistent behavior even if the backends return an empty ast_config.

Review: https://reviewboard.asterisk.org/r/1521/

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@342223 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/config.h b/include/asterisk/config.h
index 56401bf46db781eef2c6e765e9319f077903e32c..932404d14c2d67e95f4b242448e33fd6f9edbfcb 100644 (file)
--- a/include/asterisk/config.h
+++ b/include/asterisk/config.h
@@ -358,6 +358,9 @@ int ast_realtime_require_field(const char *family, ...) attribute_sentinel;
  * is thus stored inside a traditional ast_config structure rather than
  * just returning a linked list of variables.
  *
+ * \return An ast_config with one or more results
+ * \retval NULL Error or no results returned
+ *
  * \note You should use the constant SENTINEL to terminate arguments, in
  * order to preserve cross-platform compatibility.
  */

diff --git a/main/config.c b/main/config.c
index 710b90ef08e465a96e463a5a5ce5e89163a79826..8f4ed9b3b8053eb3ebe555b12d29450ccd865cf5 100644 (file)
--- a/main/config.c
+++ b/main/config.c
@@ -2446,6 +2446,11 @@ struct ast_config *ast_load_realtime_multientry(const char *family, ...)
        for (i = 1; ; i++) {
                if ((eng = find_engine(family, i, db, sizeof(db), table, sizeof(table)))) {
                        if (eng->realtime_multi_func && (res = eng->realtime_multi_func(db, table, ap))) {
+                               /* If we were returned an empty cfg, destroy it and return NULL */
+                               if (!res->root) {
+                                       ast_config_destroy(res);
+                                       res = NULL;
+                               }
                                break;
                        }
                } else {