added gitignore + droped tables func
This commit is contained in:
parent
99ce0ff956
commit
1c9e7e6685
64
.gitignore
vendored
Normal file
64
.gitignore
vendored
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
# ******************************************************************************** #
|
||||||
|
# #
|
||||||
|
# ::: :::::::: #
|
||||||
|
# .gitignore :+: :+: :+: #
|
||||||
|
# +:+ +:+ +:+ #
|
||||||
|
# By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ #
|
||||||
|
# +#+#+#+#+#+ +#+ #
|
||||||
|
# Created: 2018/11/28 14:03:11 by tmaze #+# #+# #
|
||||||
|
Updated: 2018/11/28 14:27:23 by tmaze ### ########.fr
|
||||||
|
# #
|
||||||
|
# ******************************************************************************** #
|
||||||
|
|
||||||
|
# Prerequisites
|
||||||
|
*.d
|
||||||
|
|
||||||
|
# Object files
|
||||||
|
*.o
|
||||||
|
*.ko
|
||||||
|
*.obj
|
||||||
|
*.elf
|
||||||
|
|
||||||
|
# Linker output
|
||||||
|
*.ilk
|
||||||
|
*.map
|
||||||
|
*.exp
|
||||||
|
|
||||||
|
# Precompiled Headers
|
||||||
|
*.gch
|
||||||
|
*.pch
|
||||||
|
|
||||||
|
# Libraries
|
||||||
|
*.lib
|
||||||
|
*.a
|
||||||
|
*.la
|
||||||
|
*.lo
|
||||||
|
|
||||||
|
# Shared objects (inc. Windows DLLs)
|
||||||
|
*.dll
|
||||||
|
*.so
|
||||||
|
*.so.*
|
||||||
|
*.dylib
|
||||||
|
|
||||||
|
# Executables
|
||||||
|
*.exe
|
||||||
|
*.out
|
||||||
|
*.app
|
||||||
|
*.i*86
|
||||||
|
*.x86_64
|
||||||
|
*.hex
|
||||||
|
|
||||||
|
# Debug files
|
||||||
|
*.dSYM/
|
||||||
|
*.su
|
||||||
|
*.idb
|
||||||
|
*.pdb
|
||||||
|
|
||||||
|
# Kernel Module Compile Results
|
||||||
|
*.mod*
|
||||||
|
*.cmd
|
||||||
|
.tmp_versions/
|
||||||
|
modules.order
|
||||||
|
Module.symvers
|
||||||
|
Mkfile.old
|
||||||
|
dkms.conf
|
4
Makefile
4
Makefile
@ -6,7 +6,7 @@
|
|||||||
# By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ #
|
# By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ #
|
||||||
# +#+#+#+#+#+ +#+ #
|
# +#+#+#+#+#+ +#+ #
|
||||||
# Created: 2018/04/07 12:47:06 by tmaze #+# #+# #
|
# Created: 2018/04/07 12:47:06 by tmaze #+# #+# #
|
||||||
# Updated: 2018/11/23 16:38:25 by tmaze ### ########.fr #
|
# Updated: 2018/11/26 12:40:27 by tmaze ### ########.fr #
|
||||||
# #
|
# #
|
||||||
#******************************************************************************#
|
#******************************************************************************#
|
||||||
|
|
||||||
@ -19,7 +19,7 @@ NAME = libft.a
|
|||||||
SRCS = ft_memset.c ft_bzero.c ft_memcpy.c ft_memccpy.c ft_memmove.c ft_memchr.c ft_memcmp.c ft_strlen.c ft_strdup.c ft_strcpy.c ft_strncpy.c ft_strcat.c ft_strncat.c ft_strlcat.c ft_strchr.c ft_strrchr.c ft_strstr.c ft_strnstr.c ft_strcmp.c ft_strncmp.c ft_atoi.c ft_isalpha.c ft_isdigit.c ft_isalnum.c ft_isascii.c ft_isprint.c ft_toupper.c ft_tolower.c \
|
SRCS = ft_memset.c ft_bzero.c ft_memcpy.c ft_memccpy.c ft_memmove.c ft_memchr.c ft_memcmp.c ft_strlen.c ft_strdup.c ft_strcpy.c ft_strncpy.c ft_strcat.c ft_strncat.c ft_strlcat.c ft_strchr.c ft_strrchr.c ft_strstr.c ft_strnstr.c ft_strcmp.c ft_strncmp.c ft_atoi.c ft_isalpha.c ft_isdigit.c ft_isalnum.c ft_isascii.c ft_isprint.c ft_toupper.c ft_tolower.c \
|
||||||
ft_memalloc.c ft_memdel.c ft_strnew.c ft_strdel.c ft_strclr.c ft_striter.c ft_striteri.c ft_strmap.c ft_strmapi.c ft_strequ.c ft_strnequ.c ft_strsub.c ft_strjoin.c ft_strtrim.c ft_strsplit.c ft_itoa.c ft_putchar.c ft_putstr.c ft_putendl.c ft_putnbr.c ft_putchar_fd.c ft_putstr_fd.c ft_putendl_fd.c ft_putnbr_fd.c\
|
ft_memalloc.c ft_memdel.c ft_strnew.c ft_strdel.c ft_strclr.c ft_striter.c ft_striteri.c ft_strmap.c ft_strmapi.c ft_strequ.c ft_strnequ.c ft_strsub.c ft_strjoin.c ft_strtrim.c ft_strsplit.c ft_itoa.c ft_putchar.c ft_putstr.c ft_putendl.c ft_putnbr.c ft_putchar_fd.c ft_putstr_fd.c ft_putendl_fd.c ft_putnbr_fd.c\
|
||||||
ft_lstnew.c ft_lstdelone.c ft_lstdel.c ft_lstadd.c ft_lstiter.c ft_lstmap.c \
|
ft_lstnew.c ft_lstdelone.c ft_lstdel.c ft_lstadd.c ft_lstiter.c ft_lstmap.c \
|
||||||
ft_isupper.c ft_islower.c ft_str_is_alpha.c ft_str_is_lowercase.c ft_str_is_numeric.c ft_str_is_printable.c ft_str_is_uppercase.c ft_strcapitalize.c ft_strlcpy.c ft_strlowcase.c ft_strupcase.c ft_lstsize.c ft_lstgetat.c ft_lstgetlast.c ft_sort_params.c ft_print_words_tables.c ft_lstaddend.c ft_strndup.c ft_abs.c ft_strnchr.c ft_strrnchr.c get_next_line.c ft_del_words_tables.c ft_putstrn.c ft_nbrlen.c ft_putstrpad.c ft_putnbrpad.c ft_lstsort.c ft_lstaddsort.c ft_round.c ft_strtabnew.c ft_strtabclr.c ft_strtabcpy.c ft_strtabdel.c
|
ft_isupper.c ft_islower.c ft_str_is_alpha.c ft_str_is_lowercase.c ft_str_is_numeric.c ft_str_is_printable.c ft_str_is_uppercase.c ft_strcapitalize.c ft_strlcpy.c ft_strlowcase.c ft_strupcase.c ft_lstsize.c ft_lstgetat.c ft_lstgetlast.c ft_sort_params.c ft_print_words_tables.c ft_lstaddend.c ft_strndup.c ft_abs.c ft_strnchr.c ft_strrnchr.c get_next_line.c ft_del_words_tables.c ft_putstrn.c ft_nbrlen.c ft_putstrpad.c ft_putnbrpad.c ft_lstsort.c ft_lstaddsort.c ft_round.c ft_strsplitstr2.c
|
||||||
|
|
||||||
OBJS = $(SRCS:.c=.o)
|
OBJS = $(SRCS:.c=.o)
|
||||||
INCLS = -I.
|
INCLS = -I.
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
|
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2018/04/17 20:55:26 by tmaze #+# #+# */
|
/* Created: 2018/04/17 20:55:26 by tmaze #+# #+# */
|
||||||
/* Updated: 2018/04/19 14:32:44 by tmaze ### ########.fr */
|
/* Updated: 2018/11/26 12:30:30 by tmaze ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
t_list *ft_lstaddend(t_list **alst, t_list *new)
|
t_list *ft_lstaddend(t_list **alst, t_list *new)
|
||||||
{
|
{
|
||||||
t_list **tmp;
|
t_list *tmp;
|
||||||
|
|
||||||
if (new == NULL)
|
if (new == NULL)
|
||||||
return (NULL);
|
return (NULL);
|
||||||
@ -22,10 +22,8 @@ t_list *ft_lstaddend(t_list **alst, t_list *new)
|
|||||||
ft_lstadd(alst, new);
|
ft_lstadd(alst, new);
|
||||||
else if (ft_lstsize(*alst) > 0)
|
else if (ft_lstsize(*alst) > 0)
|
||||||
{
|
{
|
||||||
if ((tmp = (t_list**)malloc(sizeof(t_list*))) == NULL)
|
tmp = ft_lstgetlast(*alst);
|
||||||
return (NULL);
|
ft_lstadd(&(tmp->next), new);
|
||||||
*tmp = ft_lstgetlast(*alst);
|
|
||||||
ft_lstadd(&(*tmp)->next, new);
|
|
||||||
}
|
}
|
||||||
return (*alst);
|
return (*alst);
|
||||||
}
|
}
|
||||||
|
68
ft_strsplitstr2.c
Normal file
68
ft_strsplitstr2.c
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
/* ************************************************************************** */
|
||||||
|
/* */
|
||||||
|
/* ::: :::::::: */
|
||||||
|
/* ft_strsplitstr2.c :+: :+: :+: */
|
||||||
|
/* +:+ +:+ +:+ */
|
||||||
|
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
|
||||||
|
/* +#+#+#+#+#+ +#+ */
|
||||||
|
/* Created: 2018/11/26 11:33:06 by tmaze #+# #+# */
|
||||||
|
/* Updated: 2018/11/26 12:42:46 by tmaze ### ########.fr */
|
||||||
|
/* */
|
||||||
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
#include "libft.h"
|
||||||
|
|
||||||
|
static int isin(char c, char *str)
|
||||||
|
{
|
||||||
|
size_t i;
|
||||||
|
|
||||||
|
i = 0;
|
||||||
|
while (str[i])
|
||||||
|
if (c == str[i++])
|
||||||
|
return (1);
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void ft_cntdelstr(void* content, size_t content_size)
|
||||||
|
{
|
||||||
|
ft_strdel((char**)content);
|
||||||
|
content_size = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
t_list *ft_strsplitstr2(char *str, char *split)
|
||||||
|
{
|
||||||
|
size_t i;
|
||||||
|
size_t j;
|
||||||
|
char *token;
|
||||||
|
t_list *lst;
|
||||||
|
t_list *new;
|
||||||
|
|
||||||
|
lst = NULL;
|
||||||
|
i = 0;
|
||||||
|
j = 0;
|
||||||
|
while (str[i])
|
||||||
|
{
|
||||||
|
if (isin(str[i], split))
|
||||||
|
{
|
||||||
|
if ((token = ft_strnew(i - j + 1)) == NULL)
|
||||||
|
{
|
||||||
|
ft_lstdel(&lst, &ft_cntdelstr);
|
||||||
|
return (NULL);
|
||||||
|
}
|
||||||
|
token[i + j + 1] = '\0';
|
||||||
|
ft_strsub(str, j, i);
|
||||||
|
if ((new = ft_lstnew((void*)token, ft_strlen(token))) == NULL)
|
||||||
|
{
|
||||||
|
ft_strdel(&token);
|
||||||
|
ft_lstdel(&lst, &ft_cntdelstr);
|
||||||
|
return (NULL);
|
||||||
|
}
|
||||||
|
ft_lstaddend(&lst, new);
|
||||||
|
while ((isin(str[i], split)))
|
||||||
|
i++;
|
||||||
|
j = i;
|
||||||
|
}
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
return (lst);
|
||||||
|
}
|
@ -1,25 +0,0 @@
|
|||||||
/* ************************************************************************** */
|
|
||||||
/* */
|
|
||||||
/* ::: :::::::: */
|
|
||||||
/* ft_strtabclr.c :+: :+: :+: */
|
|
||||||
/* +:+ +:+ +:+ */
|
|
||||||
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
|
|
||||||
/* +#+#+#+#+#+ +#+ */
|
|
||||||
/* Created: 2018/11/23 14:49:25 by tmaze #+# #+# */
|
|
||||||
/* Updated: 2018/11/23 14:52:43 by tmaze ### ########.fr */
|
|
||||||
/* */
|
|
||||||
/* ************************************************************************** */
|
|
||||||
|
|
||||||
#include "libft.h"
|
|
||||||
|
|
||||||
void ft_strtabclr(char **tab)
|
|
||||||
{
|
|
||||||
size_t i;
|
|
||||||
|
|
||||||
i = 0;
|
|
||||||
while (tab[i])
|
|
||||||
{
|
|
||||||
ft_strdel(tab[i]);
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,29 +0,0 @@
|
|||||||
/* ************************************************************************** */
|
|
||||||
/* */
|
|
||||||
/* ::: :::::::: */
|
|
||||||
/* ft_strtabcpy.c :+: :+: :+: */
|
|
||||||
/* +:+ +:+ +:+ */
|
|
||||||
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
|
|
||||||
/* +#+#+#+#+#+ +#+ */
|
|
||||||
/* Created: 2018/11/23 14:44:53 by tmaze #+# #+# */
|
|
||||||
/* Updated: 2018/11/23 14:52:27 by tmaze ### ########.fr */
|
|
||||||
/* */
|
|
||||||
/* ************************************************************************** */
|
|
||||||
|
|
||||||
#include "libft.h"
|
|
||||||
|
|
||||||
char **ft_strtabcpy(char **dest, const char **src)
|
|
||||||
{
|
|
||||||
size_t i;
|
|
||||||
|
|
||||||
i = 0;
|
|
||||||
while (src[i])
|
|
||||||
{
|
|
||||||
if ((dest[i] = ft_strdup(src[i])) == NULL)
|
|
||||||
{
|
|
||||||
ft_strtabclr(dest);
|
|
||||||
return (NULL);
|
|
||||||
}
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,18 +0,0 @@
|
|||||||
/* ************************************************************************** */
|
|
||||||
/* */
|
|
||||||
/* ::: :::::::: */
|
|
||||||
/* ft_strtabdel.c :+: :+: :+: */
|
|
||||||
/* +:+ +:+ +:+ */
|
|
||||||
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
|
|
||||||
/* +#+#+#+#+#+ +#+ */
|
|
||||||
/* Created: 2018/11/23 16:32:30 by tmaze #+# #+# */
|
|
||||||
/* Updated: 2018/11/23 16:35:27 by tmaze ### ########.fr */
|
|
||||||
/* */
|
|
||||||
/* ************************************************************************** */
|
|
||||||
|
|
||||||
#include "libft.h"
|
|
||||||
|
|
||||||
void ft_strtabdel(char ***tab)
|
|
||||||
{
|
|
||||||
ft_memdel((**void)tab);
|
|
||||||
}
|
|
@ -1,24 +0,0 @@
|
|||||||
/* ************************************************************************** */
|
|
||||||
/* */
|
|
||||||
/* ::: :::::::: */
|
|
||||||
/* ft_strtabnew.c :+: :+: :+: */
|
|
||||||
/* +:+ +:+ +:+ */
|
|
||||||
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
|
|
||||||
/* +#+#+#+#+#+ +#+ */
|
|
||||||
/* Created: 2018/11/23 14:13:08 by tmaze #+# #+# */
|
|
||||||
/* Updated: 2018/11/23 14:38:11 by tmaze ### ########.fr */
|
|
||||||
/* */
|
|
||||||
/* ************************************************************************** */
|
|
||||||
|
|
||||||
#include "libft.h"
|
|
||||||
|
|
||||||
char **ft_strtabnew(size_t size)
|
|
||||||
{
|
|
||||||
char **ret;
|
|
||||||
|
|
||||||
if (size <= 0 || (ret = (char**)ft_memalloc(sizeof(char*) * (size + 1))) == NULL)
|
|
||||||
return (NULL);
|
|
||||||
while (size >= 0)
|
|
||||||
ret[size - 1] = NULL;
|
|
||||||
return (ret);
|
|
||||||
}
|
|
4
libft.h
4
libft.h
@ -6,7 +6,7 @@
|
|||||||
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
|
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2018/04/08 00:12:36 by tmaze #+# #+# */
|
/* Created: 2018/04/08 00:12:36 by tmaze #+# #+# */
|
||||||
/* Updated: 2018/10/24 13:38:20 by tmaze ### ########.fr */
|
/* Updated: 2018/11/26 12:36:58 by tmaze ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@ -174,4 +174,6 @@ void ft_lstaddsort(t_list **lst, t_list *new,
|
|||||||
|
|
||||||
int ft_round(float x, float ind);
|
int ft_round(float x, float ind);
|
||||||
|
|
||||||
|
t_list *ft_strsplitstr2(char *str, char *split);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user