From 0e941a8dfcefb3e8f2b176635b8982d537bd39a1 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Thu, 7 Apr 2005 07:41:06 +0000
Subject: [PATCH] fix thinko in dnsmgr.c (lesson: don't commit while you are
rushing to a meeting and then heading out of town...)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5433 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
dnsmgr.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/dnsmgr.c b/dnsmgr.c
index 09a097d414..5afa776fec 100755
--- a/dnsmgr.c
+++ b/dnsmgr.c
@@ -86,13 +86,13 @@ struct ast_dnsmgr_entry *ast_dnsmgr_get(const char *name, struct in_addr *result
void ast_dnsmgr_release(struct ast_dnsmgr_entry *entry)
{
- /* if there is an entry (and not the special flag value), remove/free it */
- if (entry && (entry != (typeof(entry)) -1)) {
- AST_LIST_LOCK(&entry_list);
- AST_LIST_REMOVE(&entry_list, entry, list);
- AST_LIST_UNLOCK(&entry_list);
- free(entry);
- };
+ if (!entry)
+ return;
+
+ AST_LIST_LOCK(&entry_list);
+ AST_LIST_REMOVE(&entry_list, entry, list);
+ AST_LIST_UNLOCK(&entry_list);
+ free(entry);
}
int ast_dnsmgr_lookup(const char *name, struct in_addr *result, struct ast_dnsmgr_entry **dnsmgr)
@@ -119,15 +119,13 @@ int ast_dnsmgr_lookup(const char *name, struct in_addr *result, struct ast_dnsmg
if ((hp = ast_gethostbyname(name, &ahp)))
memcpy(result, hp->h_addr, sizeof(result));
- /* flag value to indicate no manager was allocated */
- *dnsmgr = (typeof(*dnsmgr)) -1;
+ return 0;
} else {
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_2 "adding manager for '%s'\n", name);
*dnsmgr = ast_dnsmgr_get(name, result);
+ return !*dnsmgr;
}
-
- return !*dnsmgr;
}
static void *do_refresh(void *data)
--
GitLab