From b81ad331b58400909d8db5876622bc49147ad277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kha=C3=AFs=20COLIN?= Date: Wed, 16 Oct 2024 15:20:28 +0200 Subject: [PATCH] chore: use correct size_t instead of t_size --- ft_bzero.c | 4 ++-- ft_memchr.c | 6 +++--- ft_memcpy.c | 6 +++--- ft_memmove.c | 6 +++--- ft_memset.c | 6 +++--- ft_strlcat.c | 10 +++++----- ft_strlcpy.c | 8 ++++---- ft_strlen.c | 4 ++-- ft_strncmp.c | 8 ++++---- libft.h | 22 +++++++++++----------- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/ft_bzero.c b/ft_bzero.c index 5f58439..73697b4 100644 --- a/ft_bzero.c +++ b/ft_bzero.c @@ -6,13 +6,13 @@ /* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/15 11:28:05 by kcolin #+# #+# */ -/* Updated: 2024/10/15 14:41:45 by kcolin ### ########.fr */ +/* Updated: 2024/10/16 15:18:24 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft.h" -void ft_bzero(void *s, t_size n) +void ft_bzero(void *s, size_t n) { ft_memset(s, 0, n); } diff --git a/ft_memchr.c b/ft_memchr.c index 851fdd4..bab9af4 100644 --- a/ft_memchr.c +++ b/ft_memchr.c @@ -12,9 +12,9 @@ #include "libft.h" -void *ft_memchr(const void *s, int c, t_size n) +void *ft_memchr(const void *s, int c, size_t n) { - t_size i; + size_t i; i = 0; while (i < n) @@ -33,7 +33,7 @@ void *ft_memchr(const void *s, int c, t_size n) int main(int argc, char **argv) { char *result; - t_size cmp_len; + size_t cmp_len; cmp_len = 5; if (argc > 2) diff --git a/ft_memcpy.c b/ft_memcpy.c index 0099c94..0ce804f 100644 --- a/ft_memcpy.c +++ b/ft_memcpy.c @@ -6,15 +6,15 @@ /* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/15 13:38:05 by kcolin #+# #+# */ -/* Updated: 2024/10/15 14:40:24 by kcolin ### ########.fr */ +/* Updated: 2024/10/16 15:18:36 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft.h" -void *ft_memcpy(void *dest, const void *src, t_size n) +void *ft_memcpy(void *dest, const void *src, size_t n) { - t_size i; + size_t i; i = 0; while (i < n) diff --git a/ft_memmove.c b/ft_memmove.c index 469258a..2ff700e 100644 --- a/ft_memmove.c +++ b/ft_memmove.c @@ -6,7 +6,7 @@ /* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/15 13:57:12 by kcolin #+# #+# */ -/* Updated: 2024/10/15 14:39:52 by kcolin ### ########.fr */ +/* Updated: 2024/10/16 15:18:46 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -25,9 +25,9 @@ * it doesn't matter how the data is copied * merge with case 2 */ -void *ft_memmove(void *dest, const void *src, t_size n) +void *ft_memmove(void *dest, const void *src, size_t n) { - t_size i; + size_t i; if (dest >= src && dest <= (src + n)) { diff --git a/ft_memset.c b/ft_memset.c index e0dd19e..0c7ecdc 100644 --- a/ft_memset.c +++ b/ft_memset.c @@ -6,15 +6,15 @@ /* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/15 10:46:44 by kcolin #+# #+# */ -/* Updated: 2024/10/15 14:42:49 by kcolin ### ########.fr */ +/* Updated: 2024/10/16 15:18:07 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft.h" -void *ft_memset(void *s, int c, t_size n) +void *ft_memset(void *s, int c, size_t n) { - t_size i; + size_t i; i = 0; while (i < n) diff --git a/ft_strlcat.c b/ft_strlcat.c index 9afbd85..0dad14d 100644 --- a/ft_strlcat.c +++ b/ft_strlcat.c @@ -6,17 +6,17 @@ /* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/15 16:00:39 by kcolin #+# #+# */ -/* Updated: 2024/10/15 16:17:34 by kcolin ### ########.fr */ +/* Updated: 2024/10/16 15:19:17 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft.h" -t_size ft_strlcat(char *dst, const char *src, t_size size) +size_t ft_strlcat(char *dst, const char *src, size_t size) { - t_size dst_len; - t_size src_len; - t_size i; + size_t dst_len; + size_t src_len; + size_t i; dst_len = 0; while (dst[dst_len] != '\0') diff --git a/ft_strlcpy.c b/ft_strlcpy.c index 8a5c108..fcfdfa0 100644 --- a/ft_strlcpy.c +++ b/ft_strlcpy.c @@ -6,22 +6,22 @@ /* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/15 14:47:09 by kcolin #+# #+# */ -/* Updated: 2024/10/15 14:53:42 by kcolin ### ########.fr */ +/* Updated: 2024/10/16 15:19:03 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft.h" -static int min(t_size a, t_size b) +static int min(size_t a, size_t b) { if (a > b) return (b); return (a); } -t_size strlcpy(char *dst, const char *src, t_size size) +size_t strlcpy(char *dst, const char *src, size_t size) { - t_size i; + size_t i; i = 0; while (src[i] != 0) diff --git a/ft_strlen.c b/ft_strlen.c index 313ae0f..3f0343f 100644 --- a/ft_strlen.c +++ b/ft_strlen.c @@ -6,13 +6,13 @@ /* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/14 15:12:02 by kcolin #+# #+# */ -/* Updated: 2024/10/15 10:17:25 by kcolin ### ########.fr */ +/* Updated: 2024/10/16 15:17:50 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft.h" -t_size ft_strlen(const char *s) +size_t ft_strlen(const char *s) { int i; diff --git a/ft_strncmp.c b/ft_strncmp.c index 1e292c5..6e2b3fc 100644 --- a/ft_strncmp.c +++ b/ft_strncmp.c @@ -6,15 +6,15 @@ /* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/16 13:23:17 by kcolin #+# #+# */ -/* Updated: 2024/10/16 13:44:38 by kcolin ### ########.fr */ +/* Updated: 2024/10/16 15:19:29 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft.h" -int ft_strncmp(const char *s1, const char *s2, t_size n) +int ft_strncmp(const char *s1, const char *s2, size_t n) { - t_size i; + size_t i; i = 0; while (s1[i] != '\0' && s2[i] != 0) @@ -34,7 +34,7 @@ int ft_strncmp(const char *s1, const char *s2, t_size n) int main(int argc, char **argv) { - t_size cmp_len; + size_t cmp_len; cmp_len = 9; if (argc > 2) diff --git a/libft.h b/libft.h index 0619fd4..d47fe2b 100644 --- a/libft.h +++ b/libft.h @@ -6,14 +6,14 @@ /* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/15 10:11:54 by kcolin #+# #+# */ -/* Updated: 2024/10/16 13:23:08 by kcolin ### ########.fr */ +/* Updated: 2024/10/16 15:16:50 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef LIBFT_H # define LIBFT_H -typedef unsigned int t_size; +# include int ft_isalpha(int c); int ft_isdigit(int c); @@ -21,22 +21,22 @@ int ft_isalnum(int c); int ft_isascii(int c); int ft_isprint(int c); -t_size ft_strlen(const char *s); +size_t ft_strlen(const char *s); -void *ft_memset(void *s, int c, t_size n); -void ft_bzero(void *s, t_size n); -void *ft_memcpy(void *dest, const void *src, t_size n); -void *ft_memmove(void *dest, const void *src, t_size n); -t_size ft_strlcpy(char *dst, const char *src, t_size size); -t_size ft_strlcat(char *dst, const char *src, t_size size); +void *ft_memset(void *s, int c, size_t n); +void ft_bzero(void *s, size_t n); +void *ft_memcpy(void *dest, const void *src, size_t n); +void *ft_memmove(void *dest, const void *src, size_t n); +size_t ft_strlcpy(char *dst, const char *src, size_t size); +size_t ft_strlcat(char *dst, const char *src, size_t size); int ft_toupper(int c); int ft_tolower(int c); char *ft_strchr(const char *s, int c); char *ft_strrchr(const char *s, int c); -int ft_strncmp(const char *s1, const char *s2, t_size n); +int ft_strncmp(const char *s1, const char *s2, size_t n); -void *ft_memchr(const void *s, int c, t_size n); +void *ft_memchr(const void *s, int c, size_t n); #endif