summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-12-19 13:07:42 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-12-19 15:00:57 +0100
commit254d1313ae5a69c08c9b93032aaaf3d6083cfc07 (patch)
tree067102a36abe6bf597c26a42d79018a1060c9007 /src/journal
parentcbff793ffb280d9d11e5d7b1dc3964276491bee8 (diff)
downloadsystemd-254d1313ae5a69c08c9b93032aaaf3d6083cfc07.tar.gz
tree-wide: use -EBADF for fd initialization
-1 was used everywhere, but -EBADF or -EBADFD started being used in various places. Let's make things consistent in the new style. Note that there are two candidates: EBADF 9 Bad file descriptor EBADFD 77 File descriptor in bad state Since we're initializating the fd, we're just assigning a value that means "no fd yet", so it's just a bad file descriptor, and the first errno fits better. If instead we had a valid file descriptor that became invalid because of some operation or state change, the other errno would fit better. In some places, initialization is dropped if unnecessary.
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/cat.c2
-rw-r--r--src/journal/fuzz-journald-native-fd.c2
-rw-r--r--src/journal/fuzz-journald.c14
-rw-r--r--src/journal/journalctl.c4
-rw-r--r--src/journal/journald-console.c2
-rw-r--r--src/journal/journald-kmsg.c2
-rw-r--r--src/journal/journald-server.c18
-rw-r--r--src/journal/journald-stream.c4
8 files changed, 24 insertions, 24 deletions
diff --git a/src/journal/cat.c b/src/journal/cat.c
index 404a748736..0ba427a660 100644
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -122,7 +122,7 @@ static int parse_argv(int argc, char *argv[]) {
}
static int run(int argc, char *argv[]) {
- _cleanup_close_ int outfd = -1, errfd = -1, saved_stderr = -1;
+ _cleanup_close_ int outfd = -EBADF, errfd = -EBADF, saved_stderr = -EBADF;
int r;
log_setup();
diff --git a/src/journal/fuzz-journald-native-fd.c b/src/journal/fuzz-journald-native-fd.c
index fcfc5dfaba..9adbb8b0dc 100644
--- a/src/journal/fuzz-journald-native-fd.c
+++ b/src/journal/fuzz-journald-native-fd.c
@@ -11,7 +11,7 @@
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
Server s;
- _cleanup_close_ int sealed_fd = -1, unsealed_fd = -1;
+ _cleanup_close_ int sealed_fd = -EBADF, unsealed_fd = -EBADF;
_cleanup_(unlink_tempfilep) char name[] = "/tmp/fuzz-journald-native-fd.XXXXXX";
char *label = NULL;
size_t label_len = 0;
diff --git a/src/journal/fuzz-journald.c b/src/journal/fuzz-journald.c
index ff1746e122..c96fad58e8 100644
--- a/src/journal/fuzz-journald.c
+++ b/src/journal/fuzz-journald.c
@@ -7,13 +7,13 @@
void dummy_server_init(Server *s, const uint8_t *buffer, size_t size) {
*s = (Server) {
- .syslog_fd = -1,
- .native_fd = -1,
- .stdout_fd = -1,
- .dev_kmsg_fd = -1,
- .audit_fd = -1,
- .hostname_fd = -1,
- .notify_fd = -1,
+ .syslog_fd = -EBADF,
+ .native_fd = -EBADF,
+ .stdout_fd = -EBADF,
+ .dev_kmsg_fd = -EBADF,
+ .audit_fd = -EBADF,
+ .hostname_fd = -EBADF,
+ .notify_fd = -EBADF,
.storage = STORAGE_NONE,
.line_max = 64,
};
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index ba5636af14..7805c9cd9d 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1803,7 +1803,7 @@ static int setup_keys(void) {
_cleanup_(unlink_and_freep) char *k = NULL;
_cleanup_free_ char *p = NULL;
uint8_t *mpk, *seed, *state;
- _cleanup_close_ int fd = -1;
+ _cleanup_close_ int fd = -EBADF;
sd_id128_t machine, boot;
struct stat st;
uint64_t n;
@@ -2101,7 +2101,7 @@ int main(int argc, char *argv[]) {
_cleanup_(sd_journal_closep) sd_journal *j = NULL;
sd_id128_t previous_boot_id = SD_ID128_NULL, previous_boot_id_output = SD_ID128_NULL;
dual_timestamp previous_ts_output = DUAL_TIMESTAMP_NULL;
- int n_shown = 0, r, poll_fd = -1;
+ int n_shown = 0, r, poll_fd = -EBADF;
setlocale(LC_ALL, "");
log_setup();
diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
index 2035e2d9b6..c8a3e18360 100644
--- a/src/journal/journald-console.c
+++ b/src/journal/journald-console.c
@@ -43,7 +43,7 @@ void server_forward_console(
char tbuf[STRLEN("[] ") + DECIMAL_STR_MAX(ts.tv_sec) + DECIMAL_STR_MAX(ts.tv_nsec)-3 + 1];
char header_pid[STRLEN("[]: ") + DECIMAL_STR_MAX(pid_t)];
_cleanup_free_ char *ident_buf = NULL;
- _cleanup_close_ int fd = -1;
+ _cleanup_close_ int fd = -EBADF;
const char *tty;
int n = 0;
diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
index 99eace0848..685863ff50 100644
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -431,7 +431,7 @@ fail:
}
int server_open_kernel_seqnum(Server *s) {
- _cleanup_close_ int fd = -1;
+ _cleanup_close_ int fd = -EBADF;
const char *fn;
uint64_t *p;
int r;
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index b268db0220..9e2d239abd 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -560,7 +560,7 @@ static int vacuum_offline_user_journals(Server *s) {
for (;;) {
_cleanup_free_ char *u = NULL, *full = NULL;
- _cleanup_close_ int fd = -1;
+ _cleanup_close_ int fd = -EBADF;
const char *a, *b;
struct dirent *de;
ManagedJournalFile *f;
@@ -2299,19 +2299,19 @@ static int set_namespace(Server *s, const char *namespace) {
int server_init(Server *s, const char *namespace) {
const char *native_socket, *syslog_socket, *stdout_socket, *varlink_socket, *e;
_cleanup_fdset_free_ FDSet *fds = NULL;
- int n, r, fd, varlink_fd = -1;
+ int n, r, fd, varlink_fd = -EBADF;
bool no_sockets;
assert(s);
*s = (Server) {
- .syslog_fd = -1,
- .native_fd = -1,
- .stdout_fd = -1,
- .dev_kmsg_fd = -1,
- .audit_fd = -1,
- .hostname_fd = -1,
- .notify_fd = -1,
+ .syslog_fd = -EBADF,
+ .native_fd = -EBADF,
+ .stdout_fd = -EBADF,
+ .dev_kmsg_fd = -EBADF,
+ .audit_fd = -EBADF,
+ .hostname_fd = -EBADF,
+ .notify_fd = -EBADF,
.compress.enabled = true,
.compress.threshold_bytes = UINT64_MAX,
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index 4446b2daec..735e2c5e8b 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -669,7 +669,7 @@ int stdout_stream_install(Server *s, int fd, StdoutStream **ret) {
return log_oom();
*stream = (StdoutStream) {
- .fd = -1,
+ .fd = -EBADF,
.priority = LOG_INFO,
.ucred = UCRED_INVALID,
};
@@ -716,7 +716,7 @@ int stdout_stream_install(Server *s, int fd, StdoutStream **ret) {
}
static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revents, void *userdata) {
- _cleanup_close_ int fd = -1;
+ _cleanup_close_ int fd = -EBADF;
Server *s = ASSERT_PTR(userdata);
int r;