Norminette OK, Bonus OK

This commit is contained in:
David Gailleton
2025-11-21 14:33:45 +01:00
parent 92e03e0caf
commit 56c3d8ba94
6 changed files with 54 additions and 41 deletions

View File

@@ -6,54 +6,37 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/17 12:26:23 by dgaillet #+# #+# */
/* Updated: 2025/11/21 12:29:02 by dgaillet ### ########lyon.fr */
/* Updated: 2025/11/21 14:22:44 by dgaillet ### ########lyon.fr */
/* */
/* ************************************************************************** */
#include "ft_printf_bonus.h"
#include <unistd.h>
static int padding_size(int space, int plus, t_arg *arg, int nbr)
static int padding_size(t_arg *arg, unsigned int nbr)
{
int padding;
int nbr_size;
if (arg->padding < 0)
return (0);
padding = arg->padding - space - plus;
if (nbr < 0)
nbr_size = nbr_size_base(nbr * -1, 10);
else
nbr_size = nbr_size_base(nbr, 10);
if (arg->dot > nbr_size || arg->dot == 0)
padding = arg->padding;
nbr_size = nbr_size_base(nbr, 10);
if (arg->dot > nbr_size || (arg->dot == 0 && !nbr))
nbr_size = arg->dot;
padding = padding - nbr_size;
if (nbr < 0)
padding--;
return (padding);
}
static int print_nb_flags(t_arg *arg, int nbr)
static int print_nb_flags(t_arg *arg, unsigned int nbr)
{
int count;
int space;
int padding;
int plus;
if (arg->plus >= 0 && nbr > 0)
plus = 1;
else
plus = 0;
if (arg->plus >= 0 || arg->space < 0)
space = 0;
else
space = 1;
padding = padding_size(space, plus, arg, nbr);
padding = padding_size(arg, nbr);
count = 0;
if (arg->dot >= 0 || arg->zero < 0)
count += print_chars(padding, ' ');
count += print_chars(space, ' ');
count += print_chars(plus, '+');
return (count);
}