kekw

libftx/gnl/Makefile

@@ -6,11 +6,11 @@
 #    By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2022/12/14 15:49:18 by cchauvet          #+#    #+#              #
-#    Updated: 2023/01/05 17:44:06 by cchauvet         ###   ########.fr        #
+#    Updated: 2023/01/05 19:22:40 by cchauvet         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
-SRCS = get_next_line.c get_next_line_utils.c
+SRCS = get_next_line.c
 
 OBJS = ${SRCS:.c=.o}
 

libftx/gnl/get_next_line.h

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/11/14 15:38:06 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/01/05 13:06:19 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/01/05 19:27:45 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,10 +18,6 @@
 #  define BUFFER_SIZE 42
 # endif
 # include "../libft/libft.h"
-void	*ft_calloc(size_t nmemb, size_t size);
-void	*ft_realloc(void *ptr, size_t size);
-char	*ft_strfjoin(char *dst, char *src);
-char	*ft_strndup(char *src, size_t n);
-ssize_t	ft_strchri(char *str, char c);
+# include "../extra/extra.h"
 char	*get_next_line(int fd);
 #endif

libftx/gnl/get_next_line_utils.c

@@ -1,94 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   get_next_line_utils.c                              :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2022/10/26 00:55:44 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/01/05 13:06:37 by cchauvet         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "get_next_line.h"
-
-void	*ft_calloc(size_t nmemb, size_t size)
-{
-	char	*tab;
-	size_t	i;
-
-	if (nmemb == 0 || size * nmemb / nmemb != size)
-		return (NULL);
-	tab = malloc(nmemb * size);
-	if (tab == NULL)
-		return (NULL);
-	i = 0;
-	while (i < size * nmemb)
-	{
-		tab[i] = 0;
-		i++;
-	}
-	return ((void *) tab);
-}
-
-char	*ft_strfjoin(char *s1, char *s2)
-{
-	ssize_t	i;
-	ssize_t	j;
-	char	*out;
-
-	out = ft_calloc((ft_strlen(s1) + ft_strlen(s2) + 1), sizeof(char));
-	if (out == NULL)
-		return (NULL);
-	i = 0;
-	if (s1 != NULL)
-	{
-		while (s1[i] != '\0')
-		{
-			out[i] = s1[i];
-			i++;
-		}
-	}
-	free(s1);
-	j = -1;
-	if (s2 != NULL)
-	{
-		while (s2[++j] != '\0')
-			out[i + j] = s2[j];
-	}
-	free(s2);
-	return (out);
-}
-
-char	*ft_strndup(char *src, size_t n)
-{
-	char	*out;
-	size_t	i;
-
-	if (src[0] == '\0')
-		return (NULL);
-	out = ft_calloc(n + 1, sizeof(char));
-	if (out == NULL)
-		return (NULL);
-	i = 0;
-	while (src[i] != '\0' && i < n)
-	{
-		out[i] = src[i];
-		i++;
-	}
-	return (out);
-}
-
-ssize_t	ft_strchri(char *str, char c)
-{
-	size_t	i;
-
-	if (str == NULL)
-		return (-1);
-	i = 0;
-	while (str[i] != c && str[i] != '\0')
-		i++;
-	if (str[i] == '\0')
-		return (-1);
-	return (i);
-}