resolved: rename dns_transaction_prepare_next_attempt()
authorLennart Poettering <lennart@poettering.net>
Thu, 10 Dec 2015 10:25:26 +0000 (11:25 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 10 Dec 2015 10:35:52 +0000 (11:35 +0100)
Let's simply call it dns_transaction_prepare(), so that we have the nice
cycle for prepare() → go() → emit() → process().

After all it's pretty clear that what we prepare there, and we dont call
the others go_next_attempt(), emit_next_attempt() or
process_next_attempt().

src/resolve/resolved-dns-transaction.c

index 1dcd2c7..efed761 100644 (file)
@@ -744,7 +744,7 @@ static usec_t transaction_get_resend_timeout(DnsTransaction *t) {
         }
 }
 
-static int dns_transaction_prepare_next_attempt(DnsTransaction *t, usec_t ts) {
+static int dns_transaction_prepare(DnsTransaction *t, usec_t ts) {
         bool had_stream;
         int r;
 
@@ -894,7 +894,7 @@ static int dns_transaction_make_packet_mdns(DnsTransaction *t) {
                 if (r < 0)
                         return r;
 
-                r = dns_transaction_prepare_next_attempt(other, ts);
+                r = dns_transaction_prepare(other, ts);
                 if (r <= 0)
                         continue;
 
@@ -977,7 +977,7 @@ int dns_transaction_go(DnsTransaction *t) {
 
         assert_se(sd_event_now(t->scope->manager->event, clock_boottime_or_monotonic(), &ts) >= 0);
 
-        r = dns_transaction_prepare_next_attempt(t, ts);
+        r = dns_transaction_prepare(t, ts);
         if (r <= 0)
                 return r;