Skip to content

Commit c398e42

Browse files
troglobittroglobit
committed
confd: drop leading ietf/infix prefix in source files
Signed-off-by: Joachim Wiberg <[email protected]>
1 parent b40c605 commit c398e42

34 files changed

+228
-72
lines changed

‎src/confd/src/Makefile.am‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -26,36 +26,36 @@ confd_plugin_la_SOURCES = \
2626
base64.c base64.h \
2727
core.c core.h \
2828
dagger.c dagger.h \
29-
ietf-interfaces.c ietf-interfaces.h \
29+
interfaces.c interfaces.h \
3030
ieee802-ethernet-interface.c \
31-
ietf-ip.c \
32-
infix-if-bridge.c \
33-
infix-if-lag.c \
34-
infix-if-bridge-mcd.c \
35-
infix-if-bridge-port.c \
36-
infix-if-veth.c \
37-
infix-if-vlan.c \
38-
infix-if-gre.c \
39-
infix-if-vxlan.c \
40-
infix-if-wifi.c \
41-
ietf-keystore.c \
42-
ietf-system.c \
43-
ietf-syslog.c \
44-
ietf-factory-default.c \
45-
ietf-routing.c \
46-
infix-dhcp-common.c \
47-
infix-dhcp-client.c \
48-
infix-dhcpv6-client.c \
49-
infix-dhcp-server.c \
50-
infix-factory.c \
51-
infix-firewall.c \
52-
infix-meta.c \
53-
infix-services.c \
54-
infix-system-software.c \
55-
ietf-hardware.c
31+
ip.c \
32+
if-bridge.c \
33+
if-lag.c \
34+
if-bridge-mcd.c \
35+
if-bridge-port.c \
36+
if-veth.c \
37+
if-vlan.c \
38+
if-gre.c \
39+
if-vxlan.c \
40+
if-wifi.c \
41+
keystore.c \
42+
system.c \
43+
syslog.c \
44+
factory-default.c \
45+
routing.c \
46+
dhcp-common.c \
47+
dhcp-client.c \
48+
dhcpv6-client.c \
49+
dhcp-server.c \
50+
factory.c \
51+
firewall.c \
52+
meta.c \
53+
services.c \
54+
system-software.c \
55+
hardware.c
5656

5757
if CONTAINERS
58-
confd_plugin_la_SOURCES += infix-containers.c cni.c cni.h
58+
confd_plugin_la_SOURCES += containers.c cni.c cni.h
5959
endif
6060

6161
rauc_installer_sources = \

‎src/confd/src/cni.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "core.h"
88
#include "cni.h"
9-
#include "ietf-interfaces.h"
9+
#include "interfaces.h"
1010

1111
#define CNI_NAME "/etc/cni/net.d/%s.conflist"
1212

src/confd/src/infix-containers.c renamed to src/confd/src/containers.c

File renamed without changes.

‎src/confd/src/core.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -183,19 +183,19 @@ static inline int register_rpc(sr_session_ctx_t *session, const char *xpath,
183183
}
184184

185185

186-
/* ietf-interfaces.c */
186+
/* interfaces.c */
187187
int ietf_interfaces_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd);
188188
int ietf_interfaces_cand_init(struct confd *confd);
189189

190-
/* ietf-syslog.c */
190+
/* syslog.c */
191191
int ietf_syslog_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd);
192192

193-
/* ietf-system.c */
193+
/* system.c */
194194
int ietf_system_rpc_init (struct confd *confd);
195195
int hostnamefmt (struct confd *confd, const char *fmt, char *hostnm, size_t hostlen, char *domain, size_t domlen);
196196
int ietf_system_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd);
197197

198-
/* infix-containers.c */
198+
/* containers.c */
199199
#ifdef CONTAINERS
200200
int infix_containers_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd);
201201
int infix_containers_rpc_init(struct confd *confd);
@@ -204,45 +204,45 @@ static inline int infix_containers_rpc_init(struct confd *confd) { return 0; }
204204
static inline int infix_containers_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd) { return 0; }
205205
#endif
206206

207-
/* infix-dhcp-client.c */
207+
/* dhcp-client.c */
208208
int infix_dhcp_client_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd);
209209

210-
/* infix-dhcpv6-client.c */
210+
/* dhcpv6-client.c */
211211
int infix_dhcpv6_client_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd);
212212

213-
/* infix-dhcp-server.c */
213+
/* dhcp-server.c */
214214
int infix_dhcp_server_candidate_init(struct confd *confd);
215215
int infix_dhcp_server_rpc_init(struct confd *confd);
216216
int infix_dhcp_server_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd);
217217

218218
/* ietf-routing */
219219
int ietf_routing_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd);
220220

221-
/* infix-factory.c */
221+
/* factory.c */
222222
int infix_factory_rpc_init(struct confd *confd);
223223

224224
/* ietf-factory-default */
225225
int ietf_factory_default_rpc_init(struct confd *confd);
226226

227-
/* infix-meta.c */
227+
/* meta.c */
228228
int infix_meta_change_cb(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd);
229229

230-
/* infix-system-software.c */
230+
/* system-software.c */
231231
int infix_system_sw_rpc_init(struct confd *confd);
232232

233-
/* infix-services.c */
233+
/* services.c */
234234
int infix_services_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd);
235235

236-
/* ietf-hardware.c */
236+
/* hardware.c */
237237
int ietf_hardware_candidate_init(struct confd *confd);
238238
int ietf_hardware_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd);
239239

240-
/* ietf-keystore.c */
240+
/* keystore.c */
241241
#define SSH_HOSTKEYS "/etc/ssh/hostkeys"
242242
#define SSH_HOSTKEYS_NEXT SSH_HOSTKEYS"+"
243243
int ietf_keystore_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd);
244244

245-
/* infix-firewall.c */
245+
/* firewall.c */
246246
int infix_firewall_rpc_init(struct confd *confd);
247247
int infix_firewall_candidate_init(struct confd *confd);
248248
int infix_firewall_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd);

src/confd/src/infix-dhcp-client.c renamed to src/confd/src/dhcp-client.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <srx/srx_val.h>
1313

1414
#include "core.h"
15-
#include "infix-dhcp-common.h"
15+
#include "dhcp-common.h"
1616

1717
#define ARPING_MSEC 1000
1818
#define MODULE "infix-dhcp-client"

src/confd/src/infix-dhcp-common.c renamed to src/confd/src/dhcp-common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#include <libyang/libyang.h>
1414
#include "core.h"
15-
#include "infix-dhcp-common.h"
15+
#include "dhcp-common.h"
1616

1717
int dhcp_option_lookup(const struct lyd_node *id)
1818
{
@@ -230,7 +230,7 @@ static void infer_options_v6(sr_session_ctx_t *session, const char *xpath)
230230
}
231231

232232
/*
233-
* Called from ietf-interfaces.c ifchange_cand() to infer DHCP options
233+
* Called from interfaces.c ifchange_cand() to infer DHCP options
234234
* for both DHCPv4 and DHCPv6 client configurations
235235
*/
236236
int ifchange_cand_infer_dhcp(sr_session_ctx_t *session, const char *xpath)

src/confd/src/infix-dhcp-common.h renamed to src/confd/src/dhcp-common.h

File renamed without changes.

src/confd/src/infix-dhcp-server.c renamed to src/confd/src/dhcp-server.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <srx/srx_val.h>
1010

1111
#include "core.h"
12-
#include "infix-dhcp-common.h"
12+
#include "dhcp-common.h"
1313

1414
#define MODULE "infix-dhcp-server"
1515
#define ROOT_XPATH "/infix-dhcp-server:"

src/confd/src/infix-dhcpv6-client.c renamed to src/confd/src/dhcpv6-client.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <srx/srx_val.h>
1313

1414
#include "core.h"
15-
#include "infix-dhcp-common.h"
15+
#include "dhcp-common.h"
1616

1717
#define MODULE "infix-dhcpv6-client"
1818
#define XPATH "/ietf-interfaces:interfaces/interface/ietf-ip:ipv6/infix-dhcpv6-client:dhcp"

src/confd/src/ietf-factory-default.c renamed to src/confd/src/factory-default.c

File renamed without changes.

0 commit comments

Comments
 (0)