diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/libft.h | 143 | ||||
| -rw-r--r-- | include/libft_algo.h (renamed from include/ft_algo.h) | 6 | ||||
| -rw-r--r-- | include/libft_bt.h (renamed from include/get_next_line.h) | 33 | ||||
| -rw-r--r-- | include/libft_ctype.h | 35 | ||||
| -rw-r--r-- | include/libft_ht.h | 56 | ||||
| -rw-r--r-- | include/libft_io.h | 44 | ||||
| -rw-r--r-- | include/libft_lst.h | 47 | ||||
| -rw-r--r-- | include/libft_mem.h | 31 | ||||
| -rw-r--r-- | include/libft_printf.h | 27 | ||||
| -rw-r--r-- | include/libft_str.h | 66 | ||||
| -rw-r--r-- | include/libft_types.h | 30 |
11 files changed, 358 insertions, 160 deletions
diff --git a/include/libft.h b/include/libft.h index 888ac8c..74f074b 100644 --- a/include/libft.h +++ b/include/libft.h @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 09:45:02 by cacharle #+# #+# */ -/* Updated: 2020/01/19 08:20:37 by cacharle ### ########.fr */ +/* Updated: 2020/02/10 02:19:47 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,146 +20,15 @@ # include <limits.h> # include <errno.h> -# include "get_next_line.h" -# include "ft_algo.h" +# include "libft_types.h" +# include "libft_ctype.h" +# include "libft_io.h" +# include "libft_mem.h" +# include "libft_str.h" # ifdef __linux__ # include <stdio.h> # define OPEN_MAX FOPEN_MAX # endif -# define MIN(x, y) ((x) < (y) ? (x) : (y)) -# define MAX(x, y) ((x) > (y) ? (x) : (y)) - -typedef unsigned char t_byte; -typedef int t_bool; - -# define TRUE 1 -# define FALSE 0 - -/* -** ctype -*/ - -int ft_isalpha(int c); -int ft_isdigit(int c); -int ft_isalnum(int c); -int ft_isascii(int c); -int ft_isprint(int c); -int ft_isspace(int c); -int ft_toupper(int c); -int ft_tolower(int c); -int ft_todigit(int c); - -/* -** io -*/ - -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_strndup(const char *s1, size_t n); -int ft_printf(const char *format, ...); -int ft_sprintf(char *str, const char *format, ...); -int ft_snprintf(char *str, size_t size, - const char *format, ...); -int ft_asprintf(char **ret, const char *format, ...); -int ft_dprintf(int fd, const char *format, ...); - -int ft_vprintf(const char *format, va_list ap); -int ft_vsprintf(char *str, const char *format, va_list ap); -int ft_vsnprintf(char *str, size_t size, const char *format, - va_list ap); -int ft_vasprintf(char **ret, const char *format, va_list ap); -int ft_vdprintf(int fd, const char *format, va_list ap); - -/* -** lst -*/ - -typedef struct s_list -{ - void *content; - struct s_list *next; -} t_list; - -t_list *ft_lstnew(void const *content); -void ft_lstadd_front(t_list **alst, t_list *new); -int ft_lstsize(t_list *lst); -t_list *ft_lstlast(t_list *lst); -void ft_lstadd_back(t_list **alst, t_list *new); -void ft_lstdelone(t_list *lst, void (*del)(void *)); -void ft_lstclear(t_list **lst, void (*del)(void *)); -void ft_lstiter(t_list *lst, void (*f)(void *)); -t_list *ft_lstmap(t_list *lst, void *(*f)(void *), - void (*del)(void *)); -void ft_lstpop_front(t_list **lst, void (*del)(void *)); -t_list *ft_lstreverse_ret(t_list *lst); -void ft_lstreverse(t_list **lst); - -/* -** mem -*/ - -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_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_memalloc(size_t size); -void ft_memdel(void **ap); -void *ft_calloc(size_t count, size_t size); -void ft_memswap(void *a, void *b, size_t size); - -/* -** str -*/ - -size_t ft_strlen(const char *s); -char *ft_strdup(const char *s); -char *ft_strcpy(char *dest, const char *src); -char *ft_strncpy(char *dest, const char *src, size_t n); -char *ft_strcat(char *dest, const char *src); -char *ft_strncat(char *dest, const char *src, size_t n); -size_t ft_strlcat(char *dst, const char *src, size_t size); -size_t ft_strlcpy(char *dst, const char *src, size_t size); -char *ft_strchr(const char *s, int c); -char *ft_strrchr(const char *s, int c); -char *ft_strstr(const char *haystack, const char *needle); -char *ft_strnstr(const char *haystack, - const char *needle, size_t len); -int ft_strcmp(const char *s1, const char *s2); -int ft_strncmp(const char *s1, const char *s2, size_t n); -void ft_striter(char *s, void (*f)(char *)); -void ft_striteri(char *s, void (*f)(unsigned int, char *)); -int ft_atoi(const char *nptr); - -char *ft_strnew(size_t size); -void ft_strdel(char **as); -void ft_strclr(char *s); -char *ft_strmap(char const *s, char (*f)(char)); -char *ft_strmapi(char *s, char (*f)(unsigned int, char)); -int ft_strequ(char const *s1, char const *s2); -int ft_strnequ(char const *s1, char const *s2, size_t n); -char *ft_substr(char const *s, unsigned int start, size_t len); -char *ft_strjoin(char const *s1, char const *s2); -char *ft_strtrim(char const *s1, char const *set); -char **ft_split(char const *s, char c); - -char *ft_strjoin_free(char const *s1, char const *s2, - int free_nb); -char *ft_strjoin_free_snd(char const *s1, char const *s2); -int ft_strcount(char *str, char c); -char *ft_itoa(int n); -int ft_strict_atoi(const char *s); -long ft_strtol(const char *s, char **endptr, int base); - #endif diff --git a/include/ft_algo.h b/include/libft_algo.h index 4175cb5..4dc3353 100644 --- a/include/ft_algo.h +++ b/include/libft_algo.h @@ -6,12 +6,12 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/01/19 07:22:57 by cacharle #+# #+# */ -/* Updated: 2020/01/19 08:27:44 by cacharle ### ########.fr */ +/* Updated: 2020/02/10 02:21:47 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ -#ifndef FT_ALGO_H -# define FT_ALGO_H +#ifndef LIBFT_ALGO_H +# define LIBFT_ALGO_H typedef int t_bool; diff --git a/include/get_next_line.h b/include/libft_bt.h index 9d15202..6e2cc91 100644 --- a/include/get_next_line.h +++ b/include/libft_bt.h @@ -1,35 +1,28 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* get_next_line.h :+: :+: :+: */ +/* libft_bt.h :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2019/10/09 13:52:59 by cacharle #+# #+# */ -/* Updated: 2020/01/15 07:22:07 by cacharle ### ########.fr */ +/* Created: 2020/02/07 21:26:34 by cacharle #+# #+# */ +/* Updated: 2020/02/07 21:34:52 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ -#ifndef GET_NEXT_LINE_H -# define GET_NEXT_LINE_H +#ifndef LIBFT_BT_H +# define LIBFT_BT_H -# include <unistd.h> # include <stdlib.h> -# include <limits.h> -# include "libft.h" -# ifndef BUFFER_SIZE -# define BUFFER_SIZE 32 -# endif +typedef struct s_ftbtree +{ + void *data; + struct s_ftbtree *left; + struct s_ftbtree *right; +} t_ftbtree; -# define GNL_STATUS_LINE 1 -# define GNL_STATUS_EOF 0 -# define GNL_STATUS_ERROR -1 - -/* -** get_next_line.c -*/ - -int get_next_line(int fd, char **line); +t_ftbtree *ft_btnew(void *data); +void ft_btdestroy(t_ftbtree *tree, void (*del)(void *data)); #endif diff --git a/include/libft_ctype.h b/include/libft_ctype.h new file mode 100644 index 0000000..85e0e05 --- /dev/null +++ b/include/libft_ctype.h @@ -0,0 +1,35 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* libft_ctype.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/31 10:35:31 by cacharle #+# #+# */ +/* Updated: 2020/01/31 10:36:34 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef LIBFT_CTYPE_H +# define LIBFT_CTYPE_H + +/* +** assertion +*/ + +int ft_isalpha(int c); +int ft_isdigit(int c); +int ft_isalnum(int c); +int ft_isascii(int c); +int ft_isprint(int c); +int ft_isspace(int c); + +/* +** conversion +*/ + +int ft_toupper(int c); +int ft_tolower(int c); +int ft_todigit(int c); + +#endif diff --git a/include/libft_ht.h b/include/libft_ht.h new file mode 100644 index 0000000..8551ddb --- /dev/null +++ b/include/libft_ht.h @@ -0,0 +1,56 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* libft_ht.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/31 10:36:09 by cacharle #+# #+# */ +/* Updated: 2020/01/31 10:41:24 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef LIBFT_HT_H +# define LIBFT_HT_H + +# include "libft.h" +# include "libft_lst.h" + +typedef struct s_ftht_content +{ + char *key; + void *value; +} t_ftht_content; + +typedef t_ftlst* t_ftht_entry; + +typedef struct s_ftht +{ + t_ftsize size; + t_ftht_entry *entries; +} t_ftht; + +typedef t_ftuint t_ftht_digest; + +t_ftht_digest ft_hthash(t_ftht *ht, char *key); + +t_ftht *ft_htnew(t_ftsize size); +void ft_htdestroy(t_ftht *ht, void (*del)(t_ftht_content*)); +void ft_htdestroy_all(t_ftht *ht); +void ft_htdestroy_key(t_ftht *ht); +t_ftht_content *ft_htget(t_ftht *ht, char *key); +t_ftht_content *ft_htset(t_ftht *ht, char *key, void *value); +void ft_htdelone(t_ftht *ht, char *key, + void (*del)(t_ftht_content*)); +void ft_htdelone_key(t_ftht *ht, char *key); +t_ftht_content *ft_htcontent_new(char *key, void *value); + +/* +** internals +*/ + +void ft_inter_htdelcontent_key(t_ftht_content *content); +t_ftbool ft_inter_htkey_equal(char *ref_key, + t_ftht_content *content); + +#endif diff --git a/include/libft_io.h b/include/libft_io.h new file mode 100644 index 0000000..e1a2536 --- /dev/null +++ b/include/libft_io.h @@ -0,0 +1,44 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* libft_io.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/31 10:35:43 by cacharle #+# #+# */ +/* Updated: 2020/01/31 10:35:48 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef LIBFT_IO_H +# define LIBFT_IO_H + +# include <unistd.h> +# include <stdlib.h> +# include <limits.h> +# include "libft.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); + +# ifndef FTNL_BUFFER_SIZE +# define FTNL_BUFFER_SIZE 32 +# endif + +# define FTNL_STATUS_LINE 1 +# define FTNL_STATUS_EOF 0 +# define FTNL_STATUS_ERROR -1 + +/* +** get_next_line.c +*/ + +int ft_next_line(int fd, char **line); + +#endif diff --git a/include/libft_lst.h b/include/libft_lst.h new file mode 100644 index 0000000..d092e59 --- /dev/null +++ b/include/libft_lst.h @@ -0,0 +1,47 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* libft_lst.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/31 10:36:39 by cacharle #+# #+# */ +/* Updated: 2020/02/10 02:12:26 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef LIBFT_LST_H +# define LIBFT_LST_H + +# include <stdlib.h> +# include "libft_types.h" + +typedef struct s_ftlst +{ + void *content; + struct s_ftlst *next; +} t_ftlst; + +t_ftlst *ft_lstnew(void const *content); +void ft_lstadd_front(t_ftlst **alst, t_ftlst *new); +int ft_lstsize(t_ftlst *lst); +t_ftlst *ft_lstlast(t_ftlst *lst); +void ft_lstadd_back(t_ftlst **alst, t_ftlst *new); +void ft_lstdelone(t_ftlst *lst, void (*del)(void *)); +void ft_lstclear(t_ftlst **lst, void (*del)(void *)); +void ft_lstiter(t_ftlst *lst, void (*f)(void *)); +t_ftlst *ft_lstmap(t_ftlst *lst, void *(*f)(void *), + void (*del)(void *)); +void ft_lstpop_front(t_ftlst **lst, void (*del)(void *)); +t_ftlst *ft_lstreverse_ret(t_ftlst *lst); +void ft_lstreverse(t_ftlst **lst); +void ft_lstremove_if(t_ftlst **lst, + t_ftbool (*equal)(void *ref, void *content), void *ref, + void (*del)(void *content)); +t_ftlst *ft_lstbsearch(t_ftlst *lst, + t_ftbool (*equal)(void *ref, void *content), void *ref); +void ft_lstsort(t_ftlst **begin_list, int (*cmp)(void *, void*)); +t_ftlst *ft_lstsorted_merge(t_ftlst *l1, t_ftlst *l2, + int (*cmp)(void *, void *)); + +#endif diff --git a/include/libft_mem.h b/include/libft_mem.h new file mode 100644 index 0000000..5465d72 --- /dev/null +++ b/include/libft_mem.h @@ -0,0 +1,31 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* libft_mem.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/31 10:35:57 by cacharle #+# #+# */ +/* Updated: 2020/01/31 10:35:59 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef LIBFT_MEM_H +# define LIBFT_MEM_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); + +/* +** bloat ? +*/ + +void ft_memdel(void **ap); + +#endif diff --git a/include/libft_printf.h b/include/libft_printf.h new file mode 100644 index 0000000..8e64208 --- /dev/null +++ b/include/libft_printf.h @@ -0,0 +1,27 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* libft_printf.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/31 10:36:47 by cacharle #+# #+# */ +/* Updated: 2020/01/31 10:36:51 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef LIBFT_PRINTF_H +# define LIBFT_PRINTF_H + +int ft_printf(const char *format, ...); +int ft_sprintf(char *str, const char *format, ...); +int ft_snprintf(char *str, size_t size, const char *format, ...); +int ft_asprintf(char **ret, const char *format, ...); +int ft_dprintf(int fd, const char *format, ...); +int ft_vprintf(const char *format, va_list ap); +int ft_vsprintf(char *str, const char *format, va_list ap); +int ft_vsnprintf(char *str, size_t size, const char *format, va_list ap); +int ft_vasprintf(char **ret, const char *format, va_list ap); +int ft_vdprintf(int fd, const char *format, va_list ap); + +#endif diff --git a/include/libft_str.h b/include/libft_str.h new file mode 100644 index 0000000..e44c995 --- /dev/null +++ b/include/libft_str.h @@ -0,0 +1,66 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* libft_str.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/31 10:39:22 by cacharle #+# #+# */ +/* Updated: 2020/01/31 10:39:26 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef LIBFT_STR_H +# define LIBFT_STR_H + +/* +** std +*/ + +size_t ft_strlen(const char *s); +char *ft_strcpy(char *dest, const char *src); +char *ft_strncpy(char *dest, const char *src, size_t n); +char *ft_strdup(const char *s); +char *ft_strndup(const char *s1, size_t n); +char *ft_strcat(char *dest, const char *src); +char *ft_strncat(char *dest, const char *src, size_t n); +size_t ft_strlcat(char *dst, const char *src, size_t size); +size_t ft_strlcpy(char *dst, const char *src, size_t size); +char *ft_strchr(const char *s, int c); +char *ft_strrchr(const char *s, int c); +char *ft_strstr(const char *haystack, const char *needle); +char *ft_strnstr(const char *haystack, const char *needle, size_t len); +int ft_strcmp(const char *s1, const char *s2); +int ft_strncmp(const char *s1, const char *s2, size_t n); +int ft_atoi(const char *nptr); + +/* +** extra +*/ + +void ft_striter(char *s, void (*f)(char *)); +void ft_striteri(char *s, void (*f)(unsigned int, char *)); +char *ft_substr(char const *s, unsigned int start, size_t len); +char *ft_strjoin(char const *s1, char const *s2); +char *ft_strtrim(char const *s1, char const *set); +char **ft_split(char const *s, char c); +char *ft_strjoin_free(char const *s1, char const *s2, int free_nb); +char *ft_strjoin_free_snd(char const *s1, char const *s2); +int ft_strcount(char *str, char c); +char *ft_itoa(int n); +int ft_strict_atoi(const char *s); +long ft_strtol(const char *s, char **endptr, int base); + +/* +** bloat ? +*/ + +char *ft_strnew(size_t size); +void ft_strdel(char **as); +void ft_strclr(char *s); +char *ft_strmap(char const *s, char (*f)(char)); +char *ft_strmapi(char *s, char (*f)(unsigned int, char)); +int ft_strequ(char const *s1, char const *s2); +int ft_strnequ(char const *s1, char const *s2, size_t n); + +#endif diff --git a/include/libft_types.h b/include/libft_types.h new file mode 100644 index 0000000..8df4e00 --- /dev/null +++ b/include/libft_types.h @@ -0,0 +1,30 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* libft_types.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/31 10:36:56 by cacharle #+# #+# */ +/* Updated: 2020/01/31 10:37:01 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef LIBFT_TYPES_H +# define LIBFT_TYPES_H + +# define TRUE 1 +# define FALSE 0 + +typedef unsigned char t_ftbyte; +typedef int t_ftbool; +typedef unsigned int t_ftsize; + +typedef char t_ftchar; +typedef unsigned char t_ftuchar; +typedef int t_ftint; +typedef unsigned int t_ftuint; +typedef long int t_ftlong; +typedef unsigned long int t_ftulong; + +#endif |
