|
 |
698723 |
From 7fc7c2774e0836ace524215ced5c60db405a154a Mon Sep 17 00:00:00 2001
|
|
|
698723 |
From: David Tardon <dtardon@redhat.com>
|
|
|
698723 |
Date: Fri, 27 Nov 2020 10:25:12 +0100
|
|
|
698723 |
Subject: [PATCH] rename function
|
|
|
698723 |
|
|
|
698723 |
This happened upstream in commit
|
|
|
698723 |
54a8423788ec3cc6240959ab9f5cdac40baf047a, but I don't want to backport
|
|
|
698723 |
the whole commit...
|
|
|
698723 |
|
|
|
698723 |
Related: #1850986
|
|
|
698723 |
---
|
|
|
698723 |
src/libsystemd-network/network-internal.c | 2 +-
|
|
|
698723 |
src/libsystemd-network/network-internal.h | 2 +-
|
|
|
698723 |
src/network/networkd-network-gperf.gperf | 2 +-
|
|
|
698723 |
src/udev/net/link-config-gperf.gperf | 2 +-
|
|
|
698723 |
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
698723 |
|
|
|
698723 |
diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c
|
|
|
698723 |
index 0849b44ee2..629e858def 100644
|
|
|
698723 |
--- a/src/libsystemd-network/network-internal.c
|
|
|
698723 |
+++ b/src/libsystemd-network/network-internal.c
|
|
|
698723 |
@@ -183,7 +183,7 @@ int config_parse_net_condition(const char *unit,
|
|
|
698723 |
return 0;
|
|
|
698723 |
}
|
|
|
698723 |
|
|
|
698723 |
-int config_parse_ifnames(
|
|
|
698723 |
+int config_parse_match_ifnames(
|
|
|
698723 |
const char *unit,
|
|
|
698723 |
const char *filename,
|
|
|
698723 |
unsigned line,
|
|
|
698723 |
diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h
|
|
|
698723 |
index 883f34b95c..9074758bbb 100644
|
|
|
698723 |
--- a/src/libsystemd-network/network-internal.h
|
|
|
698723 |
+++ b/src/libsystemd-network/network-internal.h
|
|
|
698723 |
@@ -34,7 +34,7 @@ bool net_match_config(Set *match_mac,
|
|
|
698723 |
CONFIG_PARSER_PROTOTYPE(config_parse_net_condition);
|
|
|
698723 |
CONFIG_PARSER_PROTOTYPE(config_parse_hwaddr);
|
|
|
698723 |
CONFIG_PARSER_PROTOTYPE(config_parse_hwaddrs);
|
|
|
698723 |
-CONFIG_PARSER_PROTOTYPE(config_parse_ifnames);
|
|
|
698723 |
+CONFIG_PARSER_PROTOTYPE(config_parse_match_ifnames);
|
|
|
698723 |
CONFIG_PARSER_PROTOTYPE(config_parse_ifalias);
|
|
|
698723 |
CONFIG_PARSER_PROTOTYPE(config_parse_iaid);
|
|
|
698723 |
CONFIG_PARSER_PROTOTYPE(config_parse_bridge_port_priority);
|
|
|
698723 |
diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
|
|
|
698723 |
index 6ad5257f79..c4a2eccdc2 100644
|
|
|
698723 |
--- a/src/network/networkd-network-gperf.gperf
|
|
|
698723 |
+++ b/src/network/networkd-network-gperf.gperf
|
|
|
698723 |
@@ -24,7 +24,7 @@ Match.MACAddress, config_parse_hwaddrs,
|
|
|
698723 |
Match.Path, config_parse_strv, 0, offsetof(Network, match_path)
|
|
|
698723 |
Match.Driver, config_parse_strv, 0, offsetof(Network, match_driver)
|
|
|
698723 |
Match.Type, config_parse_strv, 0, offsetof(Network, match_type)
|
|
|
698723 |
-Match.Name, config_parse_ifnames, 0, offsetof(Network, match_name)
|
|
|
698723 |
+Match.Name, config_parse_match_ifnames, 0, offsetof(Network, match_name)
|
|
|
698723 |
Match.Host, config_parse_net_condition, CONDITION_HOST, offsetof(Network, match_host)
|
|
|
698723 |
Match.Virtualization, config_parse_net_condition, CONDITION_VIRTUALIZATION, offsetof(Network, match_virt)
|
|
|
698723 |
Match.KernelCommandLine, config_parse_net_condition, CONDITION_KERNEL_COMMAND_LINE, offsetof(Network, match_kernel_cmdline)
|
|
|
698723 |
diff --git a/src/udev/net/link-config-gperf.gperf b/src/udev/net/link-config-gperf.gperf
|
|
|
698723 |
index 5640fa0513..b37836d852 100644
|
|
|
698723 |
--- a/src/udev/net/link-config-gperf.gperf
|
|
|
698723 |
+++ b/src/udev/net/link-config-gperf.gperf
|
|
|
698723 |
@@ -20,7 +20,7 @@ struct ConfigPerfItem;
|
|
|
698723 |
%includes
|
|
|
698723 |
%%
|
|
|
698723 |
Match.MACAddress, config_parse_hwaddrs, 0, offsetof(link_config, match_mac)
|
|
|
698723 |
-Match.OriginalName, config_parse_ifnames, 0, offsetof(link_config, match_name)
|
|
|
698723 |
+Match.OriginalName, config_parse_match_ifnames, 0, offsetof(link_config, match_name)
|
|
|
698723 |
Match.Path, config_parse_strv, 0, offsetof(link_config, match_path)
|
|
|
698723 |
Match.Driver, config_parse_strv, 0, offsetof(link_config, match_driver)
|
|
|
698723 |
Match.Type, config_parse_strv, 0, offsetof(link_config, match_type)
|