diff --git a/libftprintf/ft_eoflags.c b/libftprintf/ft_eoflags.c index 0bb580e..0b89451 100644 --- a/libftprintf/ft_eoflags.c +++ b/libftprintf/ft_eoflags.c @@ -6,7 +6,7 @@ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/04/26 10:13:59 by gbaconni #+# #+# */ -/* Updated: 2022/04/26 13:24:34 by gbaconni ### ########.fr */ +/* Updated: 2022/04/29 08:58:41 by gbaconni ### lausanne.ch */ /* */ /* ************************************************************************** */ @@ -16,7 +16,7 @@ int ft_eoflags(const char *s) { int ret; int i; - const char *chars = "cspdiuxX%"; + const char *chars = SPECIFIERS; ret = 0; if (s == NULL) diff --git a/libftprintf/ft_vprintf.c b/libftprintf/ft_vprintf.c index 2f9580e..c64884e 100644 --- a/libftprintf/ft_vprintf.c +++ b/libftprintf/ft_vprintf.c @@ -6,7 +6,7 @@ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/01/20 11:43:52 by gbaconni #+# #+# */ -/* Updated: 2022/04/26 15:20:34 by gbaconni ### ########.fr */ +/* Updated: 2022/04/29 08:48:39 by gbaconni ### lausanne.ch */ /* */ /* ************************************************************************** */ @@ -15,7 +15,7 @@ int ft_vprintf(char const *format, va_list ap) { int ret; - + ret = 0; while (*format != 0) { diff --git a/libftprintf/ft_vprintf_decimal.c b/libftprintf/ft_vprintf_decimal.c index a2a6dd5..cc7a017 100644 --- a/libftprintf/ft_vprintf_decimal.c +++ b/libftprintf/ft_vprintf_decimal.c @@ -6,7 +6,7 @@ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/01/20 11:55:02 by gbaconni #+# #+# */ -/* Updated: 2022/04/29 08:42:35 by gbaconni ### lausanne.ch */ +/* Updated: 2022/04/29 09:09:08 by gbaconni ### lausanne.ch */ /* */ /* ************************************************************************** */ @@ -44,7 +44,7 @@ int ft_vprintf_decimal(const char *format, va_list ap) { if (ft_isdigit(*f)) precision = precision * 10 + *f - '0'; - if (ft_strchr("cspdiuxX%", *f) != NULL) + if (ft_strchr(SPECIFIERS, *f) != NULL) break ; f++; } @@ -52,7 +52,7 @@ int ft_vprintf_decimal(const char *format, va_list ap) if (precision > 0) { len = precision - ft_strlen(s); - while (len --> 0) + while (len-- > 0) { if (flags & F_ZERO) ret += ft_putchar('0'); diff --git a/libftprintf/ft_vprintf_flags_bonus.c b/libftprintf/ft_vprintf_flags_bonus.c index cd60b02..a45640e 100644 --- a/libftprintf/ft_vprintf_flags_bonus.c +++ b/libftprintf/ft_vprintf_flags_bonus.c @@ -6,7 +6,7 @@ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/04/25 13:15:32 by gbaconni #+# #+# */ -/* Updated: 2022/04/26 17:18:20 by gbaconni ### ########.fr */ +/* Updated: 2022/04/29 08:59:37 by gbaconni ### lausanne.ch */ /* */ /* ************************************************************************** */ @@ -32,9 +32,9 @@ int ft_vprintf_flags_bonus(const char *format, va_list ap) ret |= F_SPACE; else if (*f == '+') ret |= F_PLUS; - else if (*f >= '0' && *f <= '9') + else if (ft_isdigit(*f)) break ; - if (*f == 'c' || *f == 's' || *f == 'p' || *f == 'd' || *f == 'i' || *f == 'u' || *f == 'x' || *f == 'X' || *f == '%') + if (ft_strchr(SPECIFIERS, *f) != NULL) break ; f++; } diff --git a/libftprintf/ft_vprintf_string.c b/libftprintf/ft_vprintf_string.c index c0d6ee0..46690f5 100644 --- a/libftprintf/ft_vprintf_string.c +++ b/libftprintf/ft_vprintf_string.c @@ -6,7 +6,7 @@ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/01/20 11:56:37 by gbaconni #+# #+# */ -/* Updated: 2022/04/29 08:42:02 by gbaconni ### lausanne.ch */ +/* Updated: 2022/04/29 09:03:47 by gbaconni ### lausanne.ch */ /* */ /* ************************************************************************** */ @@ -38,14 +38,14 @@ int ft_vprintf_string(const char *format, va_list ap) { if (ft_isdigit(*f)) precision = precision * 10 + *f - '0'; - if (ft_strchr("cspdiuxX%", *f) != NULL) + if (ft_strchr(SPECIFIERS, *f) != NULL) break ; f++; } if (precision > 0) { len = precision - ft_strlen(s); - while (len --> 0) + while (len-- > 0) ret += ft_putchar(' '); } ret += ft_puts(s); diff --git a/libftprintf/libftprintf.h b/libftprintf/libftprintf.h index 38c3877..ee380d3 100644 --- a/libftprintf/libftprintf.h +++ b/libftprintf/libftprintf.h @@ -6,7 +6,7 @@ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/01/18 15:26:06 by gbaconni #+# #+# */ -/* Updated: 2022/04/26 10:41:36 by gbaconni ### ########.fr */ +/* Updated: 2022/04/29 08:56:40 by gbaconni ### lausanne.ch */ /* */ /* ************************************************************************** */ @@ -23,6 +23,8 @@ # define NIL "(nil)" # endif +# define SPECIFIERS "cspdiuxX%" + /* Helper */ int ft_eoflags(const char *s);