2021-10-24 00:38:16

libft/Makefile

@@ -6,7 +6,7 @@
 #    By: <gbaconni@student.42lausanne.ch>           +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2021/10/22 09:10:00 by gbaconni          #+#    #+#              #
-#    Updated: 2021/10/23 22:24:08 by gbaconni         ###   lausanne.ch        #
+#    Updated: 2021/10/24 00:36:41 by gbaconni         ###   lausanne.ch        #
 #                                                                              #
 # **************************************************************************** #
 #
@@ -105,7 +105,7 @@ update:
 
 compile:
 	@make -C $(LIBRARY) all
-	@$(CC) $(CFLAGS) $(SRC) -I${LIBRARY} -I$(INCLUDE) -L${LIBRARY} ${LIBS} -o $(OUT)
+	@$(CC) $(CFLAGS) -I$(INCLUDE) -I${LIBRARY} -L${LIBRARY} ${LIBS} -DMUNIT_DISABLE_TIMING=1 -o $(OUT) $(SRC)
 
 clean:
 	@make -C $(LIBRARY) clean

libft/munit.c

@@ -6,7 +6,7 @@
 /*   By: <gbaconni@student.42lausanne.ch>           +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2021/10/23 16:09:04 by gbaconni          #+#    #+#             */
-/*   Updated: 2021/10/23 23:34:36 by gbaconni         ###   lausanne.ch       */
+/*   Updated: 2021/10/24 00:37:03 by gbaconni         ###   lausanne.ch       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -147,22 +147,22 @@ static MunitResult	test_ft_strlcpy(const MunitParameter params[], void* user_dat
 
 	(void) user_data;
 	dstsize = strlen(munit_parameters_get(params, "dst")) + 1;
-	ft_dst = (char *) malloc(dstsize * sizeof(char));
+	ft_dst = (char *) munit_malloc(dstsize * sizeof(char));
 	if (ft_dst == NULL)
 		return (MUNIT_ERROR);
-	memset(ft_dst, '@', dstsize * sizeof(char));
+	memset(ft_dst, '@', dstsize);
-	dst = (char *) malloc(dstsize * sizeof(char));
+	dst = (char *) munit_malloc(dstsize * sizeof(char));
 	if (dst == NULL)
 		return (MUNIT_ERROR);
-	memset(dst, '@', dstsize * sizeof(char));
+	memset(dst, '@', dstsize);
 	src = (const char *) munit_parameters_get(params, "src");
 	(void) strncpy(ft_dst, munit_parameters_get(params, "dst"), dstsize);
 	(void) strncpy(dst, munit_parameters_get(params, "dst"), dstsize);
 	munit_assert_size(ft_strlcpy(ft_dst, src, dstsize), ==, strlcpy(dst, src, dstsize));
 	munit_assert_string_equal(ft_dst, dst);
 	munit_assert_memory_equal(dstsize, ft_dst, dst);
-	free(ft_dst);
+	//free(ft_dst);
-	free(dst);
+	//free(dst);
 	return (MUNIT_OK);
 }
 
@@ -175,22 +175,22 @@ static MunitResult	test_ft_strlcat(const MunitParameter params[], void* user_dat
 
 	(void) user_data;
 	dstsize = strlen(munit_parameters_get(params, "dst")) + strlen(munit_parameters_get(params, "src")) + 1;
-	ft_dst = (char *) malloc(dstsize * sizeof(char));
+	ft_dst = (char *) munit_malloc(dstsize * sizeof(char));
 	if (ft_dst == NULL)
 		return (MUNIT_ERROR);
-	memset(ft_dst, '@', dstsize * sizeof(char));
+	memset(ft_dst, '@', dstsize);
-	dst = (char *) malloc(dstsize * sizeof(char));
+	dst = (char *) munit_malloc(dstsize * sizeof(char));
 	if (dst == NULL)
 		return (MUNIT_ERROR);
-	memset(dst, '@', dstsize * sizeof(char));
+	memset(dst, '@', dstsize);
 	src = (const char *) munit_parameters_get(params, "src");
 	(void) strncpy(ft_dst, munit_parameters_get(params, "dst"), dstsize);
 	(void) strncpy(dst, munit_parameters_get(params, "dst"), dstsize);
 	munit_assert_size(ft_strlcat(ft_dst, src, dstsize), ==, strlcat(dst, src, dstsize));
 	munit_assert_string_equal(ft_dst, dst);
 	munit_assert_memory_equal(dstsize, ft_dst, dst);
-	free(ft_dst);
+	//free(ft_dst);
-	free(dst);
+	//free(dst);
 	return (MUNIT_OK);
 }
 
@@ -306,7 +306,7 @@ static MunitResult	test_ft_itoa(const MunitParameter params[], void* user_data)
 	ft_str = ft_itoa(n);
 	munit_assert_string_equal(ft_str, str);
 	munit_assert_memory_equal(strlen(str), ft_str, str);
-	free(ft_str);
+	//free(ft_str);
 	return (MUNIT_OK);
 }
 
@@ -362,21 +362,21 @@ static MunitResult	test_ft_bzero(const MunitParameter params[], void* user_data)
 
 	(void) user_data;
 	n = strlen(munit_parameters_get(params, "s")) + 1;
-	s = (void *) malloc(n * sizeof(unsigned char));
+	s = (void *) munit_malloc(n * sizeof(unsigned char));
 	if (s == NULL)
 		return (MUNIT_ERROR);
-	memset(s, '@', n * sizeof(unsigned char));
+	memset(s, '@', n);
-	ft_s = (void *) malloc(n * sizeof(unsigned char));
+	ft_s = (void *) munit_malloc(n * sizeof(unsigned char));
 	if (ft_s == NULL)
 		return (MUNIT_ERROR);
-	memset(ft_s, '@', n * sizeof(unsigned char));
+	memset(ft_s, '@', n);
 	(void) strncpy(s, munit_parameters_get(params, "s"), n);
 	(void) strncpy(ft_s, munit_parameters_get(params, "s"), n);
 	bzero(s, n);
 	ft_bzero(ft_s, n);
 	munit_assert_memory_equal(n, ft_s, s);
-	free(ft_s);
+	//free(ft_s);
-	free(s);
+	//free(s);
 	return (MUNIT_OK);
 }
 
@@ -390,21 +390,21 @@ static MunitResult	test_ft_memset(const MunitParameter params[], void* user_data
 	(void) user_data;
 	len = strlen(munit_parameters_get(params, "b")) + 1;
 	c = (int) (munit_parameters_get(params, "c"))[0];
-	b = (void *) malloc(len * sizeof(unsigned char));
+	b = (void *) munit_malloc(len * sizeof(unsigned char));
 	if (b == NULL)
 		return (MUNIT_ERROR);
-	memset(b, '@', len * sizeof(unsigned char));
+	memset(b, '@', len);
-	ft_b = (void *) malloc(len * sizeof(unsigned char));
+	ft_b = (void *) munit_malloc(len * sizeof(unsigned char));
 	if (ft_b == NULL)
 		return (MUNIT_ERROR);
-	memset(ft_b, '@', len * sizeof(unsigned char));
+	memset(ft_b, '@', len);
 	(void) strncpy(b, munit_parameters_get(params, "b"), len);
 	(void) strncpy(ft_b, munit_parameters_get(params, "b"), len);
 	memset(b, c, len);
 	ft_memset(ft_b, c, len);
 	munit_assert_memory_equal(len, ft_b, b);
-	free(ft_b);
+	//free(ft_b);
-	free(b);
+	//free(b);
 	return (MUNIT_OK);
 }
 
@@ -543,8 +543,8 @@ static MunitResult	test_ft_strdup(const MunitParameter params[], void* user_data
 	{
 		munit_assert_ptr_equal(ft_str, str);
 	}
-	free(ft_str);
+	//free(ft_str);
-	free(str);
+	//free(str);
 	return (MUNIT_OK);
 }
 
@@ -559,14 +559,14 @@ static MunitResult	test_ft_memcpy(const MunitParameter params[], void* user_data
 
 	(void) user_data;
 	n = strlen(munit_parameters_get(params, "dst")) + 1;
-	ft_dst = (char *) malloc(n * sizeof(char));
+	ft_dst = (char *) munit_malloc(n * sizeof(char));
 	if (ft_dst == NULL)
 		return (MUNIT_ERROR);
-	memset(ft_dst, '@', n * sizeof(unsigned char));
+	memset(ft_dst, '@', n);
-	dst = (char *) malloc(n * sizeof(char));
+	dst = (char *) munit_malloc(n * sizeof(char));
 	if (dst == NULL)
 		return (MUNIT_ERROR);
-	memset(dst, '@', n * sizeof(unsigned char));
+	memset(dst, '@', n);
 	(void) strncpy(ft_dst, munit_parameters_get(params, "dst"), n);
 	(void) strncpy(dst, munit_parameters_get(params, "dst"), n);
 	src = (const char *) munit_parameters_get(params, "src");
@@ -576,8 +576,8 @@ static MunitResult	test_ft_memcpy(const MunitParameter params[], void* user_data
 	munit_assert_string_equal(ft_str, str);
 	munit_assert_memory_equal(n, ft_dst, dst);
 	munit_assert_memory_equal(n, ft_str, str);
-	free(ft_dst);
+	//free(ft_dst);
-	free(dst);
+	//free(dst);
 	return (MUNIT_OK);
 }
 
@@ -592,14 +592,14 @@ static MunitResult	test_ft_memmove(const MunitParameter params[], void* user_dat
 
 	(void) user_data;
 	len = strlen(munit_parameters_get(params, "dst")) + 1;
-	ft_dst = (char *) malloc(len * sizeof(char));
+	ft_dst = (char *) munit_malloc(len * sizeof(char));
 	if (ft_dst == NULL)
 		return (MUNIT_ERROR);
-	memset(ft_dst, '@', len * sizeof(char));
+	memset(ft_dst, '@', len);
-	dst = (char *) malloc(len * sizeof(char));
+	dst = (char *) munit_malloc(len * sizeof(char));
 	if (dst == NULL)
 		return (MUNIT_ERROR);
-	memset(dst, '@', len * sizeof(char));
+	memset(dst, '@', len);
 	(void) strncpy(ft_dst, munit_parameters_get(params, "dst"), len);
 	(void) strncpy(dst, munit_parameters_get(params, "dst"), len);
 	src = (const char *) munit_parameters_get(params, "src");
@@ -609,8 +609,8 @@ static MunitResult	test_ft_memmove(const MunitParameter params[], void* user_dat
 	munit_assert_string_equal(ft_str, str);
 	munit_assert_memory_equal(len, ft_dst, dst);
 	munit_assert_memory_equal(len, ft_str, str);
-	free(ft_dst);
+	//free(ft_dst);
-	free(dst);
+	//free(dst);
 	return (MUNIT_OK);
 }
 
@@ -635,8 +635,8 @@ static MunitResult	test_ft_calloc(const MunitParameter params[], void* user_data
 			return (MUNIT_ERROR);
 		munit_assert_string_equal(ft_str, str);
 		munit_assert_memory_equal(count * size, ft_str, str);
-		free(ft_str);
+		//free(ft_str);
-		free(str);
+		//free(str);
 		count--;
 	}
 	return (MUNIT_OK);
@@ -680,10 +680,10 @@ static MunitResult	test_ft_putstr_fd(const MunitParameter params[], void* user_d
 	s = (char *) munit_parameters_get(params, "s");
 	n = strlen(s);
 	fd = -1;
-	str = (char *) malloc((n + 1) * sizeof(char));
+	str = (char *) munit_malloc((n + 1) * sizeof(char));
 	if (str == NULL)
 		return (MUNIT_ERROR);
-	memset(str, '@', (n + 1) * sizeof(char));
+	memset(str, '@', (n + 1));
 	memset(name, 0, sizeof(name));
 	strncpy(name,"/tmp/.ft_XXXXXX", 16);
 	fd = mkstemp(name);
@@ -697,7 +697,7 @@ static MunitResult	test_ft_putstr_fd(const MunitParameter params[], void* user_d
 	munit_assert_string_equal(str, s);
 	munit_assert_memory_equal(n + 1, str, s);
 	unlink(name);
-	free(str);
+	//free(str);
 	return (MUNIT_OK);
 }
 
@@ -714,10 +714,10 @@ static MunitResult	test_ft_putendl_fd(const MunitParameter params[], void* user_
 	s = (char *) munit_parameters_get(params, "s");
 	n = strlen(s);
 	fd = -1;
-	str = (char *) malloc((n + 1) * sizeof(char));
+	str = (char *) munit_malloc((n + 1) * sizeof(char));
 	if (str == NULL)
 		return (MUNIT_ERROR);
-	memset(str, '@', (n + 1) * sizeof(char));
+	memset(str, '@', (n + 1));
 	memset(name, 0, sizeof(name));
 	strncpy(name,"/tmp/.ft_XXXXXX", 16);
 	fd = mkstemp(name);
@@ -734,7 +734,7 @@ static MunitResult	test_ft_putendl_fd(const MunitParameter params[], void* user_
 	munit_assert_int(count, ==, 1);
 	munit_assert_int(str[0], ==, '\n');
 	unlink(name);
-	free(str);
+	//free(str);
 	return (MUNIT_OK);
 }
 
@@ -754,10 +754,10 @@ static MunitResult	test_ft_putnbr_fd(const MunitParameter params[], void* user_d
 	ft_str = ft_itoa(n);
 	fd = -1;
 	len = strlen(str);
-	ft_str = (char *) malloc((len + 1) * sizeof(char));
+	ft_str = (char *) munit_malloc((len + 1) * sizeof(char));
 	if (ft_str == NULL)
 		return (MUNIT_ERROR);
-	memset(ft_str, '@', (len + 1) * sizeof(char));
+	memset(ft_str, '@', (len + 1));
 	memset(name, 0, sizeof(name));
 	strncpy(name,"/tmp/.ft_XXXXXX", 16);
 	fd = mkstemp(name);
@@ -772,7 +772,7 @@ static MunitResult	test_ft_putnbr_fd(const MunitParameter params[], void* user_d
 	munit_assert_string_equal(ft_str, str);
 	munit_assert_memory_equal(len, ft_str, str);
 	unlink(name);
-	free(ft_str);
+	//free(ft_str);
 	return (MUNIT_OK);
 }