chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolve-host: fix missed search&replace
[elogind.git]
/
src
/
resolve-host
/
resolve-host.c
diff --git
a/src/resolve-host/resolve-host.c
b/src/resolve-host/resolve-host.c
index 987b43a0cb9707e0c14c73f301df9f3519408116..43c8a229eb09deddd57709ff39ee9565693c1cc6 100644
(file)
--- a/
src/resolve-host/resolve-host.c
+++ b/
src/resolve-host/resolve-host.c
@@
-37,7
+37,7
@@
static int arg_family = AF_UNSPEC;
static int arg_ifindex = 0;
static int arg_family = AF_UNSPEC;
static int arg_ifindex = 0;
-static
uint16_
t arg_type = 0;
+static
in
t arg_type = 0;
static uint16_t arg_class = 0;
static bool arg_legend = true;
static uint16_t arg_class = 0;
static bool arg_legend = true;
@@
-316,6
+316,7
@@
static int resolve_record(sd_bus *bus, const char *name) {
if (r < 0)
return bus_log_create_error(r);
if (r < 0)
return bus_log_create_error(r);
+ assert((uint16_t) arg_type == arg_type);
r = sd_bus_message_append(req, "sqq", name, arg_class, arg_type);
if (r < 0)
return bus_log_create_error(r);
r = sd_bus_message_append(req, "sqq", name, arg_class, arg_type);
if (r < 0)
return bus_log_create_error(r);
@@
-482,11
+483,12
@@
static int parse_argv(int argc, char *argv[]) {
return 0;
}
return 0;
}
-
r = dns_type_from_string(optarg, &arg_type
);
- if (
r
< 0) {
+
arg_type = dns_type_from_string(optarg
);
+ if (
arg_type
< 0) {
log_error("Failed to parse RR record type %s", optarg);
log_error("Failed to parse RR record type %s", optarg);
- return
r
;
+ return
arg_type
;
}
}
+ assert(arg_type > 0 && (uint16_t) arg_type == arg_type);
break;
break;