chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: stop using EDEADLOCK
[elogind.git]
/
src
/
resolve
/
resolved-dns-query.c
diff --git
a/src/resolve/resolved-dns-query.c
b/src/resolve/resolved-dns-query.c
index 669595d7f93efe0f47db9c0c4c5cc1945f554ff3..d619fae725ba5b1516bee1cff1b9be34c8b5687b 100644
(file)
--- a/
src/resolve/resolved-dns-query.c
+++ b/
src/resolve/resolved-dns-query.c
@@
-19,10
+19,8
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include "af-list.h"
#include "resolved-dns-query.h"
#include "resolved-dns-query.h"
-#include "resolved-dns-domain.h"
/* How long to wait for the query in total */
#define QUERY_TIMEOUT_USEC (30 * USEC_PER_SEC)
/* How long to wait for the query in total */
#define QUERY_TIMEOUT_USEC (30 * USEC_PER_SEC)
@@
-144,7
+142,7
@@
static int dns_query_add_transaction(DnsQuery *q, DnsScope *s, DnsResourceKey *k
assert(q);
assert(s);
assert(q);
assert(s);
- r = set_ensure_allocated(&q->transactions, NULL
, NULL
);
+ r = set_ensure_allocated(&q->transactions, NULL);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-166,7
+164,7
@@
static int dns_query_add_transaction(DnsQuery *q, DnsScope *s, DnsResourceKey *k
return r;
}
return r;
}
- r = set_ensure_allocated(&t->queries, NULL
, NULL
);
+ r = set_ensure_allocated(&t->queries, NULL);
if (r < 0)
goto gc;
if (r < 0)
goto gc;