summaryrefslogtreecommitdiff
path: root/src/login
diff options
context:
space:
mode:
authorShawn Landden <shawnlandden@gmail.com>2012-07-24 21:12:43 -0700
committerKay Sievers <kay@vrfy.org>2012-07-25 11:23:57 +0200
commit669241a076108e0483d7d8475beaa506106d077e (patch)
tree33039c6539c1e37c26a9900eddc3fcc2320c617c /src/login
parent22cfbae09d7791c52901c53b240e28c63eee93d4 (diff)
use "Out of memory." consistantly (or with "\n")
glibc/glib both use "out of memory" consistantly so maybe we should consider that instead of this. Eliminates one string out of a number of binaries. Also fixes extra newline in udev/scsi_id
Diffstat (limited to 'src/login')
-rw-r--r--src/login/logind-button.c2
-rw-r--r--src/login/logind-session.c8
-rw-r--r--src/login/logind-user.c4
-rw-r--r--src/login/logind.c4
-rw-r--r--src/login/multi-seat-x.c2
5 files changed, 10 insertions, 10 deletions
diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index 8b59c2b0c3..62e0c3dbba 100644
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -108,7 +108,7 @@ int button_open(Button *b) {
p = strappend("/dev/input/", b->name);
if (!p) {
- log_error("Out of memory");
+ log_error("Out of memory.");
return -ENOMEM;
}
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 819596ddbe..a43ecad2b1 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -375,7 +375,7 @@ static int session_link_x11_socket(Session *s) {
k = strspn(s->display+1, "0123456789");
f = new(char, sizeof("/tmp/.X11-unix/X") + k);
if (!f) {
- log_error("Out of memory");
+ log_error("Out of memory.");
return -ENOMEM;
}
@@ -395,7 +395,7 @@ static int session_link_x11_socket(Session *s) {
t = strappend(s->user->runtime_path, "/X11-display");
if (!t) {
- log_error("Out of memory");
+ log_error("Out of memory.");
free(f);
return -ENOMEM;
}
@@ -469,7 +469,7 @@ static int session_create_cgroup(Session *s) {
if (!s->cgroup_path) {
if (asprintf(&p, "%s/%s", s->user->cgroup_path, s->id) < 0) {
- log_error("Out of memory");
+ log_error("Out of memory.");
return -ENOMEM;
}
} else
@@ -670,7 +670,7 @@ static int session_unlink_x11_socket(Session *s) {
t = strappend(s->user->runtime_path, "/X11-display");
if (!t) {
- log_error("Out of memory");
+ log_error("Out of memory.");
return -ENOMEM;
}
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 0a3f22ce99..fca68159a7 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -260,7 +260,7 @@ static int user_mkdir_runtime_path(User *u) {
if (!u->runtime_path) {
if (asprintf(&p, "/run/user/%lu", (unsigned long) u->uid) < 0) {
- log_error("Out of memory");
+ log_error("Out of memory.");
return -ENOMEM;
}
} else
@@ -287,7 +287,7 @@ static int user_create_cgroup(User *u) {
if (!u->cgroup_path) {
if (asprintf(&p, "%s/%s", u->manager->cgroup_path, u->name) < 0) {
- log_error("Out of memory");
+ log_error("Out of memory.");
return -ENOMEM;
}
} else
diff --git a/src/login/logind.c b/src/login/logind.c
index 0775583147..1cfb7fa9ac 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -1176,7 +1176,7 @@ static int manager_connect_bus(Manager *m) {
!dbus_connection_register_fallback(m->bus, "/org/freedesktop/login1/session", &bus_session_vtable, m) ||
!dbus_connection_register_fallback(m->bus, "/org/freedesktop/login1/user", &bus_user_vtable, m) ||
!dbus_connection_add_filter(m->bus, bus_message_filter, m, NULL)) {
- log_error("Not enough memory");
+ log_error("Out of memory.");
r = -ENOMEM;
goto fail;
}
@@ -1611,7 +1611,7 @@ int main(int argc, char *argv[]) {
m = manager_new();
if (!m) {
- log_error("Out of memory");
+ log_error("Out of memory.");
r = -ENOMEM;
goto finish;
}
diff --git a/src/login/multi-seat-x.c b/src/login/multi-seat-x.c
index 92014f5316..a1fab86f6a 100644
--- a/src/login/multi-seat-x.c
+++ b/src/login/multi-seat-x.c
@@ -121,7 +121,7 @@ int main(int argc, char *argv[]) {
path = strappend("/run/systemd/multi-session-x/", seat);
if (!path) {
- log_error("Out of memory");
+ log_error("Out of memory.");
goto fail;
}