tvdu29/libft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.cloud.arnaud-pc.fr/tvdu29/libft

Browse Source
This commit is contained in:
Tanguy MAZE 2019-03-23 17:21:58 +01:00
commit 05a6363b5d
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -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: 2019/03/23 16:26:19 by tmaze ### ########.fr # # Updated: 2019/03/23 17:18:32 by tmaze ### ########.fr #
# # # #
#******************************************************************************# #******************************************************************************#
@ -16,6 +16,7 @@ CCSTD =
NAME = libft.a NAME = libft.a
<<<<<<< HEAD
SRCS = ft_memalloc.c \ SRCS = ft_memalloc.c \
ft_memdel.c \ ft_memdel.c \
ft_memset.c \ ft_memset.c \

3
includes/libft.h
View File

@ -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: 2019/03/19 15:18:55 by tmaze ### ########.fr */ /* Updated: 2019/03/20 16:46:41 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -362,5 +362,6 @@ char **ft_strsplitwhitespace(char *s);
int ft_atois(const char *str, int *nb); int ft_atois(const char *str, int *nb);
int ft_getline(char **line); int ft_getline(char **line);
int ft_putendl2(char const *s); int ft_putendl2(char const *s);
int ft_putendl_fd2(char const *s, int fd);
#endif #endif

4
srcs/ft_putendl2.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/19 15:14:49 by tmaze #+# #+# */ /* Created: 2019/03/19 15:14:49 by tmaze #+# #+# */
/* Updated: 2019/03/19 15:18:45 by tmaze ### ########.fr */ /* Updated: 2019/03/20 17:00:52 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -16,7 +16,7 @@ int ft_putendl2(char const *s)
{ {
char *str; char *str;
if (s != NULL && (str = ft_strnew(ft_strlen(s))) != NULL) if (s != NULL && (str = ft_strnew(ft_strlen(s) + 1)) != NULL)
{ {
ft_strcpy(str, s); ft_strcpy(str, s);
ft_strcat(str, "\n"); ft_strcat(str, "\n");