From 496afe8e8a82d6db730bf835eb5fbe1ef3a142be Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 15 Jan 2020 11:40:48 +0100 Subject: Added ft_strtol, ft_isspace, ft_todigit, ft_strict_atoi, modified ft_atoi to use ft_strtol --- include/libft.h | 144 +++++++++++++++++++++++++++----------------------------- 1 file changed, 70 insertions(+), 74 deletions(-) (limited to 'include/libft.h') diff --git a/include/libft.h b/include/libft.h index 3777f8a..e81f262 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/01/15 10:03:22 by cacharle ### ########.fr */ +/* Updated: 2020/01/15 11:33:27 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,6 +18,7 @@ # include # include # include +# include # include "get_next_line.h" # define TRUE 1 @@ -33,7 +34,70 @@ typedef int t_bool; # define FALSE 0 /* -** memory +** 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 *)); + +/* +** mem */ void *ft_memset(void *s, int c, size_t n); @@ -46,9 +110,10 @@ 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); /* -** string +** str */ size_t ft_strlen(const char *s); @@ -86,78 +151,9 @@ 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); - -/* -** character -*/ - -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_toupper(int c); -int ft_tolower(int c); - -/* -** allocation -*/ - -void *ft_calloc(size_t count, size_t size); char *ft_itoa(int n); +int ft_strict_atoi(const char *s); +long ft_strtol(const char *s, char **endptr, int base); -/* -** fildes -*/ - -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); - -/* -** list -*/ - -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 *)); - -/* -** ft_*printf -*/ - -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 -- cgit