From ecad5030980d09cbce3bd8058b2f1e170ac06399 Mon Sep 17 00:00:00 2001
From: Etienne Rey-bethbeder <erey-bet@1A2.42angouleme.fr>
Date: Thu, 10 Nov 2022 15:19:16 +0100
Subject: [PATCH] Libft

---
 Makefile    | 49 +++++++++++++++++++++++++------------------------
 ft_calloc.c |  2 ++
 ft_itoa.c   |  5 +++--
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index 952669a..9d6a583 100644
--- a/Makefile
+++ b/Makefile
@@ -52,8 +52,8 @@ coffee:
 	@clear
 	@echo ""
 	@echo "                   ("
-	@echo "	                     )     ("
-	@echo "               ___...(-------)-....___"
+	@echo "	                     )     (◦"
+	@echo "               ___...(-------)-....___◦"
 	@echo '           .-""       )    (          ""-.'
 	@echo "      .-''''|-._             )         _.-|"
 	@echo '     /  .--.|   `""---...........---""`   |'
@@ -68,16 +68,16 @@ coffee:
 	@echo " .-'           \                       /          '-."
 	@echo ":               '-.__             __.-'              :"
 	@echo ':                  ) ""---...---"" (                :'
-	@echo "\'._                '"--...___...--"'              _.'"
+	@echo '\._                 "--...___...--"              _."'
 	@echo '   \""--..__                              __..--""/'
-	@echo "     '._     """----.....______.....----"""         _.'"
-	@echo '         ""--..,,_____            _____,,..--"""'''
+	@echo '     "._     """----.....______.....----"""     _."'
+	@echo '         ""--..,,_____            _____,,..--"""'
 	@echo '                      """------"""'
-	@sleep 0.3
+	@sleep 0.2
 	@clear
 	@echo ""
-	@echo "                 ("
-	@echo "	                  )      ("
+	@echo "                 (◦"
+	@echo "	      ◦          ◦ )      (  "
 	@echo "               ___..(.------)--....___"
 	@echo '           .-""       )   (           ""-.'
 	@echo "      .-''''|-._      (       )        _.-|"
@@ -93,16 +93,16 @@ coffee:
 	@echo " .-'           \                       /          '-."
 	@echo ":               '-.__             __.-'              :"
 	@echo ':                  ) ""---...---"" (                :'
-	@echo "\'._                '"--...___...--"'              _.'"
+	@echo '\._                 "--...___...--"              _."'
 	@echo '   \""--..__                              __..--""/'
-	@echo "     '._     """----.....______.....----"""         _.'"
-	@echo '         ""--..,,_____            _____,,..--"""'''
+	@echo '     "._     """----.....______.....----"""     _."'
+	@echo '         ""--..,,_____            _____,,..--"""'
 	@echo '                      """------"""'
-	@sleep 0.3
+	@sleep 0.2
 	@clear
-	@echo ""
-	@echo "               ("
-	@echo "	                  )     ("
+	@echo "                ◦"
+	@echo "               (                ◦"
+	@echo "	          ◦       )     (  "
 	@echo "               ___..(.------)--....___"
 	@echo '           .-""      )    (           ""-.'
 	@echo "      .-''''|-._      (       )        _.-|"
@@ -118,16 +118,16 @@ coffee:
 	@echo " .-'           \                       /          '-."
 	@echo ":               '-.__             __.-'              :"
 	@echo ':                  ) ""---...---"" (                :'
-	@echo "\'._                '"--...___...--"'              _.'"
+	@echo '\._                 "--...___...--"              _."'
 	@echo '   \""--..__                              __..--""/'
-	@echo "     '._     """----.....______.....----"""         _.'"
-	@echo '         ""--..,,_____            _____,,..--"""'''
+	@echo '     "._     """----.....______.....----"""     _."'
+	@echo '         ""--..,,_____            _____,,..--"""'
 	@echo '                      """------"""'
-	@sleep 0.3
+	@sleep 0.2
 	@clear
 	@echo ""
-	@echo "             (         ) "
-	@echo "	              )        ("
+	@echo "             (         ) ◦"
+	@echo "	      ◦        )        (◦"
 	@echo "               ___)...----)----....___"
 	@echo '           .-""      )    (           ""-.'
 	@echo "      .-''''|-._      (       )        _.-|"
@@ -143,11 +143,12 @@ coffee:
 	@echo " .-'           \                       /          '-."
 	@echo ":               '-.__             __.-'              :"
 	@echo ':                  ) ""---...---"" (                :'
-	@echo "\'._                '"--...___...--"'              _.'"
+	@echo '\._                 "--...___...--"              _."'
 	@echo '   \""--..__                              __..--""/'
-	@echo "     '._     """----.....______.....----"""         _.'"
-	@echo '         ""--..,,_____            _____,,..--"""'''
+	@echo '     "._     """----.....______.....----"""     _."'
+	@echo '         ""--..,,_____            _____,,..--"""'
 	@echo '                      """------"""'
+	@sleep 0.
 	${MAKE} coffee
 
 .PHONY: all clean fclean re bonus coffee
diff --git a/ft_calloc.c b/ft_calloc.c
index 27225f3..15af293 100644
--- a/ft_calloc.c
+++ b/ft_calloc.c
@@ -16,6 +16,8 @@ void	*ft_calloc(size_t nitems, size_t size)
 {
 	size_t	*tmp;
 
+	if (nitems == 0 || size == 0)
+		return (malloc(0));
 	if (nitems * size < nitems)
 		return (NULL);
 	tmp = malloc(nitems * size);
diff --git a/ft_itoa.c b/ft_itoa.c
index b365517..54e40ab 100644
--- a/ft_itoa.c
+++ b/ft_itoa.c
@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/10/04 17:12:52 by erey-bet          #+#    #+#             */
-/*   Updated: 2022/10/10 22:15:30 by erey-bet         ###   ########.fr       */
+/*   Updated: 2022/10/26 16:00:48 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -33,7 +33,8 @@ char	*ft_itoa(int n)
 	long	nl;
 
 	nl = n;
-	nl *= (n > 0) - (n < 0);
+	if (nl < 0)
+		nl *= -1;
 	len = ft_get_size(nl);
 	i = 0;
 	if (n < 0)