[systemd-commits] 6 commits - src/core src/hostname src/journal src/libsystemd src/libsystemd-terminal src/login src/network src/resolve src/shared src/systemctl src/systemd src/test src/udev
David Herrmann
dvdhrm at kemper.freedesktop.org
Thu Dec 11 06:15:29 PST 2014
src/core/device.c | 2 +-
src/core/execute.c | 2 +-
src/core/main.c | 2 +-
src/core/manager.c | 2 +-
src/core/unit.h | 2 +-
src/hostname/hostnamed.c | 2 +-
src/journal/journal-file.c | 2 +-
src/journal/journal-verify.c | 2 +-
src/journal/journald-server.c | 6 +++---
src/libsystemd-terminal/term-internal.h | 2 +-
src/libsystemd/sd-bus/bus-match.c | 2 +-
src/libsystemd/sd-bus/bus-message.c | 6 +++---
src/libsystemd/sd-bus/sd-bus.c | 2 +-
src/libsystemd/sd-bus/test-bus-gvariant.c | 2 +-
src/libsystemd/sd-id128/sd-id128.c | 2 +-
src/login/logind-dbus.c | 2 +-
src/network/networkd-address.c | 2 +-
src/network/networkd-netdev.c | 2 +-
src/resolve/resolved-dns-scope.c | 2 +-
src/shared/clock-util.c | 4 ++--
src/shared/util.c | 6 +++---
src/systemctl/systemctl.c | 2 +-
src/systemd/sd-login.h | 2 +-
src/test/test-strbuf.c | 2 +-
src/udev/udev-builtin-net_id.c | 2 +-
25 files changed, 32 insertions(+), 32 deletions(-)
New commits:
commit f7340ab269828d917cd1281e33e6dd4fdfee67b3
Author: Torstein Husebø <torstein at huseboe.net>
Date: Wed Dec 10 20:00:09 2014 +0100
treewide: correct spacing near eol in code comments
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 0b38cde..970e800 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -276,7 +276,7 @@ static int context_update_kernel_hostname(Context *c) {
if (hostname_is_useful(static_hn))
hn = static_hn;
- /* ... the transient host name, (ie: DHCP) comes next ...*/
+ /* ... the transient host name, (ie: DHCP) comes next ... */
else if (!isempty(c->data[PROP_HOSTNAME]))
hn = c->data[PROP_HOSTNAME];
diff --git a/src/libsystemd-terminal/term-internal.h b/src/libsystemd-terminal/term-internal.h
index 53713dd..8c6a001 100644
--- a/src/libsystemd-terminal/term-internal.h
+++ b/src/libsystemd-terminal/term-internal.h
@@ -472,7 +472,7 @@ enum {
TERM_CMD_VPR, /* vertical-line-position-relative */
TERM_CMD_VT, /* vertical-tab */
TERM_CMD_XTERM_CLLHP, /* xterm-cursor-lower-left-hp-bugfix */
- TERM_CMD_XTERM_IHMT, /* xterm-initiate-highlight-mouse-tracking*/
+ TERM_CMD_XTERM_IHMT, /* xterm-initiate-highlight-mouse-tracking */
TERM_CMD_XTERM_MLHP, /* xterm-memory-lock-hp-bugfix */
TERM_CMD_XTERM_MUHP, /* xterm-memory-unlock-hp-bugfix */
TERM_CMD_XTERM_RPM, /* xterm-restore-private-mode */
diff --git a/src/libsystemd/sd-id128/sd-id128.c b/src/libsystemd/sd-id128/sd-id128.c
index 233ffa0..c876f6e 100644
--- a/src/libsystemd/sd-id128/sd-id128.c
+++ b/src/libsystemd/sd-id128/sd-id128.c
@@ -222,7 +222,7 @@ _public_ int sd_id128_randomize(sd_id128_t *ret) {
/* Turn this into a valid v4 UUID, to be nice. Note that we
* only guarantee this for newly generated UUIDs, not for
- * pre-existing ones.*/
+ * pre-existing ones. */
*ret = make_v4_uuid(t);
return 0;
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 48395f6..8ea653f 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -727,7 +727,7 @@ static int method_create_session(sd_bus *bus, sd_bus_message *message, void *use
/* Now, let's wait until the slice unit and stuff got
* created. We send the reply back from
- * session_send_create_reply().*/
+ * session_send_create_reply(). */
return 1;
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index b1441ad..2ceb303 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -752,7 +752,7 @@ struct socket_info {
/* Note: triggered is a list here, although it almost certainly
* will always be one unit. Nevertheless, dbus API allows for multiple
- * values, so let's follow that.*/
+ * values, so let's follow that. */
char** triggered;
/* The strv above is shared. free is set only in the first one. */
diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
index 64b8827..24c8595 100644
--- a/src/systemd/sd-login.h
+++ b/src/systemd/sd-login.h
@@ -119,7 +119,7 @@ int sd_uid_get_sessions(uid_t uid, int require_active, char ***sessions);
/* Return seats of user is on. If require_active is true, this will look for
* active seats only. Returns the number of seats.
- * If seats is NULL, this will just return the number of seats.*/
+ * If seats is NULL, this will just return the number of seats. */
int sd_uid_get_seats(uid_t uid, int require_active, char ***seats);
/* Return 1 if the session is active. */
diff --git a/src/test/test-strbuf.c b/src/test/test-strbuf.c
index 43cb92b..4ec648a 100644
--- a/src/test/test-strbuf.c
+++ b/src/test/test-strbuf.c
@@ -48,7 +48,7 @@ static void test_strbuf(void) {
/* check the content of the buffer directly */
l = strv_parse_nulstr(sb->buf, sb->len);
- assert_se(streq(l[0], "")); /* root*/
+ assert_se(streq(l[0], "")); /* root */
assert_se(streq(l[1], "waldo"));
assert_se(streq(l[2], "foo"));
assert_se(streq(l[3], "bar"));
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index 3e2c8f8..95e5452 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -307,7 +307,7 @@ static int names_usb(struct udev_device *dev, struct netnames *names) {
s[0] = '\0';
interf = s+1;
- /* prefix every port number in the chain with "u"*/
+ /* prefix every port number in the chain with "u" */
s = ports;
while ((s = strchr(s, '.')))
s[0] = 'u';
commit ee33e53a70c0d3f9d8aeafe4b8fd84a0d5e1d8d9
Author: Torstein Husebø <torstein at huseboe.net>
Date: Wed Dec 10 20:00:08 2014 +0100
core: correct spacing near eol in code comments
diff --git a/src/core/device.c b/src/core/device.c
index b254e45..c298cd9 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -382,7 +382,7 @@ static int device_process_new_device(Manager *m, struct udev_device *dev) {
* same /dev/disk/by-label/xxx link because they have
* the same label. We want to make sure that the same
* device that won the symlink wins in systemd, so we
- * check the device node major/minor*/
+ * check the device node major/minor */
if (stat(p, &st) >= 0)
if ((!S_ISBLK(st.st_mode) && !S_ISCHR(st.st_mode)) ||
st.st_rdev != udev_device_get_devnum(dev))
diff --git a/src/core/execute.c b/src/core/execute.c
index 5e4135e..ae2a52d 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -130,7 +130,7 @@ static int shift_fds(int fds[], unsigned n_fds) {
fds[i] = nfd;
/* Hmm, the fd we wanted isn't free? Then
- * let's remember that and try again from here*/
+ * let's remember that and try again from here */
if (nfd != i+3 && restart_from < 0)
restart_from = i;
}
diff --git a/src/core/main.c b/src/core/main.c
index 140f219..77980e3 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1543,7 +1543,7 @@ int main(int argc, char *argv[]) {
* managers and installers to provision a couple of
* files already. If the container manager wants to
* provision the machine ID itself it should pass
- * $container_uuid to PID 1.*/
+ * $container_uuid to PID 1. */
empty_etc = access("/etc/machine-id", F_OK) < 0;
if (empty_etc)
diff --git a/src/core/manager.c b/src/core/manager.c
index 6382400..7653850 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -440,7 +440,7 @@ static int manager_setup_signals(Manager *m) {
SIGRTMIN+26, /* systemd: set log target to journal-or-kmsg */
SIGRTMIN+27, /* systemd: set log target to console */
SIGRTMIN+28, /* systemd: set log target to kmsg */
- SIGRTMIN+29, /* systemd: set log target to syslog-or-kmsg (obsolete)*/
+ SIGRTMIN+29, /* systemd: set log target to syslog-or-kmsg (obsolete) */
/* ... one free signal here SIGRTMIN+30 ... */
#endif
diff --git a/src/core/unit.h b/src/core/unit.h
index 0e45229..f6587ba 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -284,7 +284,7 @@ struct UnitVTable {
* that */
size_t exec_runtime_offset;
- /* The name of the configuration file section with the private settings of this unit*/
+ /* The name of the configuration file section with the private settings of this unit */
const char *private_section;
/* Config file sections this unit type understands, separated
commit cc13b327297bb616f8adca10c7503581c8bc5b93
Author: Torstein Husebø <torstein at huseboe.net>
Date: Wed Dec 10 20:00:07 2014 +0100
shared: correct spacing near eol in code comments
diff --git a/src/shared/clock-util.c b/src/shared/clock-util.c
index fc49393..9668468 100644
--- a/src/shared/clock-util.c
+++ b/src/shared/clock-util.c
@@ -121,7 +121,7 @@ int clock_set_timezone(int *min) {
minutesdelta = tm->tm_gmtoff / 60;
tz.tz_minuteswest = -minutesdelta;
- tz.tz_dsttime = 0; /* DST_NONE*/
+ tz.tz_dsttime = 0; /* DST_NONE */
/*
* If the RTC does not run in UTC but in local time, the very first
@@ -141,7 +141,7 @@ int clock_reset_timewarp(void) {
struct timezone tz;
tz.tz_minuteswest = 0;
- tz.tz_dsttime = 0; /* DST_NONE*/
+ tz.tz_dsttime = 0; /* DST_NONE */
/*
* The very first call to settimeofday() does time warp magic. Do a
diff --git a/src/shared/util.c b/src/shared/util.c
index 26a4f72..6383c0f 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -558,7 +558,7 @@ const char* split(const char **state, size_t *l, const char *separator, bool quo
*l = strcspn_escaped(current + 1, quotechars);
if (current[*l + 1] == '\0' ||
(current[*l + 2] && !strchr(separator, current[*l + 2]))) {
- /* right quote missing or garbage at the end*/
+ /* right quote missing or garbage at the end */
*state = current;
return NULL;
}
@@ -1436,7 +1436,7 @@ char *cunescape_length_with_prefix(const char *s, size_t length, const char *pre
}
case 0:
- /* premature end of string.*/
+ /* premature end of string. */
*(t++) = '\\';
goto finish;
@@ -3662,7 +3662,7 @@ char *unquote(const char *s, const char* quotes) {
/* This is rather stupid, simply removes the heading and
* trailing quotes if there is one. Doesn't care about
* escaping or anything. We should make this smarter one
- * day...*/
+ * day... */
l = strlen(s);
if (l < 2)
commit 7517e17443225fafea86b21e42a36af69feb1dbc
Author: Torstein Husebø <torstein at huseboe.net>
Date: Wed Dec 10 20:00:06 2014 +0100
journald: correct spacing near eol code comments
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index c5d2d19..622eb16 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2527,7 +2527,7 @@ int journal_file_open(
* currently no usable API to query this, hence let's
* emulate this via extended attributes. If extended
* attributes are not supported we'll just skip this,
- * and rely solely on mtime/atime/ctime of the file.*/
+ * and rely solely on mtime/atime/ctime of the file. */
crtime = htole64((uint64_t) now(CLOCK_REALTIME));
fsetxattr(f->fd, "user.crtime_usec", &crtime, sizeof(crtime), XATTR_CREATE);
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
index 7e3c974..91de45f 100644
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -427,7 +427,7 @@ static int entry_points_to_data(
/* Check if this entry is also in main entry array. Since the
* main entry array has already been verified we can rely on
- * its consistency.*/
+ * its consistency. */
i = 0;
n = le64toh(f->header->n_entries);
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 80c9736..a2a2e19 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -811,7 +811,7 @@ static void dispatch_message_real(
* realuid is not root, in order not to accidentally
* leak privileged information to the user that is
* logged by a privileged process that is part of an
- * unprivileged session.*/
+ * unprivileged session. */
journal_uid = owner;
else
journal_uid = 0;
@@ -1131,7 +1131,7 @@ int process_datagram(sd_event_source *es, int fd, uint32_t revents, void *userda
* the SELinux people this will change and it
* will probably be identical to NAME_MAX. For
* now we use that, but this should be updated
- * one day when the final limit is known.*/
+ * one day when the final limit is known. */
uint8_t buf[CMSG_SPACE(sizeof(struct ucred)) +
CMSG_SPACE(sizeof(struct timeval)) +
CMSG_SPACE(sizeof(int)) + /* fd */
@@ -1158,7 +1158,7 @@ int process_datagram(sd_event_source *es, int fd, uint32_t revents, void *userda
* don't rely on it. */
(void) ioctl(fd, SIOCINQ, &v);
- /* Fix it up, if it is too small. We use the same fixed value as auditd here. Awful!*/
+ /* Fix it up, if it is too small. We use the same fixed value as auditd here. Awful! */
m = PAGE_ALIGN(MAX3((size_t) v + 1,
(size_t) LINE_MAX,
ALIGN(sizeof(struct nlmsghdr)) + ALIGN((size_t) MAX_AUDIT_MESSAGE_LENGTH)) + 1);
commit ad67ef274e43ee841fb9d60e3cd2370e57418371
Author: Torstein Husebø <torstein at huseboe.net>
Date: Wed Dec 10 20:00:05 2014 +0100
sd-bus: correct spacing near eol in code comments
diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c
index 3a31aa0..162f0ab 100644
--- a/src/libsystemd/sd-bus/bus-match.c
+++ b/src/libsystemd/sd-bus/bus-match.c
@@ -234,7 +234,7 @@ static bool value_node_same(
/* Tests parameters against this value node, not doing prefix
* magic and stuff, i.e. this one actually compares the match
- * itself.*/
+ * itself. */
assert(node);
assert(node->type == BUS_MATCH_VALUE);
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index 6bf39ce..3134029 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -1350,7 +1350,7 @@ int message_append_basic(sd_bus_message *m, char type, const void *p, const void
} else {
char *e;
- /* Maybe we can append to the signature? But only if this is the top-level container*/
+ /* Maybe we can append to the signature? But only if this is the top-level container */
if (c->enclosing != 0)
return -ENXIO;
@@ -1543,7 +1543,7 @@ _public_ int sd_bus_message_append_string_space(
} else {
char *e;
- /* Maybe we can append to the signature? But only if this is the top-level container*/
+ /* Maybe we can append to the signature? But only if this is the top-level container */
if (c->enclosing != 0)
return -ENXIO;
@@ -2697,7 +2697,7 @@ _public_ int sd_bus_message_append_string_memfd(
} else {
char *e;
- /* Maybe we can append to the signature? But only if this is the top-level container*/
+ /* Maybe we can append to the signature? But only if this is the top-level container */
if (c->enclosing != 0)
return -ENXIO;
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index ef0b151..fd59bac 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -2713,7 +2713,7 @@ static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) {
if (need_more)
/* The caller really needs some more data, he doesn't
* care about what's already read, or any timeouts
- * except its own.*/
+ * except its own. */
e |= POLLIN;
else {
usec_t until;
diff --git a/src/libsystemd/sd-bus/test-bus-gvariant.c b/src/libsystemd/sd-bus/test-bus-gvariant.c
index 56df5d0..d700a35 100644
--- a/src/libsystemd/sd-bus/test-bus-gvariant.c
+++ b/src/libsystemd/sd-bus/test-bus-gvariant.c
@@ -140,7 +140,7 @@ static void test_marshal(void) {
if (r < 0)
exit(EXIT_TEST_SKIP);
- bus->message_version = 2; /* dirty hack to enable gvariant*/
+ bus->message_version = 2; /* dirty hack to enable gvariant */
assert_se(sd_bus_message_new_method_call(bus, &m, "a.service.name", "/an/object/path/which/is/really/really/long/so/that/we/hit/the/eight/bit/boundary/by/quite/some/margin/to/test/this/stuff/that/it/really/works", "an.interface.name", "AMethodName") >= 0);
commit d076c6f9e486587d634d59082d2a13b9cbb4aef3
Author: Torstein Husebø <torstein at huseboe.net>
Date: Wed Dec 10 20:00:04 2014 +0100
networkd/resolved: correct spacing near eol in code comments
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index a85e8fa..a32e870 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -227,7 +227,7 @@ static int address_acquire(Link *link, Address *original, Address **ret) {
}
if (original->family == AF_INET) {
- /* Pick first address in range for ourselves ...*/
+ /* Pick first address in range for ourselves ... */
in_addr.in.s_addr = in_addr.in.s_addr | htobe32(1);
/* .. and use last as broadcast address */
diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index b75eab9..974547d 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -275,7 +275,7 @@ int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callbac
if (r < 0)
return r;
} else {
- /* the netdev is not yet read, save this request for when it is*/
+ /* the netdev is not yet read, save this request for when it is */
netdev_join_callback *cb;
cb = new0(netdev_join_callback, 1);
diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c
index a43359f..abdb2e0 100644
--- a/src/resolve/resolved-dns-scope.c
+++ b/src/resolve/resolved-dns-scope.c
@@ -529,7 +529,7 @@ void dns_scope_process_query(DnsScope *s, DnsStream *stream, DnsPacket *p) {
if (p->ipproto == IPPROTO_UDP) {
/* Don't accept UDP queries directed to anything but
* the LLMNR multicast addresses. See RFC 4795,
- * section 2.5.*/
+ * section 2.5. */
if (p->family == AF_INET && !in_addr_equal(AF_INET, &p->destination, (union in_addr_union*) &LLMNR_MULTICAST_IPV4_ADDRESS))
return;
More information about the systemd-commits
mailing list