From ec7b2d2ff52f692b841d5bea5713094fbd8d410c Mon Sep 17 00:00:00 2001
From: Tanguy MAZE <tmaze@student.42.fr>
Date: Fri, 6 Apr 2018 18:20:30 +0200
Subject: [PATCH] ft_memalloc

---
 Makefile      |  6 ++++--
 ft_memalloc.c | 22 ++++++++++++++++++++++
 ft_memset.c   |  4 ++--
 libft.h       | 27 ++++++++++++++++++++++++++-
 4 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 ft_memalloc.c

diff --git a/Makefile b/Makefile
index 2d2c575..7f4f765 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: tmaze <marvin@42.fr>                       +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2018/04/04 10:51:59 by tmaze             #+#    #+#              #
-#    Updated: 2018/04/06 17:10:28 by tmaze            ###   ########.fr        #
+#    Updated: 2018/04/06 17:52:46 by tmaze            ###   ########.fr        #
 #                                                                              #
 #******************************************************************************#
 
@@ -43,7 +43,9 @@ SRCS =	\
 		ft_isascii.c \
 		ft_isprint.c \
 		ft_toupper.c \
-		ft_tolower.c 
+		ft_tolower.c \
+		\
+		ft_memalloc.c
 OBJS = $(SRCS:.c=.o)
 INCLS = -I.
 
diff --git a/ft_memalloc.c b/ft_memalloc.c
new file mode 100644
index 0000000..d3dd14e
--- /dev/null
+++ b/ft_memalloc.c
@@ -0,0 +1,22 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_memalloc.c                                      :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: tmaze <marvin@42.fr>                       +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2018/04/06 17:38:56 by tmaze             #+#    #+#             */
+/*   Updated: 2018/04/06 18:07:20 by tmaze            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+void	*ft_memalloc(size_t size)
+{
+	void	*ret;
+
+	if ((ret = malloc(size)) != NULL)
+		ft_bzero(ret, size);
+	return (ret);
+}
diff --git a/ft_memset.c b/ft_memset.c
index bede88e..4fd4fa1 100644
--- a/ft_memset.c
+++ b/ft_memset.c
@@ -6,7 +6,7 @@
 /*   By: tmaze <marvin@42.fr>                       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2018/04/05 15:22:55 by tmaze             #+#    #+#             */
-/*   Updated: 2018/04/06 10:51:34 by tmaze            ###   ########.fr       */
+/*   Updated: 2018/04/06 18:20:06 by tmaze            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,6 +18,6 @@ void	*ft_memset(void *b, int c, size_t len)
 
 	i = 0;
 	while (i < len)
-		*((char*)b + i++) = c;
+		((char*)b)[i++] = c;
 	return (b);
 }
diff --git a/libft.h b/libft.h
index 447a3b0..385538a 100644
--- a/libft.h
+++ b/libft.h
@@ -6,7 +6,7 @@
 /*   By: tmaze <marvin@42.fr>                       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2018/04/04 10:40:01 by tmaze             #+#    #+#             */
-/*   Updated: 2018/04/06 11:46:45 by tmaze            ###   ########.fr       */
+/*   Updated: 2018/04/06 17:43:41 by tmaze            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -54,4 +54,29 @@ int		ft_tolower(int c);
 ** fonctions supplémentaires
 */
 
+void	*ft_memalloc(size_t size);
+void	ft_memdel(void **ap);
+char	*ft_strnew(size_t size);
+void	ft_strdel(char **as);
+void	ft_strclr(char *s);
+void	ft_striter(char *s, void (*f)(char *));
+void	ft_striteri(char *s, void (*f)(unsigned int, char *));
+char	*ft_strmap(char const *s, char (*f)(char));
+char	*ft_strmapi(char const *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_strsub(char const *s, unsigned int start, size_t len);
+char	*ft_strjoin(char const *s1, char const *s2);
+char	*ft_strtrim(char const *s);
+char	**ft_strsplit(char const *s, char c);
+char	*ft_itoa(int n);
+void	ft_putchar(char c);
+void	ft_putstr(char const *s);
+void	ft_putendl(char const *s);
+void	ft_putnbr(int n);
+void	ft_putchar_fd(char c, int fd);
+void	ft_putstr_fd(char const *s, int fd);
+void	ft_putendl_fd(char const *s, int fd);
+void	ft_putnbr_fd(int n, int fd);
+
 #endif