aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2020-08-02 14:19:07 +0200
committerCharles Cabergs <me@cacharle.xyz>2020-08-02 14:19:07 +0200
commitad33f31d00cdf5593baa83b63eb5445ef2951250 (patch)
tree25f36a8c9f4e4772b75b2773f27166d6e3084675
parent5d2f925b20ceaea4122c59d2d2c4e7d4ae991fde (diff)
downloadlibft-ad33f31d00cdf5593baa83b63eb5445ef2951250.tar.gz
libft-ad33f31d00cdf5593baa83b63eb5445ef2951250.tar.bz2
libft-ad33f31d00cdf5593baa83b63eb5445ef2951250.zip
Added ft_memdup, Fixing ft_strtoupperft_ssl
-rw-r--r--include/libft_mem.h3
-rw-r--r--src/mem/ft_memdup.c22
-rw-r--r--src/str/ft_strtoupper.c12
3 files changed, 31 insertions, 6 deletions
diff --git a/include/libft_mem.h b/include/libft_mem.h
index 3d7ca26..e5cc18b 100644
--- a/include/libft_mem.h
+++ b/include/libft_mem.h
@@ -6,7 +6,7 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/01/31 10:35:57 by cacharle #+# #+# */
-/* Updated: 2020/08/02 10:50:39 by charles ### ########.fr */
+/* Updated: 2020/08/02 13:55:29 by charles ### ########.fr */
/* */
/* ************************************************************************** */
@@ -29,6 +29,7 @@ void ft_memswap(void *a, void *b, size_t size);
void ft_memset_pattern4(void *b, const void *pattern4, size_t len);
void *ft_memjoin(void *m1, size_t m1_size, void *m2, size_t m2_size);
void *ft_memjoinf1(void *m1, size_t m1_size, void *m2, size_t m2_size);
+void *ft_memdup(const void *src, size_t n);
void *ft_realloc(void *ptr, size_t ptr_size, size_t size);
diff --git a/src/mem/ft_memdup.c b/src/mem/ft_memdup.c
new file mode 100644
index 0000000..0c66cc5
--- /dev/null
+++ b/src/mem/ft_memdup.c
@@ -0,0 +1,22 @@
+/* ************************************************************************** */
+/* */
+/* ::: :::::::: */
+/* ft_memdup.c :+: :+: :+: */
+/* +:+ +:+ +:+ */
+/* By: charles <me@cacharle.xyz> +#+ +:+ +#+ */
+/* +#+#+#+#+#+ +#+ */
+/* Created: 2020/08/02 13:54:17 by charles #+# #+# */
+/* Updated: 2020/08/02 13:55:05 by charles ### ########.fr */
+/* */
+/* ************************************************************************** */
+
+#include "libft_io.h"
+
+void *ft_memdup(const void *src, size_t n)
+{
+ void *ret;
+
+ if ((ret = malloc(n)) == NULL)
+ return (NULL);
+ return (ft_memcpy(ret, src, n));
+}
diff --git a/src/str/ft_strtoupper.c b/src/str/ft_strtoupper.c
index 4a751d3..5dcfac6 100644
--- a/src/str/ft_strtoupper.c
+++ b/src/str/ft_strtoupper.c
@@ -6,21 +6,23 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/02/10 04:12:04 by cacharle #+# #+# */
-/* Updated: 2020/02/14 02:49:35 by cacharle ### ########.fr */
+/* Updated: 2020/08/02 14:14:17 by charles ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft_str.h"
-#include "libft_ctype.h"
char *ft_strtoupper(char *s)
{
- int i;
+ size_t i;
if (s == NULL)
return (NULL);
- i = -1;
- while (s[i])
+ i = 0;
+ while (s[i] != '\0')
+ {
s[i] = ft_toupper(s[i]);
+ i++;
+ }
return (s);
}