summaryrefslogtreecommitdiff
path: root/src/libsystemd
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-07-17 01:48:40 +0200
committerLennart Poettering <lennart@poettering.net>2014-07-17 01:48:40 +0200
commit634af5665fda8776d22624d947c8de830e30a874 (patch)
tree731dc8203b1399998306b72bdd7352a4dc85eac7 /src/libsystemd
parentd12b8cad40aa78fc948362340204c3fde778082d (diff)
sd-login: always use "indices" as plural of "index"
So far both "indexes" and "indices" was used. Let's clean this up, and stick to indices, since it appears to be used more frequently.
Diffstat (limited to 'src/libsystemd')
-rw-r--r--src/libsystemd/libsystemd.sym.m42
-rw-r--r--src/libsystemd/sd-login/sd-login.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libsystemd/libsystemd.sym.m4 b/src/libsystemd/libsystemd.sym.m4
index 48572cc0b3..1c24cad105 100644
--- a/src/libsystemd/libsystemd.sym.m4
+++ b/src/libsystemd/libsystemd.sym.m4
@@ -150,7 +150,7 @@ global:
LIBSYSTEMD_216 {
global:
- sd_machine_get_ifindexes;
+ sd_machine_get_ifindices;
} LIBSYSTEMD_214;
m4_ifdef(`ENABLE_KDBUS',
diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c
index 83d6449241..38ff944892 100644
--- a/src/libsystemd/sd-login/sd-login.c
+++ b/src/libsystemd/sd-login/sd-login.c
@@ -786,7 +786,7 @@ _public_ int sd_machine_get_class(const char *machine, char **class) {
return 0;
}
-_public_ int sd_machine_get_ifindexes(const char *machine, int **ifindexes) {
+_public_ int sd_machine_get_ifindices(const char *machine, int **ifindices) {
_cleanup_free_ char *netif = NULL;
size_t l, allocated = 0, nr = 0;
char *w, *state;
@@ -795,14 +795,14 @@ _public_ int sd_machine_get_ifindexes(const char *machine, int **ifindexes) {
int r;
assert_return(machine_name_is_valid(machine), -EINVAL);
- assert_return(ifindexes, -EINVAL);
+ assert_return(ifindices, -EINVAL);
p = strappenda("/run/systemd/machines/", machine);
r = parse_env_file(p, NEWLINE, "NETIF", &netif, NULL);
if (r < 0)
return r;
if (!netif) {
- *ifindexes = NULL;
+ *ifindices = NULL;
return 0;
}
@@ -825,7 +825,7 @@ _public_ int sd_machine_get_ifindexes(const char *machine, int **ifindexes) {
ni[nr++] = ifi;
}
- *ifindexes = ni;
+ *ifindices = ni;
return nr;
}