Norming and removing ft_printf,heapsort

31 files changed, 9 insertions, 1247 deletions

diff --git a/include/libft_vec.h b/include/libft_vec.h
index c63c128..287ce6f 100644
--- a/include/libft_vec.h
+++ b/include/libft_vec.h
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/01 18:57:16 by charles           #+#    #+#             */
-/*   Updated: 2020/08/19 17:49:03 by charles          ###   ########.fr       */
+/*   Updated: 2020/10/11 14:04:43 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -54,6 +54,7 @@ t_ftvec			*ft_vecinsert_safe(t_ftvec *vec, size_t i, void *elem);
 void			ft_vecsort(t_ftvec *vec, t_ftcompar_func cmp);
 void			**ft_vecunwrap(t_ftvec *vec);
 t_ftvec			*ft_vecfrom_lst(t_ftlst *lst);
-t_ftvec			*ft_vecswallow_at(t_ftvec *vec, size_t index, t_ftvec *swallowed);
+t_ftvec			*ft_vecswallow_at(
+					t_ftvec *vec, size_t index, t_ftvec *swallowed);
 
 #endif
diff --git a/src/algo/ft_heapsort.c b/src/algo/ft_heapsort.c
deleted file mode 100644
index d309624..0000000
--- a/src/algo/ft_heapsort.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_heapsort.c                                      :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2020/02/10 02:59:22 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/10 04:22:19 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft_algo.h"
-
-/* static void	st_build_max_heap(void *base, size_t nel, size_t width, */
-/* 				int (*compar)(const void *, const void *)) */
-/* { */
-/* 	int	i; */
-/*  */
-/* 	i = 1; */
-/* 	while (i < nel) */
-/* 	{ */
-/* 		compar(base + i * width, base + 2 * i * width) */
-/*  */
-/* 		i++; */
-/* 	} */
-/* } */
-/*  */
-/* static void	st_heapify(void *base, size_t nel, size_t width, */
-/* 				int (*compar)(const void *, const void *)) */
-/* { */
-/*  */
-/* } */
-
-int		ft_heapsort(void *base, size_t nel, size_t width,
-				int (*compar)(const void *, const void *))
-{
-	(void)base;
-	(void)nel;
-	(void)width;
-	(void)compar;
-	/* size_t	i; */
-    /*  */
-	/* if (nel < 2) */
-	/* 	return (0); */
-	/* st_build_max_heap(base, nel, width, compar); */
-	/* i = -1; */
-	/* while (++i < nel) */
-	/* { */
-	/* 	ft_memswap(base, base + (nel - i - 1) * width); */
-	/* 	st_heapify(base, nel - i - 1, width, compar); */
-	/* } */
-	return (0);
-}
diff --git a/src/dstr/ft_dstrerase.c b/src/dstr/ft_dstrerase.c
index 3d4732b..b758d3a 100644
--- a/src/dstr/ft_dstrerase.c
+++ b/src/dstr/ft_dstrerase.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/05 00:39:12 by charles           #+#    #+#             */
-/*   Updated: 2020/04/05 01:11:07 by charles          ###   ########.fr       */
+/*   Updated: 2020/10/11 14:00:29 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -28,8 +28,7 @@ void			ft_dstrerase(t_ftdstr *dstr, size_t start, size_t len)
 	ft_memmove(
 		dstr->str + start,
 		dstr->str + start + len,
-		dstr->length - start - len
-	);
+		dstr->length - start - len);
 	dstr->length -= len;
 	dstr->str[dstr->length] = '\0';
 }
diff --git a/src/ht/ft_hthash.c b/src/ht/ft_hthash.c
index c5d42ea..200252f 100644
--- a/src/ht/ft_hthash.c
+++ b/src/ht/ft_hthash.c
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/01/30 09:56:01 by cacharle          #+#    #+#             */
-/*   Updated: 2020/01/30 10:34:27 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/10/11 14:00:00 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,7 +19,6 @@
 ** \return     Hash
 */
 
-// maybe use a less efficient but understandable function
 size_t	ft_hthash(t_ftht *ht, char *key)
 {
 	size_t	digest;
diff --git a/src/io/ft_printf/ft_asprintf.c b/src/io/ft_printf/ft_asprintf.c
deleted file mode 100644
index 5eb62d9..0000000
--- a/src/io/ft_printf/ft_asprintf.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_asprintf.c                                      :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2019/11/21 02:30:33 by cacharle          #+#    #+#             */
-/*   Updated: 2019/11/21 03:43:08 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-
-int	ft_asprintf(char **ret, const char *format, ...)
-{
-	int		vret;
-	va_list	ap;
-
-	va_start(ap, format);
-	vret = ft_vasprintf(ret, format, ap);
-	va_end(ap);
-	return (vret);
-}
diff --git a/src/io/ft_printf/ft_dprintf.c b/src/io/ft_printf/ft_dprintf.c
deleted file mode 100644
index 8e60970..0000000
--- a/src/io/ft_printf/ft_dprintf.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_dprintf.c                                       :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2019/11/21 02:29:11 by cacharle          #+#    #+#             */
-/*   Updated: 2019/11/21 03:42:05 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-
-int	ft_dprintf(int fd, const char *format, ...)
-{
-	int		ret;
-	va_list	ap;
-
-	va_start(ap, format);
-	ret = ft_vdprintf(fd, format, ap);
-	va_end(ap);
-	return (ret);
-}
diff --git a/src/io/ft_printf/ft_printf.c b/src/io/ft_printf/ft_printf.c
deleted file mode 100644
index 1b92bb2..0000000
--- a/src/io/ft_printf/ft_printf.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_printf.c                                        :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2019/11/21 02:31:32 by cacharle          #+#    #+#             */
-/*   Updated: 2019/11/21 03:41:54 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-
-int	ft_printf(const char *format, ...)
-{
-	int		ret;
-	va_list	ap;
-
-	va_start(ap, format);
-	ret = ft_vprintf(format, ap);
-	va_end(ap);
-	return (ret);
-}
diff --git a/src/io/ft_printf/ft_snprintf.c b/src/io/ft_printf/ft_snprintf.c
deleted file mode 100644
index e1fdfbd..0000000
--- a/src/io/ft_printf/ft_snprintf.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_snprintf.c                                      :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2019/11/21 02:27:55 by cacharle          #+#    #+#             */
-/*   Updated: 2019/11/21 03:41:49 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-
-int	ft_snprintf(char *str, size_t size, const char *format, ...)
-{
-	int		ret;
-	va_list	ap;
-
-	va_start(ap, format);
-	ret = ft_vsnprintf(str, size, format, ap);
-	va_end(ap);
-	return (ret);
-}
diff --git a/src/io/ft_printf/ft_sprintf.c b/src/io/ft_printf/ft_sprintf.c
deleted file mode 100644
index 31da75e..0000000
--- a/src/io/ft_printf/ft_sprintf.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_sprintf.c                                       :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2019/11/21 02:17:21 by cacharle          #+#    #+#             */
-/*   Updated: 2019/11/21 03:42:28 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-
-int	ft_sprintf(char *str, const char *format, ...)
-{
-	int		ret;
-	va_list	ap;
-
-	va_start(ap, format);
-	ret = ft_vsprintf(str, format, ap);
-	va_end(ap);
-	return (ret);
-}
diff --git a/src/io/ft_printf/ft_vasprintf.c b/src/io/ft_printf/ft_vasprintf.c
deleted file mode 100644
index 85f66bc..0000000
--- a/src/io/ft_printf/ft_vasprintf.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_vasprintf.c                                     :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2019/11/21 02:49:56 by cacharle          #+#    #+#             */
-/*   Updated: 2019/11/21 03:45:39 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-
-int	ft_vasprintf(char **ret, const char *format, va_list ap)
-{
-	(void)ret;
-	(void)format;
-	(void)ap;
-	return (0);
-}
diff --git a/src/io/ft_printf/ft_vasprintf.h b/src/io/ft_printf/ft_vasprintf.h
deleted file mode 100644
index 2d364c8..0000000
--- a/src/io/ft_printf/ft_vasprintf.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   header.h                                           :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2019/10/29 00:06:46 by cacharle          #+#    #+#             */
-/*   Updated: 2020/01/15 11:39:15 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#ifndef FT_VASPRINTF_H
-# define FT_VASPRINTF_H
-
-# include <unistd.h>
-# include <stdlib.h>
-# include <stdarg.h>
-# include "libft.h"
-
-# define STATUS_ERROR -1
-
-# define SPECIFIERS_STR "nfcspdiuxX%"
-# define FLAGS_STR      "#0- +'"
-
-# define IS_STANDALONE_FLAG(c) (ft_strchr(FLAGS_STR, c) != NULL)
-
-# define FLAG_MINUS               (1 << 0)
-# define FLAG_ZERO                (1 << 1)
-# define FLAG_SIGNED              (1 << 2)
-# define FLAG_SPACE               (1 << 3)
-# define FLAG_ALTERNATE           (1 << 4)
-# define FLAG_SHORT               (1 << 5)
-# define FLAG_SHORT_SHORT         (1 << 6)
-# define FLAG_LONG                (1 << 7)
-# define FLAG_LONG_LONG           (1 << 8)
-# define FLAG_WIDTH_WILDCARD      (1 << 9)
-# define FLAG_PRECISION_WILDCARD  (1 << 10)
-# define FLAG_WIDTH_OVERWRITE     (1 << 11)
-
-# define ITOA_HEX_LOW(x) (ft_itoa_unsigned_base(x, "0123456789abcdef"))
-# define ITOA_HEX_UP(x)  (ft_itoa_unsigned_base(x, "0123456789ABCDEF"))
-# define ITOA_DEC(x)     (ft_itoa_base(x, "0123456789"))
-
-typedef int						t_bool;
-typedef short					t_flags;
-typedef long long int			t_big_int;
-typedef long long unsigned int	t_big_uint;
-
-typedef struct
-{
-	int				precision;
-	int				width;
-	t_flags			flags;
-	char			specifier;
-	int				fmt_len;
-	int				size;
-	long long int	*written;
-}					t_pformat;
-
-typedef struct		s_flist
-{
-	struct s_flist	*next;
-	t_pformat		*content;
-}					t_flist;
-
-typedef struct		s_printf_status
-{
-	va_list			ap;
-	t_flist			*flist;
-	const char		*format;
-	char			*out;
-	int				out_size;
-}					t_printf_status;
-
-/*
-** ft_printf.c
-*/
-
-int					ft_printf(const char *format, ...);
-const char			*add_conversion(t_printf_status *status,
-									t_pformat *pformat);
-const char			*add_between(t_printf_status *status);
-int					destroy_status_error(t_printf_status *status);
-
-/*
-** parse.c
-*/
-
-int					parse(const char *format, t_flist **flist);
-t_pformat			*parse_reduced(const char *fmt);
-
-/*
-** printer.c
-*/
-
-char				*convert(t_pformat *pformat, va_list ap);
-char				*convert_specifier(va_list ap, t_pformat *pformat);
-char				*handle_width(t_pformat *pformat, char *str);
-char				*handle_precision(t_pformat *pformat, char *str);
-
-/*
-** utils.c
-*/
-
-char				*ft_itoa_base(long long int n, char *base);
-char				*ft_itoa_unsigned_base(long long unsigned int n,
-											char *base);
-void				*ft_memjoin_free(void *dst, int dst_size, void *src,
-										int src_size);
-
-/*
-** extract.c
-*/
-
-const char			*extract_flags(t_pformat *pformat, const char *fmt);
-const char			*extract_width(t_pformat *pformat, const char *fmt);
-const char			*extract_precision(t_pformat *pformat, const char *fmt);
-const char			*extract_length_modifier(t_pformat *pformat,
-												const char *fmt);
-
-/*
-** list.c
-*/
-
-t_flist				*list_new(t_pformat *content);
-void				*list_destroy(t_flist **lst);
-void				list_push_front(t_flist **lst, t_flist *new);
-void				list_pop_front(t_flist **lst);
-t_flist				*list_reverse(t_flist *lst);
-
-/*
-** convert_*.c
-*/
-
-char				*convert_char(va_list ap, t_pformat *pformat);
-char				*convert_str(va_list ap, t_pformat *pformat);
-char				*convert_ptr(va_list ap, t_pformat *pformat);
-char				*convert_int(va_list ap, t_pformat *pformat);
-char				*convert_uint(va_list ap, t_pformat *pformat);
-char				*convert_hex(va_list ap, t_pformat *pformat);
-char				*convert_percent(va_list ap, t_pformat *pformat);
-char				*convert_written(va_list ap, t_pformat *pformat);
-char				*convert_double(va_list ap, t_pformat *pformat);
-char				*convert_none(va_list ap, t_pformat *pformat);
-
-/*
-** length_modifier.c
-*/
-
-t_big_uint			length_modifier_unsigned_int(
-							va_list ap, t_pformat *pformat);
-t_big_int			length_modifier_int(va_list ap, t_pformat *pformat);
-
-#endif
diff --git a/src/io/ft_printf/ft_vdprintf.c b/src/io/ft_printf/ft_vdprintf.c
deleted file mode 100644
index a5e5ebf..0000000
--- a/src/io/ft_printf/ft_vdprintf.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_vdprintf.c                                      :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2019/11/21 02:40:03 by cacharle          #+#    #+#             */
-/*   Updated: 2019/11/21 03:46:00 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-
-int	ft_vdprintf(int fd, const char *format, va_list ap)
-{
-	int		out_len;
-	char	*out;
-
-	if ((out_len = ft_vasprintf(&out, format, ap)) == -1)
-		return (-1);
-	write(fd, out, out_len);
-	return (out_len);
-}
diff --git a/src/io/ft_printf/ft_vprintf.c b/src/io/ft_printf/ft_vprintf.c
deleted file mode 100644
index b98670b..0000000
--- a/src/io/ft_printf/ft_vprintf.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_vprintf.c                                       :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2019/11/21 02:32:44 by cacharle          #+#    #+#             */
-/*   Updated: 2019/11/21 03:44:11 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-
-int	ft_vprintf(const char *format, va_list ap)
-{
-	return (ft_vdprintf(STDOUT_FILENO, format, ap));
-}
diff --git a/src/io/ft_printf/ft_vsnprintf.c b/src/io/ft_printf/ft_vsnprintf.c
deleted file mode 100644
index 7db988c..0000000
--- a/src/io/ft_printf/ft_vsnprintf.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_vsnprintf.c                                     :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2019/11/21 02:36:32 by cacharle          #+#    #+#             */
-/*   Updated: 2019/11/21 03:45:14 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-
-int	ft_vsnprintf(char *str, size_t size, const char *format, va_list ap)
-{
-	int		ret;
-	int		full_out_len;
-	char	*full_out;
-
-	full_out_len = ft_vasprintf(&full_out, format, ap);
-	ft_strncpy(str, full_out, size);
-	ret = MIN((size_t)full_out_len, size);
-	free(full_out);
-	return (ret);
-}
diff --git a/src/io/ft_printf/ft_vsprintf.c b/src/io/ft_printf/ft_vsprintf.c
deleted file mode 100644
index 91b4815..0000000
--- a/src/io/ft_printf/ft_vsprintf.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_vsprintf.c                                      :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2019/11/21 02:34:17 by cacharle          #+#    #+#             */
-/*   Updated: 2019/11/21 03:44:24 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-
-int	ft_vsprintf(char *str, const char *format, va_list ap)
-{
-	return (ft_vsnprintf(str, INT_MAX + 1, format, ap));
-}
diff --git a/src/io/ft_printf/internals/convert.c b/src/io/ft_printf/internals/convert.c
deleted file mode 100644
index 398c754..0000000
--- a/src/io/ft_printf/internals/convert.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   printer.c                                          :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2019/10/28 23:19:24 by cacharle          #+#    #+#             */
-/*   Updated: 2019/11/14 10:22:04 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include "libft.h"
-#include "ft_vasprintf.h"
-
-char	*convert(t_pformat *pformat, va_list ap)
-{
-	char			*str;
-
-	if (pformat == NULL)
-		return (NULL);
-	if (pformat->flags & FLAG_WIDTH_WILDCARD)
-	{
-		if (pformat->flags & FLAG_WIDTH_OVERWRITE)
-			(void)va_arg(ap, int);
-		else
-			pformat->width = va_arg(ap, int);
-		if (pformat->width < 0)
-		{
-			pformat->flags |= FLAG_MINUS;
-			pformat->width *= -1;
-		}
-	}
-	if (pformat->flags & FLAG_PRECISION_WILDCARD)
-		pformat->precision = va_arg(ap, int);
-	if ((str = convert_specifier(ap, pformat)) == NULL)
-		return (NULL);
-	return (str);
-}
-
-char	*convert_specifier(va_list ap, t_pformat *pformat)
-{
-	if (pformat->specifier == 'c')
-		return (convert_char(ap, pformat));
-	if (pformat->specifier == 's')
-		return (convert_str(ap, pformat));
-	if (pformat->specifier == 'p')
-		return (convert_ptr(ap, pformat));
-	if (pformat->specifier == 'd' || pformat->specifier == 'i')
-		return (convert_int(ap, pformat));
-	if (pformat->specifier == 'u')
-		return (convert_uint(ap, pformat));
-	if (pformat->specifier == 'x')
-		return (convert_hex(ap, pformat));
-	if (pformat->specifier == 'X')
-		return (convert_hex(ap, pformat));
-	if (pformat->specifier == '%')
-		return (convert_percent(ap, pformat));
-	if (pformat->specifier == 'n')
-		return (convert_written(ap, pformat));
-	else
-		return (convert_none(ap, pformat));
-	return (NULL);
-}
-
-char	*handle_width(t_pformat *pformat, char *str)
-{
-	char	*tmp;
-	int		len;
-	int		i;
-
-	if ((len = ft_strlen(str)) >= pformat->width)
-		return (str);
-	if ((tmp = (char*)malloc(sizeof(char) * (pformat->width + 1))) == NULL)
-		return (NULL);
-	if (pformat->flags & FLAG_MINUS)
-	{
-		i = len;
-		ft_strcpy(tmp, str);
-		while (i < pformat->width)
-			tmp[i++] = ' ';
-		tmp[i] = 0;
-	}
-	else
-	{
-		i = 0;
-		while (i <= pformat->width - len)
-			tmp[i++] = pformat->flags & FLAG_ZERO ? '0' : ' ';
-		ft_strcpy(tmp + i - 1, str);
-	}
-	free(str);
-	return (tmp);
-}
-
-char	*handle_precision(t_pformat *pformat, char *str)
-{
-	int		len;
-	char	*tmp;
-
-	if (pformat == NULL || str == NULL)
-		return (NULL);
-	if (ft_strchr("diuxX", pformat->specifier) && pformat->precision >= 0)
-		pformat->flags &= ~FLAG_ZERO;
-	len = ft_strlen(str);
-	if (pformat->precision == 0 && str[0] == '0')
-	{
-		free(str);
-		return (ft_strdup(""));
-	}
-	if (!ft_strchr("diuxXp", pformat->specifier) || len >= pformat->precision)
-		return (str);
-	if ((tmp = (char*)malloc(sizeof(char) * (pformat->precision + 1))) == NULL)
-		return (NULL);
-	ft_strcpy(tmp + pformat->precision - len, str);
-	while (pformat->precision-- > len)
-		tmp[pformat->precision - len] = '0';
-	free(str);
-	return (tmp);
-}
diff --git a/src/io/ft_printf/internals/convert_char.c b/src/io/ft_printf/internals/convert_char.c
deleted file mode 100644
index c5f3a93..0000000
--- a/src/io/ft_printf/internals/convert_char.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   convert_char.c                                     :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2019/10/30 23:22:29 by cacharle          #+#    #+#             */
-/*   Updated: 2019/11/05 23:44:42 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************