Bon il faut ranger la chambre sinon impec

utils/ft_strreplace.c

@@ -1,24 +1,17 @@
 #include "utils.h"
 
-<<<<<<< HEAD
-int	ft_strreplace(char **str, char *fill, size_t start, size_t stop)
-=======
-char	*ft_strreplace(char *str, const char *fill, size_t start, size_t stop)
->>>>>>> 67fb6d0533f56a0d63ffeebd9fde7cdc75919eb2
+char	*ft_strreplace(const char *str, const char *fill, size_t start, size_t stop)
 {
 	char	*out;
 	size_t	sum;
 
-	out = malloc((ft_strlen(str) + ft_strlen(fill) - (stop - start) + 1
-				* sizeof(char)));
+	out = malloc((ft_strlen(str) + ft_strlen(fill) - (stop - start) + 1 * sizeof(char)));
 	if (out == NULL)
-		return (1);
+		return (NULL);
 	ft_strncpy(out, str, start);
 	ft_strncpy(out + start, fill, ft_strlen(fill));
 	sum = start + ft_strlen(fill);
 	ft_strncpy(out + sum, str + stop, ft_strlen(str) - stop);
 	out[sum + ft_strlen(str) - stop] = '\0';
-	free(*str);
-	*str = out;
-	return (0);
+	return (out);
 }

utils/utils.h

@@ -5,7 +5,7 @@
 
 size_t		ft_strncpy(char *dst, const char *src, size_t n);
 int		ft_is_in_quote(const char *str, size_t n);
-char		*ft_strreplace(char *str, const char *fill, size_t start, size_t stop);
+char		*ft_strreplace(const char *str, const char *fill, size_t start, size_t stop);
 ssize_t		ft_strnchr(const char *str, char c);
 char		*ft_getstr(const char *str, size_t n);