From 6e6caf30f11e583b21fe88f008da2f46a2a32137 Mon Sep 17 00:00:00 2001 From: gbaconni Date: Sun, 24 Apr 2022 01:07:24 +0200 Subject: [PATCH] Fix ft_skipchars offset --- libftprintf/ft_vprintf.c | 3 ++- libftprintf/ft_vprintf_percent.c | 10 ++++------ libftprintf/ft_vprintf_string.c | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libftprintf/ft_vprintf.c b/libftprintf/ft_vprintf.c index ba052ee..bd8da1e 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/24 00:36:07 by gbaconni ### lausanne.ch */ +/* Updated: 2022/04/24 01:04:26 by gbaconni ### lausanne.ch */ /* */ /* ************************************************************************** */ @@ -24,6 +24,7 @@ int ft_vprintf(char const *format, va_list ap) if (*fmt == '%') { fmt++; + fmt += ft_skipchars(fmt, "0123456789# +"); ret += ft_vprintf_percent(fmt, ap); } else diff --git a/libftprintf/ft_vprintf_percent.c b/libftprintf/ft_vprintf_percent.c index a16ef92..91ac9a9 100644 --- a/libftprintf/ft_vprintf_percent.c +++ b/libftprintf/ft_vprintf_percent.c @@ -6,7 +6,7 @@ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/01/20 11:55:58 by gbaconni #+# #+# */ -/* Updated: 2022/04/24 00:29:57 by gbaconni ### lausanne.ch */ +/* Updated: 2022/04/24 01:06:15 by gbaconni ### lausanne.ch */ /* */ /* ************************************************************************** */ @@ -14,13 +14,11 @@ int ft_vprintf_percent(const char *format, va_list ap) { - const char *fmt; - int ret; - char c; + int ret; + char c; ret = 0; - fmt = format + 1; - c = *(fmt + ft_skipchars(fmt, "0123456789# +")); + c = *format; if (c == 'c') ret = ft_vprintf_char(format, ap); else if (c == 's') diff --git a/libftprintf/ft_vprintf_string.c b/libftprintf/ft_vprintf_string.c index 24cd27d..cbe6406 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/16 00:35:13 by gbaconni ### lausanne.ch */ +/* Updated: 2022/04/24 00:59:10 by gbaconni ### lausanne.ch */ /* */ /* ************************************************************************** */