Bonus fix and var_end call on errors

diff --git a/Makefile b/Makefile
index 7835d12163c9c69b60a20c7e1867b8a82940d8c6..b9feb6615f96d008d73ffee6a0417103639379dc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,6 @@ fclean : clean
 
 re : fclean all
 
 
 re : fclean all
 

-bonus :
+bonus : ${NAME}

 
 .PHONY : all clean fclean re bonus
 
 .PHONY : all clean fclean re bonus

diff --git a/ft_printf.c b/ft_printf.c
index 000bdd411fb7d5c09a504f79b7c775beafdfc64b..5b4ce0bb25ad4214686c96402207301b07004195 100644 (file)
--- a/ft_printf.c
+++ b/ft_printf.c
@@ -6,7 +6,7 @@
 /*   By: agilliar <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/10/29 14:24:47 by agilliar          #+#    #+#             */
 /*   By: agilliar <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/10/29 14:24:47 by agilliar          #+#    #+#             */

-/*   Updated: 2025/11/01 00:21:44 by agilliar         ###   ########.fr       */
+/*   Updated: 2025/11/03 12:51:25 by agilliar         ###   ########.fr       */

 /*                                                                            */
 /* ************************************************************************** */
 
 /*                                                                            */
 /* ************************************************************************** */
 


@@ -89,7 +89,7 @@ int   ft_printf(const char *s, ...)
        {
                written = ft_printf_step(&s, &format, arg);
                if (written == -1)
        {
                written = ft_printf_step(&s, &format, arg);
                if (written == -1)

-                       return (-1);
+                       return (va_end(args), -1);

                count += written;
                if (specifier_to_step(format.specifier) == STEP_INT)
                        arg.v_int = va_arg(args, int);
                count += written;
                if (specifier_to_step(format.specifier) == STEP_INT)
                        arg.v_int = va_arg(args, int);


@@ -98,6 +98,5 @@ int   ft_printf(const char *s, ...)
                if (specifier_to_step(format.specifier) == STEP_PTR)
                        arg.v_ptr = va_arg(args, void *);
        }
                if (specifier_to_step(format.specifier) == STEP_PTR)
                        arg.v_ptr = va_arg(args, void *);
        }

-       va_end(args);
-       return (count);
+       return (va_end(args), count);

 }
 }