From: Alejandro Colomar Date: Sat, 2 Sep 2023 12:21:49 +0000 (+0200) Subject: lib/strlcpy.[ch]: Fix return type X-Git-Tag: 4.15.0-rc1~137 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f279311550a6f750fe95368c02b6b19778c3c02;p=thirdparty%2Fshadow.git lib/strlcpy.[ch]: Fix return type To return an error code, we need ssize_t. Signed-off-by: Alejandro Colomar --- diff --git a/lib/strlcpy.c b/lib/strlcpy.c index fab04feda..ffb83e0ce 100644 --- a/lib/strlcpy.c +++ b/lib/strlcpy.c @@ -6,10 +6,13 @@ #include +#include +#include + #ident "$Id$" #include "strlcpy.h" -extern inline size_t strlcpy_(char *restrict dst, const char *restrict src, +extern inline ssize_t strlcpy_(char *restrict dst, const char *restrict src, size_t size); diff --git a/lib/strlcpy.h b/lib/strlcpy.h index e725078b4..c44819c6b 100644 --- a/lib/strlcpy.h +++ b/lib/strlcpy.h @@ -12,6 +12,7 @@ #include #include +#include #include "sizeof.h" @@ -45,11 +46,11 @@ #define STRLCPY(dst, src) strlcpy_(dst, src, SIZEOF_ARRAY(dst)) -inline size_t strlcpy_(char *restrict dst, const char *restrict src, +inline ssize_t strlcpy_(char *restrict dst, const char *restrict src, size_t size); -inline size_t +inline ssize_t strlcpy_(char *restrict dst, const char *restrict src, size_t size) { size_t len;