diff options
| -rw-r--r-- | lib/plymouth-ctrl.c | 3 | ||||
| -rw-r--r-- | login-utils/last.c | 2 | ||||
| -rw-r--r-- | misc-utils/test_uuidd.c | 10 | ||||
| -rw-r--r-- | sys-utils/hwclock.h | 1 | ||||
| -rw-r--r-- | sys-utils/prlimit.c | 4 |
5 files changed, 11 insertions, 9 deletions
diff --git a/lib/plymouth-ctrl.c b/lib/plymouth-ctrl.c index 75d8b9342..0e60341a1 100644 --- a/lib/plymouth-ctrl.c +++ b/lib/plymouth-ctrl.c @@ -85,7 +85,8 @@ static int open_un_socket_and_connect(void) * Please note that the PLYMOUTH_SOCKET_PATH has a * leading NULL byte to mark it as an abstract socket */ - ret = connect(fd, &su, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(su.sun_path+1)); + ret = connect(fd, (const struct sockaddr *) &su, + offsetof(struct sockaddr_un, sun_path) + 1 + strlen(su.sun_path+1)); if (ret < 0) { if (errno != ECONNREFUSED) warnx(_("cannot connect on UNIX socket")); diff --git a/login-utils/last.c b/login-utils/last.c index 679ea6c12..f93ec7fbf 100644 --- a/login-utils/last.c +++ b/login-utils/last.c @@ -503,7 +503,7 @@ static int list(const struct last_control *ctl, struct utmpx *p, time_t logout_t */ r = -1; if (ctl->usedns || ctl->useip) - r = dns_lookup(domain, sizeof(domain), ctl->useip, p->ut_addr_v6); + r = dns_lookup(domain, sizeof(domain), ctl->useip, (int32_t*)p->ut_addr_v6); if (r < 0) { size_t sz = sizeof(p->ut_host); diff --git a/misc-utils/test_uuidd.c b/misc-utils/test_uuidd.c index 73cc90a17..9883cbf29 100644 --- a/misc-utils/test_uuidd.c +++ b/misc-utils/test_uuidd.c @@ -183,8 +183,8 @@ static void create_nthreads(process_t *proc, size_t index) break; } - LOG(2, (stderr, "%d: started thread [tid=%d,index=%zu]\n", - proc->pid, (int) th->tid, th->index)); + LOG(2, (stderr, "%d: started thread [tid=%jd,index=%zu]\n", + proc->pid, (intmax_t) th->tid, th->index)); index += nobjects; ncreated++; } @@ -203,8 +203,8 @@ static void create_nthreads(process_t *proc, size_t index) err(EXIT_FAILURE, "pthread_join failed"); } - LOG(2, (stderr, "%d: thread exited [tid=%d,return=%d]\n", - proc->pid, (int) th->tid, th->retval)); + LOG(2, (stderr, "%d: thread exited [tid=%jd,return=%d]\n", + proc->pid, (intmax_t) th->tid, th->retval)); } } @@ -256,7 +256,7 @@ static void object_dump(size_t idx, object_t *obj) fprintf(stderr, " uuid: <%s>\n", p); fprintf(stderr, " idx: %zu\n", obj->idx); fprintf(stderr, " process: %d\n", (int) obj->pid); - fprintf(stderr, " thread: %d\n", (int) obj->tid); + fprintf(stderr, " thread: %jd\n", (intmax_t) obj->tid); fprintf(stderr, "}\n"); } diff --git a/sys-utils/hwclock.h b/sys-utils/hwclock.h index 7d2cc45ac..f3f76a6da 100644 --- a/sys-utils/hwclock.h +++ b/sys-utils/hwclock.h @@ -5,6 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/time.h> #include <time.h> #include "c.h" diff --git a/sys-utils/prlimit.c b/sys-utils/prlimit.c index a62d457fe..afd19281b 100644 --- a/sys-utils/prlimit.c +++ b/sys-utils/prlimit.c @@ -364,12 +364,12 @@ static void do_prlimit(struct list_head *lims) if (new->rlim_cur == RLIM_INFINITY) printf("<%s", _("unlimited")); else - printf("<%ju", new->rlim_cur); + printf("<%ju", (uintmax_t)new->rlim_cur); if (new->rlim_max == RLIM_INFINITY) printf(":%s>\n", _("unlimited")); else - printf(":%ju>\n", new->rlim_max); + printf(":%ju>\n", (uintmax_t)new->rlim_max); } if (prlimit(pid, lim->desc->resource, new, old) == -1) |