shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-27 10:25:06 +03:00
Code

resolve-host: make arg_type an int

Browse Source 
We are using it also to store _DNS_TYPE_INVALID, so it should be signed.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-08-03 14:02:04 -04:00
parent 7263f72499
commit de292aa1dd
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -1189,7 +1189,7 @@ src/resolve/dns_type-list.txt: src/resolve/dns-type.h
$(AM_V_GEN)$(SED) -n -r 's/.* DNS_TYPE_(\w+).*/\1/p' <$< >$@
src/resolve/dns_type-to-name.h: src/resolve/dns_type-list.txt
$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *dns_type_to_string(uint16_t type) {\n\tswitch(type) {" } {printf " case DNS_TYPE_%s: return ", $$1; sub(/_/, "-"); printf "\"%s\";\n", $$1 } END{ print "\ndefault: return NULL;\n\t}\n}\n" }' <$< >$@
$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *dns_type_to_string(int type) {\n\tswitch(type) {" } {printf " case DNS_TYPE_%s: return ", $$1; sub(/_/, "-"); printf "\"%s\";\n", $$1 } END{ print "\ndefault: return NULL;\n\t}\n}\n" }' <$< >$@
src/resolve/dns_type-from-name.gperf: src/resolve/dns_type-list.txt
$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct dns_type_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { s=$$1; sub(/_/, "-", s); printf "%s, ", $$s; printf "DNS_TYPE_%s\n", $$1 }' <$< >$@

8
src/resolve-host/resolve-host.c
View File

@ -37,7 +37,7 @@
static int arg_family = AF_UNSPEC;
static int arg_ifindex = 0;
static uint16_t arg_type = 0;
static int arg_type = 0;
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);
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);
@ -482,11 +483,12 @@ static int parse_argv(int argc, char *argv[]) {
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);
return r;
}
assert(arg_type > 0 && (uint16_t) arg_type == arg_type);
break;

8
src/resolve/dns-type.c
View File

@ -32,16 +32,14 @@ lookup_dns_type (register const char *str, register unsigned int len);
#include "dns_type-from-name.h"
#include "dns_type-to-name.h"
int dns_type_from_string(const char *s, uint16_t *type) {
int dns_type_from_string(const char *s) {
const struct dns_type_name *sc;
assert(s);
assert(type);
sc = lookup_dns_type(s, strlen(s));
if (!sc)
return -EINVAL;
return _DNS_TYPE_INVALID;
*type = sc->id;
return 0;
return sc->id;
}

6
src/resolve/dns-type.h
View File

@ -21,12 +21,10 @@
#pragma once
#include <inttypes.h>
#include "macro.h"
const char *dns_type_to_string(uint16_t type);
int dns_type_from_string(const char *s, uint16_t *type);
const char *dns_type_to_string(int type);
int dns_type_from_string(const char *s);
/* DNS record types, taken from
* http://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml.