From bb00e604097fba830af1dc078d78aff278dfcd37 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 19 Jun 2010 04:35:52 +0200 Subject: [PATCH] don't use 'long long' unless we have a really good reason to --- fixme | 2 -- src/execute.c | 8 ++++---- src/initctl.c | 4 ++-- src/log.c | 4 ++-- src/logger.c | 6 +++--- src/main.c | 4 ++-- src/manager.c | 6 +++--- src/mount.c | 4 ++-- src/service.c | 8 ++++---- src/socket.c | 10 +++++----- src/util.c | 10 +++++----- 11 files changed, 32 insertions(+), 34 deletions(-) diff --git a/fixme b/fixme index a366ea83a..9152a2521 100644 --- a/fixme +++ b/fixme @@ -18,8 +18,6 @@ * "disabled" load state? -* uid are 32bit - * %m in printf() instead of strerror(); * gc: don't reap broken services diff --git a/src/execute.c b/src/execute.c index 28baeedcf..d5bb8d360 100644 --- a/src/execute.c +++ b/src/execute.c @@ -1213,7 +1213,7 @@ int exec_spawn(ExecCommand *command, } if (n_fds > 0) - if (asprintf(our_env + n_env++, "LISTEN_PID=%llu", (unsigned long long) getpid()) < 0 || + if (asprintf(our_env + n_env++, "LISTEN_PID=%lu", (unsigned long) getpid()) < 0 || asprintf(our_env + n_env++, "LISTEN_FDS=%u", n_fds) < 0) { r = EXIT_MEMORY; goto fail; @@ -1270,7 +1270,7 @@ int exec_spawn(ExecCommand *command, if (cgroup_bondings) cgroup_bonding_install_list(cgroup_bondings, pid); - log_debug("Forked %s as %llu", command->path, (unsigned long long) pid); + log_debug("Forked %s as %lu", command->path, (unsigned long) pid); command->exec_status.pid = pid; command->exec_status.start_timestamp = now(CLOCK_REALTIME); @@ -1572,8 +1572,8 @@ void exec_status_dump(ExecStatus *s, FILE *f, const char *prefix) { return; fprintf(f, - "%sPID: %llu\n", - prefix, (unsigned long long) s->pid); + "%sPID: %lu\n", + prefix, (unsigned long) s->pid); if (s->start_timestamp > 0) fprintf(f, diff --git a/src/initctl.c b/src/initctl.c index fef45007b..def621d22 100644 --- a/src/initctl.c +++ b/src/initctl.c @@ -339,7 +339,7 @@ int main(int argc, char *argv[]) { log_set_target(LOG_TARGET_SYSLOG_OR_KMSG); log_parse_environment(); - log_info("systemd-initctl running as pid %llu", (unsigned long long) getpid()); + log_info("systemd-initctl running as pid %lu", (unsigned long) getpid()); if ((n = sd_listen_fds(true)) < 0) { log_error("Failed to read listening file descriptors from environment: %s", strerror(-r)); @@ -387,7 +387,7 @@ fail: server_done(&server); - log_info("systemd-initctl stopped as pid %llu", (unsigned long long) getpid()); + log_info("systemd-initctl stopped as pid %lu", (unsigned long) getpid()); dbus_shutdown(); diff --git a/src/log.c b/src/log.c index 4f9f2da25..4840185bc 100644 --- a/src/log.c +++ b/src/log.c @@ -265,7 +265,7 @@ static int write_to_syslog( if (strftime(header_time, sizeof(header_time), "%h %e %T ", tm) <= 0) return -EINVAL; - snprintf(header_pid, sizeof(header_pid), "[%llu]: ", (unsigned long long) getpid()); + snprintf(header_pid, sizeof(header_pid), "[%lu]: ", (unsigned long) getpid()); char_array_0(header_pid); zero(iovec); @@ -301,7 +301,7 @@ static int write_to_kmsg( snprintf(header_priority, sizeof(header_priority), "<%i>", LOG_PRI(level)); char_array_0(header_priority); - snprintf(header_pid, sizeof(header_pid), "[%llu]: ", (unsigned long long) getpid()); + snprintf(header_pid, sizeof(header_pid), "[%lu]: ", (unsigned long) getpid()); char_array_0(header_pid); zero(iovec); diff --git a/src/logger.c b/src/logger.c index de4dfad38..66f6f8c2e 100644 --- a/src/logger.c +++ b/src/logger.c @@ -143,7 +143,7 @@ static int stream_log(Stream *s, char *p, usec_t ts) { return -EINVAL; } - snprintf(header_pid, sizeof(header_pid), "[%llu]: ", (unsigned long long) s->pid); + snprintf(header_pid, sizeof(header_pid), "[%lu]: ", (unsigned long) s->pid); char_array_0(header_pid); zero(iovec); @@ -538,7 +538,7 @@ int main(int argc, char *argv[]) { log_set_target(LOG_TARGET_SYSLOG_OR_KMSG); log_parse_environment(); - log_info("systemd-logger running as pid %llu", (unsigned long long) getpid()); + log_info("systemd-logger running as pid %lu", (unsigned long) getpid()); if ((n = sd_listen_fds(true)) < 0) { log_error("Failed to read listening file descriptors from environment: %s", strerror(-r)); @@ -586,7 +586,7 @@ fail: server_done(&server); - log_info("systemd-logger stopped as pid %llu", (unsigned long long) getpid()); + log_info("systemd-logger stopped as pid %lu", (unsigned long) getpid()); return r; } diff --git a/src/main.c b/src/main.c index f00d43a7c..db2a76781 100644 --- a/src/main.c +++ b/src/main.c @@ -116,7 +116,7 @@ _noreturn_ static void crash(int sig) { else if (!WCOREDUMP(status)) log_error("Caught <%s>, core dump failed.", strsignal(sig)); else - log_error("Caught <%s>, dumped core as pid %llu.", strsignal(sig), (unsigned long long) pid); + log_error("Caught <%s>, dumped core as pid %lu.", strsignal(sig), (unsigned long) pid); } } @@ -152,7 +152,7 @@ _noreturn_ static void crash(int sig) { _exit(1); } - log_info("Successfully spawned crash shall as pid %llu.", (unsigned long long) pid); + log_info("Successfully spawned crash shall as pid %lu.", (unsigned long) pid); } log_info("Freezing execution."); diff --git a/src/manager.c b/src/manager.c index e211ecaf5..da42d7d78 100644 --- a/src/manager.c +++ b/src/manager.c @@ -1701,7 +1701,7 @@ static int manager_dispatch_sigchld(Manager *m) { char *name = NULL; get_process_name(si.si_pid, &name); - log_debug("Got SIGCHLD for process %llu (%s)", (unsigned long long) si.si_pid, strna(name)); + log_debug("Got SIGCHLD for process %lu (%s)", (unsigned long) si.si_pid, strna(name)); free(name); } @@ -1727,8 +1727,8 @@ static int manager_dispatch_sigchld(Manager *m) { if (si.si_code != CLD_EXITED && si.si_code != CLD_KILLED && si.si_code != CLD_DUMPED) continue; - log_debug("Child %llu died (code=%s, status=%i/%s)", - (long long unsigned) si.si_pid, + log_debug("Child %lu died (code=%s, status=%i/%s)", + (long unsigned) si.si_pid, sigchld_code_to_string(si.si_code), si.si_status, strna(si.si_code == CLD_EXITED ? exit_status_to_string(si.si_status) : strsignal(si.si_status))); diff --git a/src/mount.c b/src/mount.c index 5c16f86d5..b49c64aea 100644 --- a/src/mount.c +++ b/src/mount.c @@ -505,8 +505,8 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) { if (m->control_pid > 0) fprintf(f, - "%sControl PID: %llu\n", - prefix, (unsigned long long) m->control_pid); + "%sControl PID: %lu\n", + prefix, (unsigned long) m->control_pid); exec_context_dump(&m->exec_context, f, prefix); } diff --git a/src/service.c b/src/service.c index 4375cb5cb..987320178 100644 --- a/src/service.c +++ b/src/service.c @@ -904,13 +904,13 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { if (s->control_pid > 0) fprintf(f, - "%sControl PID: %llu\n", - prefix, (unsigned long long) s->control_pid); + "%sControl PID: %lu\n", + prefix, (unsigned long) s->control_pid); if (s->main_pid > 0) fprintf(f, - "%sMain PID: %llu\n", - prefix, (unsigned long long) s->main_pid); + "%sMain PID: %lu\n", + prefix, (unsigned long) s->main_pid); if (s->pid_file) fprintf(f, diff --git a/src/socket.c b/src/socket.c index fdb6f66b6..751d8aa8f 100644 --- a/src/socket.c +++ b/src/socket.c @@ -313,8 +313,8 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) { if (s->control_pid > 0) fprintf(f, - "%sControl PID: %llu\n", - prefix, (unsigned long long) s->control_pid); + "%sControl PID: %lu\n", + prefix, (unsigned long) s->control_pid); if (s->bind_to_device) fprintf(f, @@ -447,10 +447,10 @@ static int instance_from_socket(int fd, unsigned nr, char **instance) { return -errno; if (asprintf(&r, - "%u-%llu-%llu", + "%u-%lu-%lu", nr, - (unsigned long long) ucred.pid, - (unsigned long long) ucred.uid) < 0) + (unsigned long) ucred.pid, + (unsigned long) ucred.uid) < 0) return -ENOMEM; break; diff --git a/src/util.c b/src/util.c index 766aa0296..6fa9dec3a 100644 --- a/src/util.c +++ b/src/util.c @@ -446,12 +446,12 @@ int get_parent_of_pid(pid_t pid, pid_t *_ppid) { int r; FILE *f; char fn[132], line[256], *p; - long long unsigned ppid; + long unsigned ppid; assert(pid >= 0); assert(_ppid); - assert_se(snprintf(fn, sizeof(fn)-1, "/proc/%llu/stat", (unsigned long long) pid) < (int) (sizeof(fn)-1)); + assert_se(snprintf(fn, sizeof(fn)-1, "/proc/%lu/stat", (unsigned long) pid) < (int) (sizeof(fn)-1)); fn[sizeof(fn)-1] = 0; if (!(f = fopen(fn, "r"))) @@ -476,11 +476,11 @@ int get_parent_of_pid(pid_t pid, pid_t *_ppid) { if (sscanf(p, " " "%*c " /* state */ - "%llu ", /* ppid */ + "%lu ", /* ppid */ &ppid) != 1) return -EIO; - if ((long long unsigned) (pid_t) ppid != ppid) + if ((long unsigned) (pid_t) ppid != ppid) return -ERANGE; *_ppid = (pid_t) ppid; @@ -552,7 +552,7 @@ int get_process_name(pid_t pid, char **name) { assert(pid >= 1); assert(name); - if (asprintf(&p, "/proc/%llu/comm", (unsigned long long) pid) < 0) + if (asprintf(&p, "/proc/%lu/comm", (unsigned long) pid) < 0) return -ENOMEM; r = read_one_line_file(p, name); -- 2.30.2