chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hashmap, set: remove unused functions
[elogind.git]
/
src
/
resolve
/
resolved-dns-packet.c
diff --git
a/src/resolve/resolved-dns-packet.c
b/src/resolve/resolved-dns-packet.c
index 4f9503803be53b66c02b06cbeb151cf779554663..7375f77481d427cb4769da98372eb67a96e3291b 100644
(file)
--- a/
src/resolve/resolved-dns-packet.c
+++ b/
src/resolve/resolved-dns-packet.c
@@
-433,9
+433,7
@@
int dns_packet_append_name(DnsPacket *p, const char *name,
goto fail;
if (allow_compression) {
goto fail;
if (allow_compression) {
- r = hashmap_ensure_allocated(&p->names,
- dns_name_hash_func,
- dns_name_compare_func);
+ r = hashmap_ensure_allocated(&p->names, &dns_name_hash_ops);
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-1358,6
+1356,9
@@
int dns_packet_extract(DnsPacket *p) {
unsigned n, i;
int r;
unsigned n, i;
int r;
+ if (p->extracted)
+ return 0;
+
saved_rindex = p->rindex;
dns_packet_rewind(p, DNS_PACKET_HEADER_SIZE);
saved_rindex = p->rindex;
dns_packet_rewind(p, DNS_PACKET_HEADER_SIZE);
@@
-1409,6
+1410,8
@@
int dns_packet_extract(DnsPacket *p) {
p->answer = answer;
answer = NULL;
p->answer = answer;
answer = NULL;
+ p->extracted = true;
+
r = 0;
finish:
r = 0;
finish: