Refactored parsing to handle alone '%'

- renamed a few variables
- added join_free* to libft
- normed everything but ft_printf.c

1 files changed, 9 insertions, 26 deletions

diff --git a/convert_int.c b/convert_int.c
index 0f4d7d1..f995ced 100644
--- a/convert_int.c
+++ b/convert_int.c
@@ -6,52 +6,35 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/10/30 23:29:53 by cacharle          #+#    #+#             */
-/*   Updated: 2019/11/04 01:26:38 by cacharle         ###   ########.fr       */
+/*   Updated: 2019/11/06 00:00:09 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include <stdlib.h>
-#include <stdarg.h>
-#include "libft.h"
 #include "header.h"
 
 char	*convert_int(va_list ap, t_pformat *pformat)
 {
-	char			*tmp;
 	int				is_neg;
 	long long int	n;
 	char			*str;
 
-	if (pformat->flags & FLAG_SHORT)
-		n = (short)va_arg(ap, int);
-	else if (pformat->flags & FLAG_SHORT_SHORT)
-		n = (signed char)va_arg(ap, int);
-	else if (pformat->flags & FLAG_LONG)
-		n = va_arg(ap, long int);
-	else if (pformat->flags & FLAG_LONG_LONG)
-		n = va_arg(ap, long long int);
-	else
-		n = va_arg(ap, int);
+	n = length_modifier_int(ap, pformat);
 	is_neg = n < 0;
 	str = ITOA_DEC(n);
 	if (is_neg)
 		ft_strcpy(str, str + 1);
 	str = handle_precision(pformat, str);
-	if (pformat->flags & FLAG_ZERO_PADDING)
+	if (pformat->flags & FLAG_ZERO)
 	{
 		if (is_neg || pformat->flags & (FLAG_SIGNED | FLAG_SPACE))
-			pformat->min_width--;
-		str = handle_padding(pformat, str);
+			pformat->width--;
+		str = handle_width(pformat, str);
 	}
 	if (is_neg)
-		tmp = ft_strjoin("-", str);
+		str = ft_strjoin_free_snd("-", str);
 	else if (pformat->flags & (FLAG_SIGNED | FLAG_SPACE))
-		tmp = ft_strjoin(pformat->flags & FLAG_SPACE ? " " : "+", str);
-	else
-		tmp = ft_strdup(str);
-	free(str);
-	str = tmp;
-	if (!(pformat->flags & FLAG_ZERO_PADDING))
-		str = handle_padding(pformat, str);
+		str = ft_strjoin_free_snd(pformat->flags & FLAG_SPACE ? " " : "+", str);
+	if (!(pformat->flags & FLAG_ZERO))
+		str = handle_width(pformat, str);
 	return (str);
 }