From 43fe67e2f9d2f0dd4ef4bc670cd67ad17fe3fb0b Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 12 Feb 2023 23:02:24 +0100 Subject: [PATCH] lib: Fix compile warnings. * lib/linux/read.c (read): Add casts. * lib/linux/signal.c (signal): Likewise. * lib/stdio/vfscanf.c: Include stdlib.h. (vfscanf): Add cast. * lib/stdlib/mbstowcs.c (mbstowcs): Add cast. --- lib/linux/read.c | 4 ++-- lib/linux/signal.c | 4 ++-- lib/stdio/vfscanf.c | 5 +++-- lib/stdlib/mbstowcs.c | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/linux/read.c b/lib/linux/read.c index d91f81b2..a57cff4a 100644 --- a/lib/linux/read.c +++ b/lib/linux/read.c @@ -1,6 +1,6 @@ /* -*-comment-start: "//";comment-end:""-*- * GNU Mes --- Maxwell Equations of Software - * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen + * Copyright © 2016,2017,2018,2019,2023 Jan (janneke) Nieuwenhuizen * * This file is part of GNU Mes. * @@ -27,7 +27,7 @@ ssize_t read (int filedes, void *buffer, size_t size) { long long_filedes = filedes; - ssize_t bytes = _sys_call3 (SYS_read, long_filedes, buffer, size); + ssize_t bytes = _sys_call3 (SYS_read, long_filedes, (long) buffer, (long) size); if (__mes_debug () > 4) { if (bytes == 1) diff --git a/lib/linux/signal.c b/lib/linux/signal.c index 23cf106d..1950f767 100644 --- a/lib/linux/signal.c +++ b/lib/linux/signal.c @@ -1,6 +1,6 @@ /* -*-comment-start: "//";comment-end:""-*- * GNU Mes --- Maxwell Equations of Software - * Copyright © 2018,2019,2022 Jan (janneke) Nieuwenhuizen + * Copyright © 2018,2019,2022,2023 Jan (janneke) Nieuwenhuizen * * This file is part of GNU Mes. * @@ -36,7 +36,7 @@ sighandler_t signal (int signum, sighandler_t action) { #if __i386__ - return _sys_call2 (SYS_signal, signum, action); + return (sighandler_t) _sys_call2 (SYS_signal, signum, (long) action); #else static struct sigaction setup_action = { 0 }; static struct sigaction old = { 0 }; diff --git a/lib/stdio/vfscanf.c b/lib/stdio/vfscanf.c index b1083a56..c18bd1d5 100644 --- a/lib/stdio/vfscanf.c +++ b/lib/stdio/vfscanf.c @@ -1,6 +1,6 @@ /* -*-comment-start: "//";comment-end:""-*- * GNU Mes --- Maxwell Equations of Software - * Copyright © 2017,2018,2019 Jan (janneke) Nieuwenhuizen + * Copyright © 2017,2018,2019,2023 Jan (janneke) Nieuwenhuizen * * This file is part of GNU Mes. * @@ -22,6 +22,7 @@ #include #include #include +#include int vfscanf (FILE * stream, char const *template, va_list ap) @@ -76,7 +77,7 @@ vfscanf (FILE * stream, char const *template, va_list ap) ungetc (p, stream); *q = 0; q = buf; - *d = abtol (&q, 10); + *d = abtol ((char const**)&q, 10); count++; break; } diff --git a/lib/stdlib/mbstowcs.c b/lib/stdlib/mbstowcs.c index 543464b3..397fe603 100644 --- a/lib/stdlib/mbstowcs.c +++ b/lib/stdlib/mbstowcs.c @@ -1,6 +1,6 @@ /* -*-comment-start: "//";comment-end:""-*- * GNU Mes --- Maxwell Equations of Software - * Copyright © 2018 Jan (janneke) Nieuwenhuizen + * Copyright © 2018,2023 Jan (janneke) Nieuwenhuizen * * This file is part of GNU Mes. * @@ -30,6 +30,6 @@ mbstowcs (wchar_t * wstring, char const *string, size_t size) if (__mes_debug () && !stub) eputs ("mbstowcs stub\n"); stub = 1; - strcpy (wstring, string); + strcpy ((char*)wstring, string); return strlen (string); }