Prettier output and some fixes (#4)
* feat: tab results * feat: more colors * style: norm * fix: patch a spacing bug * fix: patch a small issue * fix: patch some leaks * style: norm
This commit is contained in:
@@ -43,8 +43,8 @@ static long long int ft_atoll(const char *nptr)
|
||||
if (nptr[i] == '-' && ft_isdigit(nptr[i + 1]))
|
||||
{
|
||||
res = -1 * ft_atoll(&nptr[i] + 1);
|
||||
if ((nptr[i + 1] != '1' && res == 1)
|
||||
|| (nptr[i + 1] == '1' && ft_isdigit(nptr[i + 2]) && res == 1))
|
||||
if ((nptr[i + 1] != '1' && res == 1) || (nptr[i + 1] == '1'
|
||||
&& ft_isdigit(nptr[i + 2]) && res == 1))
|
||||
return (0);
|
||||
return (res);
|
||||
}
|
||||
@@ -57,6 +57,6 @@ int ft_atoi(const char *nptr)
|
||||
{
|
||||
int res;
|
||||
|
||||
res = (int) ft_atoll(nptr);
|
||||
res = (int)ft_atoll(nptr);
|
||||
return (res);
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ void ft_bzero(void *s, size_t n)
|
||||
{
|
||||
while (n > 0)
|
||||
{
|
||||
*((unsigned char *) s) = '\0';
|
||||
*((unsigned char *)s) = '\0';
|
||||
s++;
|
||||
n--;
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "libft.h"
|
||||
|
||||
t_list *ft_lstnew(void *content)
|
||||
t_list *ft_lstnew(void *content)
|
||||
{
|
||||
t_list *new_lst;
|
||||
|
||||
|
||||
@@ -16,10 +16,10 @@ void *ft_memchr(const void *s, int c, size_t n)
|
||||
{
|
||||
void *ptr;
|
||||
|
||||
ptr = (void *) s;
|
||||
ptr = (void *)s;
|
||||
while (n > 0)
|
||||
{
|
||||
if (*((unsigned char *) ptr) == (unsigned char) c)
|
||||
if (*((unsigned char *)ptr) == (unsigned char)c)
|
||||
return (ptr);
|
||||
ptr++;
|
||||
n--;
|
||||
|
||||
@@ -19,9 +19,9 @@ int ft_memcmp(const void *s1, const void *s2, size_t n)
|
||||
i = 0;
|
||||
while (i < n)
|
||||
{
|
||||
if (((unsigned char *) s1)[i] > ((unsigned char *) s2)[i])
|
||||
if (((unsigned char *)s1)[i] > ((unsigned char *)s2)[i])
|
||||
return (1);
|
||||
if (((unsigned char *) s1)[i] < ((unsigned char *) s2)[i])
|
||||
if (((unsigned char *)s1)[i] < ((unsigned char *)s2)[i])
|
||||
return (-1);
|
||||
i++;
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ void *ft_memcpy(void *dest, const void *src, size_t n)
|
||||
i = 0;
|
||||
while (i < n)
|
||||
{
|
||||
((unsigned char *) dest)[i] = ((unsigned char *) src)[i];
|
||||
((unsigned char *)dest)[i] = ((unsigned char *)src)[i];
|
||||
i++;
|
||||
}
|
||||
return (dest);
|
||||
|
||||
@@ -19,10 +19,10 @@ static void *ft_rev_memcpy(void *dest, const void *src, size_t n)
|
||||
n--;
|
||||
while (n > 0)
|
||||
{
|
||||
((unsigned char *) dest)[n] = ((unsigned char *) src)[n];
|
||||
((unsigned char *)dest)[n] = ((unsigned char *)src)[n];
|
||||
n--;
|
||||
}
|
||||
((unsigned char *) dest)[n] = ((unsigned char *) src)[n];
|
||||
((unsigned char *)dest)[n] = ((unsigned char *)src)[n];
|
||||
return (dest);
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ void *ft_memset(void *s, int c, size_t n)
|
||||
i = 0;
|
||||
while (i < n)
|
||||
{
|
||||
((unsigned char *) s)[i] = c;
|
||||
((unsigned char *)s)[i] = c;
|
||||
i++;
|
||||
}
|
||||
return (s);
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
|
||||
static size_t strs_size(const char *s, unsigned char c)
|
||||
{
|
||||
int i;
|
||||
int j;
|
||||
int i;
|
||||
int j;
|
||||
|
||||
i = 0;
|
||||
j = 0;
|
||||
@@ -28,7 +28,7 @@ static size_t strs_size(const char *s, unsigned char c)
|
||||
return (i);
|
||||
}
|
||||
|
||||
static int next_match(char *str, unsigned char c)
|
||||
static int next_match(char *str, unsigned char c)
|
||||
{
|
||||
int i;
|
||||
|
||||
@@ -68,7 +68,7 @@ char **ft_split(char const *s, char c)
|
||||
{
|
||||
if ((s[j] != c && j == 0) || (s[j] != c && s[j - 1] == c))
|
||||
{
|
||||
strs[i] = ft_substr(&s[j], 0, next_match((char *) &s[j], c));
|
||||
strs[i] = ft_substr(&s[j], 0, next_match((char *)&s[j], c));
|
||||
if (!strs[i++])
|
||||
{
|
||||
clear_strs(strs);
|
||||
|
||||
@@ -19,11 +19,11 @@ char *ft_strchr(const char *s, int c)
|
||||
i = 0;
|
||||
while (s[i])
|
||||
{
|
||||
if ((unsigned char) s[i] == (unsigned char) c)
|
||||
return ((char *) s + i);
|
||||
if ((unsigned char)s[i] == (unsigned char)c)
|
||||
return ((char *)s + i);
|
||||
i++;
|
||||
}
|
||||
if ((unsigned char) s[i] == (unsigned char) c)
|
||||
return ((char *) s + i);
|
||||
if ((unsigned char)s[i] == (unsigned char)c)
|
||||
return ((char *)s + i);
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ char *ft_strdup(const char *s)
|
||||
char *dest;
|
||||
int i;
|
||||
|
||||
dest = malloc(sizeof(char) *(ft_strlen(s) + 1));
|
||||
dest = malloc(sizeof(char) * (ft_strlen(s) + 1));
|
||||
if (!dest)
|
||||
return (NULL);
|
||||
i = 0;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
void ft_striteri(char *s, void (*f)(unsigned int, char*))
|
||||
void ft_striteri(char *s, void (*f)(unsigned int, char *))
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
|
||||
@@ -19,9 +19,9 @@ int ft_strncmp(const char *s1, const char *s2, size_t n)
|
||||
i = 0;
|
||||
while ((s1[i] || s2[i]) && i < n)
|
||||
{
|
||||
if ((unsigned char) s1[i] > (unsigned char) s2[i])
|
||||
if ((unsigned char)s1[i] > (unsigned char)s2[i])
|
||||
return (1);
|
||||
if ((unsigned char) s1[i] < (unsigned char) s2[i])
|
||||
if ((unsigned char)s1[i] < (unsigned char)s2[i])
|
||||
return (-1);
|
||||
i++;
|
||||
}
|
||||
|
||||
@@ -22,11 +22,11 @@ char *ft_strnstr(const char *big, const char *little, size_t len)
|
||||
little_len = ft_strlen(little);
|
||||
big_len = ft_strlen(big);
|
||||
if (!little[0])
|
||||
return ((char *) big);
|
||||
return ((char *)big);
|
||||
while ((little_len + i) <= len && (little_len + i) <= big_len)
|
||||
{
|
||||
if (!ft_strncmp(&big[i], little, little_len))
|
||||
return ((char *) &big[i]);
|
||||
return ((char *)&big[i]);
|
||||
i++;
|
||||
}
|
||||
return (NULL);
|
||||
|
||||
@@ -21,8 +21,8 @@ char *ft_strrchr(const char *s, int c)
|
||||
i++;
|
||||
while (i >= 0)
|
||||
{
|
||||
if ((unsigned char) s[i] == (unsigned char) c)
|
||||
return ((char *) &s[i]);
|
||||
if ((unsigned char)s[i] == (unsigned char)c)
|
||||
return ((char *)&s[i]);
|
||||
i--;
|
||||
}
|
||||
return (NULL);
|
||||
|
||||
@@ -13,60 +13,62 @@
|
||||
#ifndef LIBFT_H
|
||||
# define LIBFT_H
|
||||
|
||||
# include <stdlib.h>
|
||||
# include <unistd.h>
|
||||
# include <limits.h>
|
||||
# include <stdint.h>
|
||||
# include <stdlib.h>
|
||||
# include <unistd.h>
|
||||
|
||||
typedef struct s_list
|
||||
{
|
||||
void *content;
|
||||
struct s_list *next;
|
||||
} t_list;
|
||||
} t_list;
|
||||
|
||||
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);
|
||||
size_t ft_strlen(const char *s);
|
||||
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, size_t n);
|
||||
int ft_memcmp(const void *s1, const void *s2, size_t n);
|
||||
void *ft_memchr(const void *s, int c, size_t n);
|
||||
char *ft_strnstr(const char *big, const char *little, size_t len);
|
||||
int ft_atoi(const char *nptr);
|
||||
void *ft_calloc(size_t nmemb, size_t size);
|
||||
char *ft_strdup(const char *s);
|
||||
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_itoa(int n);
|
||||
char *ft_strmapi(char const *s, char (*f)(unsigned int, char));
|
||||
void ft_striteri(char *s, void (*f)(unsigned int, char*));
|
||||
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);
|
||||
t_list *ft_lstnew(void *content);
|
||||
void ft_lstadd_front(t_list **lst, t_list *new_);
|
||||
int ft_lstsize(t_list *lst);
|
||||
t_list *ft_lstlast(t_list *lst);
|
||||
void ft_lstadd_back(t_list **lst, 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 *));
|
||||
char *ft_lltoa(long long n);
|
||||
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);
|
||||
size_t ft_strlen(const char *s);
|
||||
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, size_t n);
|
||||
int ft_memcmp(const void *s1, const void *s2, size_t n);
|
||||
void *ft_memchr(const void *s, int c, size_t n);
|
||||
char *ft_strnstr(const char *big, const char *little,
|
||||
size_t len);
|
||||
int ft_atoi(const char *nptr);
|
||||
void *ft_calloc(size_t nmemb, size_t size);
|
||||
char *ft_strdup(const char *s);
|
||||
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_itoa(int n);
|
||||
char *ft_strmapi(char const *s, char (*f)(unsigned int, char));
|
||||
void ft_striteri(char *s, void (*f)(unsigned int, char *));
|
||||
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);
|
||||
t_list *ft_lstnew(void *content);
|
||||
void ft_lstadd_front(t_list **lst, t_list *new_);
|
||||
int ft_lstsize(t_list *lst);
|
||||
t_list *ft_lstlast(t_list *lst);
|
||||
void ft_lstadd_back(t_list **lst, 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 *));
|
||||
char *ft_lltoa(long long n);
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user