aboutsummaryrefslogtreecommitdiffstats
path: root/epan/addr_resolv.c
diff options
context:
space:
mode:
authorJoão Valverde <j@v6e.pt>2023-07-27 00:06:05 +0100
committerJoão Valverde <j@v6e.pt>2023-07-27 17:46:03 +0000
commit611bf80be395a51ec3f80d4d9eaa0e22fe9ad871 (patch)
tree81178adc3a60e2b604882675079f19a99c036fc1 /epan/addr_resolv.c
parentd2e85d783c19ddaa480027e0d80c17dc83e09a72 (diff)
manuf: Code cleanup
Make global_manuf_lookup() return a struct ws_manuf pointer. Use a function to handle each switch case.
Diffstat (limited to 'epan/addr_resolv.c')
-rw-r--r--epan/addr_resolv.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 1016445f1e..904fdc6199 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -1706,11 +1706,10 @@ manuf_name_lookup(const guint8 *addr)
memcpy(addr_copy, addr, 6);
/* Mask out the broadcast/multicast flag */
addr_copy[0] &= 0xFE;
- const char *long_name;
- const char *short_name = global_manuf_lookup(addr_copy, &long_name);
- if (short_name) {
+ struct ws_manuf manuf;
+ if (global_manuf_lookup(addr_copy, &manuf) != NULL) {
/* Found it */
- return manuf_hash_new_entry(addr, short_name, long_name);
+ return manuf_hash_new_entry(addr, manuf.short_name, manuf.long_name);
}
/* Add the address as a hex string */