From 434b39969dca4846ea07af6d2578abff5efcd90c Mon Sep 17 00:00:00 2001
From: Adam Joly <adjoly@student.42angouleme.fr>
Date: Tue, 12 Mar 2024 14:34:46 +0100
Subject: [PATCH] updated libft

---
 Makefile                  | 30 +++++++++++++++---------------
 io/get_next_line/Makefile | 10 +++++-----
 libft.h                   |  5 ++++-
 mem/ft_calloc.c           |  4 ++--
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index 4dab60b..6bf6573 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2023/11/01 11:03:22 by adjoly            #+#    #+#              #
-#    Updated: 2024/02/15 13:55:20 by adjoly           ###   ########.fr        #
+#    Updated: 2024/03/04 13:39:42 by adjoly           ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -14,6 +14,8 @@ NAME = libft.a
 
 CC = cc
 
+OBJSDIR = obj/
+
 SRCS = is/ft_isalnum.c \
 		is/ft_isalpha.c \
 		is/ft_isascii.c \
@@ -69,34 +71,32 @@ SRCS = is/ft_isalnum.c \
 		print/printf/ft_putnbr.c \
 		print/printf/ft_putstr.c \
 
-OBJS = $(SRCS:.c=.o)
+OBJS = $(addprefix $(OBJSDIR),$(SRCS:.c=.o))
 
 FLAGS = -Werror -Wall -Wextra -g
 
 HEADERS = libft.h
 
-LIB = print/printf/libftprintf.a \
-		io/get_next_line/get_next_line.a
+LIB = io/get_next_line/get_next_line.a
 
 $(NAME): $(OBJS)
-	make -C io/get_next_line/
-	make -C print/printf/
-	ar -rcs	$(NAME) $(OBJS) $(LIB)
+	@make -s -C io/get_next_line/
+	@ar -rcs	$(NAME) $(OBJS) $(LIB)
+	@echo "[✔] Libft compiled"
 
-%.o: %.c
-	$(CC) $(FLAGS) -I $(HEADERS) $< -c -o $@
+$(OBJSDIR)%.o: %.c
+	@mkdir -p $(@D)
+	@$(CC) $(FLAGS) -I $(HEADERS) $< -c -o $@
 
 all: $(NAME)
 
 clean:
-	make -C io/get_next_line/ clean
-	make -C print/printf clean
-	rm -f $(OBJS)
+	@make -s -C io/get_next_line/ clean
+	@rm -f $(OBJS)
 
 fclean: clean
-	make -C io/get_next_line/ fclean
-	make -C print/printf/ fclean
-	rm -f $(NAME)
+	@make -s -C io/get_next_line/ fclean
+	@rm -f $(NAME)
 
 re: fclean all
 
diff --git a/io/get_next_line/Makefile b/io/get_next_line/Makefile
index 755ff9f..6a62d50 100644
--- a/io/get_next_line/Makefile
+++ b/io/get_next_line/Makefile
@@ -6,7 +6,7 @@
 #    By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2023/11/01 11:03:22 by adjoly            #+#    #+#              #
-#    Updated: 2024/02/04 14:54:32 by adjoly           ###   ########.fr        #
+#    Updated: 2024/03/04 13:30:36 by adjoly           ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -26,18 +26,18 @@ FLAGS = -Werror -Wall -Wextra
 HEADER = get_next_line.h
 
 $(NAME): $(OBJS)
-	ar -rcs	$(NAME) $(OBJS)
+	@ar -rcs	$(NAME) $(OBJS)
 
 %.o: %.c
-	$(CC) $(FLAGS) -I $(HEADER) $< -c -o $@
+	@$(CC) $(FLAGS) -I $(HEADER) $< -c -o $@
 
 all: $(NAME)
 
 clean:
-	rm -f $(OBJS)
+	@rm -f $(OBJS)
 
 fclean: clean
-	rm -f $(NAME)
+	@rm -f $(NAME)
 
 re: fclean all
 
diff --git a/libft.h b/libft.h
index 793d145..7f1d449 100644
--- a/libft.h
+++ b/libft.h
@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/11/01 10:06:03 by adjoly            #+#    #+#             */
-/*   Updated: 2024/02/22 11:29:58 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/03/04 09:06:35 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,6 +20,9 @@
 # include "print/printf/ft_printf.h"
 # include "io/get_next_line/get_next_line.h"
 
+# define INT_MAX 2147483647
+# define INT_MIN -2147483648
+
 typedef struct s_list
 {
 	void			*content;
diff --git a/mem/ft_calloc.c b/mem/ft_calloc.c
index a81f482..15d22c9 100644
--- a/mem/ft_calloc.c
+++ b/mem/ft_calloc.c
@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/11/01 16:02:26 by adjoly            #+#    #+#             */
-/*   Updated: 2024/02/04 14:22:20 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/03/04 10:10:58 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,7 +14,7 @@
 
 void	*ft_calloc(size_t nmemb, size_t size)
 {
-	char	*result;
+	void	*result;
 	size_t	i;
 
 	i = 0;