chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shutdownd: modernizations
[elogind.git]
/
src
/
shutdownd
/
shutdownd.c
diff --git
a/src/shutdownd/shutdownd.c
b/src/shutdownd/shutdownd.c
index 4a1719849ba2aec5e57da674909ce84e6f2b201e..8d034e6cca564857ea7d1794bcb0ecf47222fc0e 100644
(file)
--- a/
src/shutdownd/shutdownd.c
+++ b/
src/shutdownd/shutdownd.c
@@
-61,9
+61,9
@@
static int read_packet(int fd, union shutdown_buffer *_b) {
} control = {};
struct msghdr msghdr = {
.msg_iov = &iovec,
} control = {};
struct msghdr msghdr = {
.msg_iov = &iovec,
-
msghdr
.msg_iovlen = 1,
-
msghdr
.msg_control = &control,
-
msghdr
.msg_controllen = sizeof(control),
+ .msg_iovlen = 1,
+ .msg_control = &control,
+ .msg_controllen = sizeof(control),
};
assert(fd >= 0);
};
assert(fd >= 0);
@@
-120,7
+120,7
@@
static int read_packet(int fd, union shutdown_buffer *_b) {
static void warn_wall(usec_t n, struct sd_shutdown_command *c) {
char date[FORMAT_TIMESTAMP_MAX];
const char *prefix;
static void warn_wall(usec_t n, struct sd_shutdown_command *c) {
char date[FORMAT_TIMESTAMP_MAX];
const char *prefix;
- char *l = NULL;
+
_cleanup_free_
char *l = NULL;
assert(c);
assert(c->warn_wall);
assert(c);
assert(c->warn_wall);
@@
-142,12
+142,10
@@
static void warn_wall(usec_t n, struct sd_shutdown_command *c) {
assert_not_reached("Unknown mode!");
if (asprintf(&l, "%s%s%s%s!", c->wall_message, c->wall_message[0] ? "\n" : "",
assert_not_reached("Unknown mode!");
if (asprintf(&l, "%s%s%s%s!", c->wall_message, c->wall_message[0] ? "\n" : "",
- prefix, format_timestamp(date, sizeof(date), c->usec)) < 0)
- log_error("Failed to allocate wall message");
- else {
+ prefix, format_timestamp(date, sizeof(date), c->usec)) >= 0)
utmp_wall(l, NULL);
utmp_wall(l, NULL);
- free(l);
- }
+ else
+ log_error("Failed to allocate wall message");
}
_const_ static usec_t when_wall(usec_t n, usec_t elapse) {
}
_const_ static usec_t when_wall(usec_t n, usec_t elapse) {
@@
-199,8
+197,8
@@
static const char *mode_to_string(enum sd_shutdown_mode m) {
static int update_schedule_file(struct sd_shutdown_command *c) {
int r;
static int update_schedule_file(struct sd_shutdown_command *c) {
int r;
-
FILE *f
;
-
char *temp_path, *t
;
+
_cleanup_fclose_ FILE *f = NULL
;
+
_cleanup_free_ char *t = NULL, *temp_path = NULL
;
assert(c);
assert(c);
@@
-217,7
+215,6
@@
static int update_schedule_file(struct sd_shutdown_command *c) {
r = fopen_temporary("/run/systemd/shutdown/scheduled", &f, &temp_path);
if (r < 0) {
log_error("Failed to save information about scheduled shutdowns: %s", strerror(-r));
r = fopen_temporary("/run/systemd/shutdown/scheduled", &f, &temp_path);
if (r < 0) {
log_error("Failed to save information about scheduled shutdowns: %s", strerror(-r));
- free(t);
return r;
}
return r;
}
@@
-237,8
+234,6
@@
static int update_schedule_file(struct sd_shutdown_command *c) {
if (!isempty(t))
fprintf(f, "WALL_MESSAGE=%s\n", t);
if (!isempty(t))
fprintf(f, "WALL_MESSAGE=%s\n", t);
- free(t);
-
fflush(f);
if (ferror(f) || rename(temp_path, "/run/systemd/shutdown/scheduled") < 0) {
fflush(f);
if (ferror(f) || rename(temp_path, "/run/systemd/shutdown/scheduled") < 0) {
@@
-249,9
+244,6
@@
static int update_schedule_file(struct sd_shutdown_command *c) {
unlink("/run/systemd/shutdown/scheduled");
}
unlink("/run/systemd/shutdown/scheduled");
}
- fclose(f);
- free(temp_path);
-
return r;
}
return r;
}