From b9f000a80cbba38b8f21c9737a42f07573ec7b91 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 11 May 2020 16:14:38 +0200 Subject: Moved util/ft_split* in str, Added ft_memjoin and ft_memjoinf1, Modified ft_getfile so that it can read non-ascii file --- include/libft_io.h | 31 +++++++++++++++++++------------ include/libft_mem.h | 34 ++++++++++++++++++---------------- include/libft_rbt.h | 3 +-- include/libft_str.h | 5 +++-- include/libft_util.h | 22 ---------------------- 5 files changed, 41 insertions(+), 54 deletions(-) delete mode 100644 include/libft_util.h (limited to 'include') diff --git a/include/libft_io.h b/include/libft_io.h index ce3c632..b64603b 100644 --- a/include/libft_io.h +++ b/include/libft_io.h @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/01/31 10:35:43 by cacharle #+# #+# */ -/* Updated: 2020/05/11 09:57:42 by charles ### ########.fr */ +/* Updated: 2020/05/11 16:12:41 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,23 +17,30 @@ # include # include # include "libft.h" +# include "libft_def.h" -void ft_putendl(char *s); -void ft_putchar(char c); -void ft_putstr(char const *s); -void ft_putnbr(int n); -void ft_putchar_fd(char c, int fd); -void ft_putstr_fd(char *s, int fd); -void ft_putendl_fd(char *s, int fd); -void ft_putnbr_fd(int n, int fd); +void ft_putendl(char *s); +void ft_putchar(char c); +void ft_putstr(char const *s); +void ft_putnbr(int n); +void ft_putchar_fd(char c, int fd); +void ft_putstr_fd(char *s, int fd); +void ft_putendl_fd(char *s, int fd); +void ft_putnbr_fd(int n, int fd); -char ft_getchar(void); +char ft_getchar(void); # ifndef FT_GETFILE_BUFFER_SIZE # define FT_GETFILE_BUFFER_SIZE 64 # endif -char *ft_getfile(int fd); +typedef struct s_ftmem +{ + void *data; + size_t size; +} t_ftmem; + +int ft_getfile(int fd, t_ftmem *mem); # ifndef FT_GETLINE_BUFFER_SIZE # define FT_GETLINE_BUFFER_SIZE 64 @@ -47,6 +54,6 @@ char *ft_getfile(int fd); ** getline.c */ -int ft_getline(int fd, char **line); +int ft_getline(int fd, char **line); #endif diff --git a/include/libft_mem.h b/include/libft_mem.h index f26180d..8f7b276 100644 --- a/include/libft_mem.h +++ b/include/libft_mem.h @@ -6,34 +6,36 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/01/31 10:35:57 by cacharle #+# #+# */ -/* Updated: 2020/05/09 12:28:55 by charles ### ########.fr */ +/* Updated: 2020/05/11 15:22:04 by charles ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef LIBFT_MEM_H # define LIBFT_MEM_H -# include +# include # include "libft_def.h" -void ft_bzero(void *s, size_t n); -void *ft_memset(void *s, int c, size_t n); -void *ft_memcpy(void *dest, const void *src, size_t n); -void *ft_memccpy(void *dest, const void *src, int c, size_t n); -void *ft_memmove(void *dst, const void *src, size_t len); -void *ft_memchr(const void *s, int c, size_t n); -int ft_memcmp(const void *s1, const void *s2, size_t n); -void *ft_calloc(size_t count, size_t size); -void ft_memswap(void *a, void *b, size_t size); -void *ft_memmem(const void *big, size_t big_len, - const void *little, size_t little_len); -void ft_memset_pattern4(void *b, const void *pattern4, - size_t len); +void ft_bzero(void *s, size_t n); +void *ft_memset(void *s, int c, size_t n); +void *ft_memcpy(void *dest, const void *src, size_t n); +void *ft_memccpy(void *dest, const void *src, int c, size_t n); +void *ft_memmove(void *dst, const void *src, size_t len); +void *ft_memchr(const void *s, int c, size_t n); +int ft_memcmp(const void *s1, const void *s2, size_t n); +void *ft_calloc(size_t count, size_t size); +void ft_memswap(void *a, void *b, size_t size); +void ft_memset_pattern4(void *b, const void *pattern4, size_t len); +void *ft_memjoin(void *m1, size_t m1_size, void *m2, size_t m2_size); +void *ft_memjoinf1(void *m1, size_t m1_size, void *m2, size_t m2_size); +void *ft_memmem( + const void *big, size_t big_len, + const void *little, size_t little_len); /* ** bloat ? */ -void ft_memdel(void **ap); +void ft_memdel(void **ap); #endif diff --git a/include/libft_rbt.h b/include/libft_rbt.h index 57653cc..6865cdf 100644 --- a/include/libft_rbt.h +++ b/include/libft_rbt.h @@ -6,7 +6,7 @@ /* By: charles +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/26 16:09:51 by charles #+# #+# */ -/* Updated: 2020/04/26 20:25:36 by charles ### ########.fr */ +/* Updated: 2020/05/11 16:11:16 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -92,5 +92,4 @@ t_ftrbt *ft_rbtinsert( void *data, int (*cmp)(void*, void*)); - #endif diff --git a/include/libft_str.h b/include/libft_str.h index 83c4428..383c393 100644 --- a/include/libft_str.h +++ b/include/libft_str.h @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/01/31 10:39:22 by cacharle #+# #+# */ -/* Updated: 2020/05/10 21:05:21 by charles ### ########.fr */ +/* Updated: 2020/05/11 15:52:40 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,7 +17,6 @@ # include # include "libft_ctype.h" # include "libft_mem.h" -# include "libft_util.h" typedef enum { @@ -93,6 +92,8 @@ bool ft_fnmatch(const char *pattern, const char *string); char *ft_strsjoin(char **strs, char *delim); char *ft_strsjoinf(char **strs, char *delim); +void *ft_strsdestroy(char **strs); +size_t ft_strslen(char **strs); /* ** bloat ? diff --git a/include/libft_util.h b/include/libft_util.h deleted file mode 100644 index 99e7a00..0000000 --- a/include/libft_util.h +++ /dev/null @@ -1,22 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* libft_util.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: cacharle +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/02/27 17:51:36 by cacharle #+# #+# */ -/* Updated: 2020/05/10 21:02:02 by charles ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef LIBFT_UTIL_H -# define LIBFT_UTIL_H - -# include -# include - -void *ft_split_destroy(char **strs); -size_t ft_split_len(char **split); - -#endif -- cgit