Merge pull request #13649 from keszybz/arphrd-minimization
Arphrd minimization
This commit is contained in:
commit
10b843efb0
|
@ -12,17 +12,6 @@ static const struct arphrd_name* lookup_arphrd(register const char *str, registe
|
|||
#include "arphrd-from-name.h"
|
||||
#include "arphrd-to-name.h"
|
||||
|
||||
const char *arphrd_to_name(int id) {
|
||||
|
||||
if (id <= 0)
|
||||
return NULL;
|
||||
|
||||
if ((size_t) id >= ELEMENTSOF(arphrd_names))
|
||||
return NULL;
|
||||
|
||||
return arphrd_names[id];
|
||||
}
|
||||
|
||||
int arphrd_from_name(const char *name) {
|
||||
const struct arphrd_name *sc;
|
||||
|
||||
|
@ -34,7 +23,3 @@ int arphrd_from_name(const char *name) {
|
|||
|
||||
return sc->id;
|
||||
}
|
||||
|
||||
int arphrd_max(void) {
|
||||
return ELEMENTSOF(arphrd_names);
|
||||
}
|
||||
|
|
|
@ -3,5 +3,3 @@
|
|||
|
||||
const char *arphrd_to_name(int id);
|
||||
int arphrd_from_name(const char *name);
|
||||
|
||||
int arphrd_max(void);
|
||||
|
|
|
@ -1,9 +1,12 @@
|
|||
BEGIN{
|
||||
print "static const char* const arphrd_names[] = { "
|
||||
print "const char *arphrd_to_name(int id) {"
|
||||
print " switch(id) {"
|
||||
}
|
||||
!/CISCO/ {
|
||||
printf " [ARPHRD_%s] = \"%s\",\n", $1, $1
|
||||
!/^HDLC$/ {
|
||||
printf " case ARPHRD_%s: return \"%s\";\n", $1, $1
|
||||
}
|
||||
END{
|
||||
print "};"
|
||||
print " default: return NULL;"
|
||||
print " }"
|
||||
print "}"
|
||||
}
|
||||
|
|
|
@ -1,31 +1,27 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1+ */
|
||||
|
||||
#include <linux/if_arp.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "macro.h"
|
||||
#include "string-util.h"
|
||||
#include "tests.h"
|
||||
|
||||
_unused_ \
|
||||
static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len);
|
||||
|
||||
#include "arphrd-from-name.h"
|
||||
#include "arphrd-list.h"
|
||||
#include "arphrd-to-name.h"
|
||||
|
||||
int main(int argc, const char *argv[]) {
|
||||
test_setup_logging(LOG_INFO);
|
||||
|
||||
unsigned i;
|
||||
for (int i = 0; i <= ARPHRD_VOID + 1; i++) {
|
||||
const char *name;
|
||||
|
||||
for (i = 1; i < ELEMENTSOF(arphrd_names); i++) {
|
||||
if (arphrd_names[i]) {
|
||||
assert_se(streq(arphrd_to_name(i), arphrd_names[i]));
|
||||
assert_se(arphrd_from_name(arphrd_names[i]) == (int) i);
|
||||
name = arphrd_to_name(i);
|
||||
if (name) {
|
||||
log_info("%i: %s", i, name);
|
||||
|
||||
assert_se(arphrd_from_name(name) == i);
|
||||
}
|
||||
}
|
||||
|
||||
assert_se(arphrd_to_name(arphrd_max()) == NULL);
|
||||
assert_se(arphrd_to_name(0) == NULL);
|
||||
assert_se(arphrd_to_name(ARPHRD_VOID + 1) == NULL);
|
||||
assert_se(arphrd_from_name("huddlduddl") == -EINVAL);
|
||||
assert_se(arphrd_from_name("") == -EINVAL);
|
||||
|
||||
|
|
|
@ -81,10 +81,11 @@ static void test_mnt_id(void) {
|
|||
continue;
|
||||
}
|
||||
|
||||
log_debug("mnt ids of %s are %i, %i\n", p, mnt_id, mnt_id2);
|
||||
|
||||
if (mnt_id == mnt_id2)
|
||||
if (mnt_id == mnt_id2) {
|
||||
log_debug("mnt ids of %s is %i\n", p, mnt_id);
|
||||
continue;
|
||||
} else
|
||||
log_debug("mnt ids of %s are %i, %i\n", p, mnt_id, mnt_id2);
|
||||
|
||||
/* The ids don't match? If so, then there are two mounts on the same path, let's check if
|
||||
* that's really the case */
|
||||
|
|
Loading…
Reference in a new issue