From: Dominik Kaiser <dkaiser@1-C-13.42heilbronn.de>
Date: Sun, 10 Mar 2024 13:08:27 +0000 (+0100)
Subject: Use ft_strlen instead of rewriting it
X-Git-Url: https://git.dkaiser.de/?a=commitdiff_plain;h=b356e8552cad748418163bf3ad1da95e88937a38;p=42%2Flibft.git

Use ft_strlen instead of rewriting it
---

diff --git a/ft_putendl_fd.c b/ft_putendl_fd.c
index ab08ec4..f8de15e 100644
--- a/ft_putendl_fd.c
+++ b/ft_putendl_fd.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/06 20:47:17 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/03/10 13:20:39 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/03/10 14:07:58 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,13 +14,6 @@
 
 void	ft_putendl_fd(char *s, int fd)
 {
-	int	len;
-
-	len = 0;
-	while (s[len])
-	{
-		len++;
-	}
-	write(fd, s, len);
+	write(fd, s, ft_strlen(s));
 	write(fd, "\n", 1);
 }
diff --git a/ft_putstr_fd.c b/ft_putstr_fd.c
index 4dd472b..cb78491 100644
--- a/ft_putstr_fd.c
+++ b/ft_putstr_fd.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/06 20:43:05 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/03/10 13:20:16 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/03/10 14:07:37 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,10 +14,5 @@
 
 void	ft_putstr_fd(char *s, int fd)
 {
-	int	len;
-
-	len = 0;
-	while (s[len])
-		len++;
-	write(fd, s, len);
+	write(fd, s, ft_strlen(s));
 }
diff --git a/ft_strdup.c b/ft_strdup.c
index 1282c36..2f59166 100644
--- a/ft_strdup.c
+++ b/ft_strdup.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/06 19:54:16 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/03/10 13:17:47 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/03/10 13:59:13 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,21 +16,14 @@ char	*ft_strdup(const char *s1)
 {
 	char	*result;
 	int		len;
-	int		i;
 
-	len = 0;
-	while (s1[len])
-		len++;
+	len = ft_strlen(s1);
 	result = malloc(len + 1);
 	if (!result)
 		return (0);
 	result[len] = '\0';
-	i = 0;
-	while (i < len)
-	{
-		result[i] = s1[i];
-		i++;
-	}
+	while (--len)
+		result[len] = s1[len];
 	return (result);
 }
 
diff --git a/ft_strjoin.c b/ft_strjoin.c
index ebcd611..526592b 100644
--- a/ft_strjoin.c
+++ b/ft_strjoin.c
@@ -6,22 +6,12 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/07 10:15:33 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/03/10 13:18:27 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/03/10 14:02:07 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "libft.h"
 
-static int	get_len(char const *s)
-{
-	int	i;
-
-	i = 0;
-	while (s[i])
-		i++;
-	return (i);
-}
-
 static int	copy_str(char *dst, const char *src)
 {
 	int	i;
@@ -40,7 +30,7 @@ char	*ft_strjoin(char const *s1, char const *s2)
 	int		len;
 	char	*result;
 
-	len = get_len(s1) + get_len(s2);
+	len = ft_strlen(s1) + ft_strlen(s2);
 	result = malloc(len + 1);
 	if (result)
 	{
diff --git a/ft_strmapi.c b/ft_strmapi.c
index 5d31408..a500621 100644
--- a/ft_strmapi.c
+++ b/ft_strmapi.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/10 11:11:30 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/03/10 13:19:18 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/03/10 14:06:41 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,9 +17,7 @@ char	*ft_strmapi(char const *s, char (*f)(unsigned int, char))
 	char			*result;
 	unsigned int	i;
 
-	i = 0;
-	while (s[i])
-		i++;
+	i = ft_strlen(s);
 	result = malloc(sizeof(char) * (i + 1));
 	if (!result)
 		return (0);
diff --git a/ft_strtrim.c b/ft_strtrim.c
index ff4056e..9caf12f 100644
--- a/ft_strtrim.c
+++ b/ft_strtrim.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/07 10:24:17 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/03/10 13:18:40 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/03/10 14:03:13 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -34,9 +34,7 @@ char	*ft_strtrim(char const *s1, char const *set)
 	start = (char *)s1;
 	while (is_in(*start, set))
 		start++;
-	i = 0;
-	while (s1[i])
-		i++;
+	i = ft_strlen(s1);
 	end = (char *)s1 + i - 1;
 	while (end > start && is_in(*end, set))
 		end--;
diff --git a/ft_substr.c b/ft_substr.c
index bf65c8d..4ac8003 100644
--- a/ft_substr.c
+++ b/ft_substr.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/06 21:58:31 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/03/10 13:18:11 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/03/10 14:01:27 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,16 +14,15 @@
 
 char	*ft_substr(char const *s, unsigned int start, size_t len)
 {
-	size_t	i;
+	unsigned int slen;
+	size_t i;
 	char	*result;
 
-	i = 0;
-	while (s[i])
-		i++;
-	if (start >= i)
+	slen = ft_strlen(s);
+	if (start >= slen)
 		len = 0;
-	if (i - start < len)
-		len = (i - start);
+	if (slen - start < len)
+		len = (slen - start);
 	result = malloc(len + 1);
 	if (!result)
 		return (0);