From dd0c485ac4975b7dd6d2e230213be1da50d0a065 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Fri, 18 Sep 2020 16:39:52 +0200 Subject: Removing unnecessary stuff --- include/libft.h | 28 +++++++++------- include/libft_algo.h | 59 ---------------------------------- include/libft_bt.h | 28 ---------------- include/libft_ctype.h | 36 --------------------- include/libft_ht.h | 57 --------------------------------- include/libft_io.h | 46 --------------------------- include/libft_lst.h | 54 ------------------------------- include/libft_mem.h | 39 ----------------------- include/libft_printf.h | 27 ---------------- include/libft_str.h | 86 -------------------------------------------------- include/libft_types.h | 30 ------------------ 11 files changed, 17 insertions(+), 473 deletions(-) delete mode 100644 include/libft_algo.h delete mode 100644 include/libft_bt.h delete mode 100644 include/libft_ctype.h delete mode 100644 include/libft_ht.h delete mode 100644 include/libft_io.h delete mode 100644 include/libft_lst.h delete mode 100644 include/libft_mem.h delete mode 100644 include/libft_printf.h delete mode 100644 include/libft_str.h delete mode 100644 include/libft_types.h (limited to 'include') diff --git a/include/libft.h b/include/libft.h index 74f074b..8f949f2 100644 --- a/include/libft.h +++ b/include/libft.h @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 09:45:02 by cacharle #+# #+# */ -/* Updated: 2020/02/10 02:19:47 by cacharle ### ########.fr */ +/* Updated: 2020/09/18 16:37:45 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,21 +14,27 @@ # define LIBFT_H # include -# include -# include -# include +# include # include -# include - -# include "libft_types.h" -# include "libft_ctype.h" -# include "libft_io.h" -# include "libft_mem.h" -# include "libft_str.h" # ifdef __linux__ # include # define OPEN_MAX FOPEN_MAX # endif +size_t ft_strlen(const char *s); + +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_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); + #endif diff --git a/include/libft_algo.h b/include/libft_algo.h deleted file mode 100644 index 7223e7b..0000000 --- a/include/libft_algo.h +++ /dev/null @@ -1,59 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_algo.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: cacharle +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/01/19 07:22:57 by cacharle #+# #+# */ -/* Updated: 2020/02/10 05:58:26 by cacharle ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef LIBFT_ALGO_H -# define LIBFT_ALGO_H - -# include -# include -# include "libft_mem.h" -# include "libft_types.h" - -typedef int (*t_ftcompar_func)(const void*, const void*); - -typedef struct -{ - int lo; - int hi; -} t_ftrange; - -struct s_merge_sorted_arrays -{ - void *base; - void *left; - void *right; -}; - -typedef struct s_ft_search_const -{ - const void *key; - t_ftcompar_func compar; -} t_ftsearch_const; - -t_ftbool ft_is_set(void *base, size_t nel, size_t width, - t_ftcompar_func compar); -int ft_compar_int(const void *a, const void *b); -void ft_qsort(void *base, size_t nel, size_t width, - t_ftcompar_func compar); -int ft_mergesort(void *base, size_t nel, size_t width, - int (*compar)(const void *, const void *)); -int ft_heapsort(void *base, size_t nel, size_t width, - int (*compar)(const void *, const void *)); -void ft_reverse(void *base, size_t nel, size_t width); -void *ft_bsearch(const void *base, size_t nel, size_t width, - t_ftsearch_const *consts); -void *ft_lfind(const void *base, size_t *nelp, size_t width, - t_ftsearch_const *consts); -void *ft_lsearch(const void *base, size_t *nelp, size_t width, - t_ftsearch_const *consts); - -#endif diff --git a/include/libft_bt.h b/include/libft_bt.h deleted file mode 100644 index 6e2cc91..0000000 --- a/include/libft_bt.h +++ /dev/null @@ -1,28 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* libft_bt.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: cacharle +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/02/07 21:26:34 by cacharle #+# #+# */ -/* Updated: 2020/02/07 21:34:52 by cacharle ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef LIBFT_BT_H -# define LIBFT_BT_H - -# include - -typedef struct s_ftbtree -{ - void *data; - struct s_ftbtree *left; - struct s_ftbtree *right; -} t_ftbtree; - -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 deleted file mode 100644 index ad42c64..0000000 --- a/include/libft_ctype.h +++ /dev/null @@ -1,36 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* libft_ctype.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: cacharle +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/01/31 10:35:31 by cacharle #+# #+# */ -/* Updated: 2020/02/10 05:18:30 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); -int ft_isblank(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 deleted file mode 100644 index 62f2ee1..0000000 --- a/include/libft_ht.h +++ /dev/null @@ -1,57 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* libft_ht.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: cacharle +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/01/31 10:36:09 by cacharle #+# #+# */ -/* Updated: 2020/02/19 02:38:28 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); -void *ft_htget(t_ftht *ht, char *key); -t_ftht_content *ft_htset(t_ftht *ht, char *key, void *value, - void (*del)(t_ftht_content*)); -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); -int ft_inter_htkey_cmp(const void *ref_key, - const void *content); - -#endif diff --git a/include/libft_io.h b/include/libft_io.h deleted file mode 100644 index 76bce17..0000000 --- a/include/libft_io.h +++ /dev/null @@ -1,46 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* libft_io.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: cacharle +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/01/31 10:35:43 by cacharle #+# #+# */ -/* Updated: 2020/02/14 02:23:43 by cacharle ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef LIBFT_IO_H -# define LIBFT_IO_H - -# include -# include -# include -# 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); - -char ft_getchar(void); - -# 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 deleted file mode 100644 index a48c1aa..0000000 --- a/include/libft_lst.h +++ /dev/null @@ -1,54 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* libft_lst.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: cacharle +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/01/31 10:36:39 by cacharle #+# #+# */ -/* Updated: 2020/02/17 03:05:36 by cacharle ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef LIBFT_LST_H -# define LIBFT_LST_H - -# include -# include "libft_types.h" -# include "libft_algo.h" - -typedef struct s_ftlst -{ - void *content; - struct s_ftlst *next; -} t_ftlst; - -typedef void (*t_ftdel_func)(void *); - -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 *), - t_ftdel_func del); -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_ftcompar_func cmp, const void *ref, - t_ftdel_func del); -t_ftlst *ft_lstbsearch(t_ftlst *lst, t_ftcompar_func cmp, - const void *ref); -t_ftlst *ft_lstlsearch(t_ftlst *lst, t_ftcompar_func cmp, - const void *ref); -t_ftlst *ft_lstlfind(t_ftlst *lst, t_ftcompar_func cmp, - const void *ref); -void ft_lstsort(t_ftlst **begin_list, t_ftcompar_func cmp); -t_ftlst *ft_lstsorted_merge(t_ftlst *l1, t_ftlst *l2, - t_ftcompar_func cmp); - -#endif diff --git a/include/libft_mem.h b/include/libft_mem.h deleted file mode 100644 index a15c020..0000000 --- a/include/libft_mem.h +++ /dev/null @@ -1,39 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* libft_mem.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: cacharle +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/01/31 10:35:57 by cacharle #+# #+# */ -/* Updated: 2020/02/13 03:11:09 by cacharle ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef LIBFT_MEM_H -# define LIBFT_MEM_H - -# include -# include "libft_types.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); - -/* -** bloat ? -*/ - -void ft_memdel(void **ap); - -#endif diff --git a/include/libft_printf.h b/include/libft_printf.h deleted file mode 100644 index 8e64208..0000000 --- a/include/libft_printf.h +++ /dev/null @@ -1,27 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* libft_printf.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: cacharle +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* 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 deleted file mode 100644 index 582ef00..0000000 --- a/include/libft_str.h +++ /dev/null @@ -1,86 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* libft_str.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: cacharle +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/01/31 10:39:22 by cacharle #+# #+# */ -/* Updated: 2020/02/14 03:45:15 by cacharle ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef LIBFT_STR_H -# define LIBFT_STR_H - -# include -# include "libft_ctype.h" - -typedef enum -{ - FT_STRJOINF_FST, - FT_STRJOINF_SND, - FT_STRJOINF_ALL -} t_ftstrjoinf_tag; - -/* -** 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_strjoinf(char const *s1, char const *s2, t_ftstrjoinf_tag tag); -char *ft_strtrim(char const *s1, char const *set); -char **ft_split(char const *s, char c); -int ft_strcount(char *str, char c); -char *ft_itoa(int n); -int ft_atoi_strict(const char *s); -long ft_strtol(const char *s, char **endptr, int base); -int ft_strcasecmp(const char *s1, const char *s2); -int ft_strncasecmp(const char *s1, const char *s2, size_t n); -size_t ft_strspn(const char *s, const char *charset); -size_t ft_strcspn(const char *s, const char *charset); -char *ft_strpbrk(const char *s, const char *charset); -char *ft_strsep(char **stringp, const char *delim); -size_t ft_strnlen(const char *s, size_t maxlen); -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_strtolower(char *s); -char *ft_strtoupper(char *s); - -/* -** bloat ? -*/ - -/* -** char *ft_strnew(size_t size); -** void ft_strdel(char **as); -** void ft_strclr(char *s); -*/ - -#endif diff --git a/include/libft_types.h b/include/libft_types.h deleted file mode 100644 index 20fe0f7..0000000 --- a/include/libft_types.h +++ /dev/null @@ -1,30 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* libft_types.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: cacharle +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/01/31 10:36:56 by cacharle #+# #+# */ -/* Updated: 2020/02/13 03:07:56 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 -- cgit