diff --git a/ft_printf.c b/ft_printf.c index 95ae47d..45b607e 100644 --- a/ft_printf.c +++ b/ft_printf.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/03/12 22:31:29 by hulamy #+# #+# */ -/* Updated: 2020/03/12 23:24:13 by hulamy ### ########.fr */ +/* Updated: 2020/06/30 00:41:35 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/main.c b/main.c index 465cd6c..2d13c62 100644 --- a/main.c +++ b/main.c @@ -27,9 +27,7 @@ int ft_printf(char *string, ...); /* redirect output to file outft, and write result of ft_printf inside it */\ /* also compare return of both printf and ft_printf, pout and ftpout */\ dup2(outft, 1); \ - printf("_x_%s_x_",##args);\ ftpout = ft_printf(string, ##args); \ - write(1, "a", 1);\ if (ftpout == -1) printf("\033[91mERROR\033[0m"); \ fflush(stdout); \ printf("\n"); \ diff --git a/srcs/ft_convert.c b/srcs/ft_convert.c index 12ba62b..686fe68 100644 --- a/srcs/ft_convert.c +++ b/srcs/ft_convert.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/03/12 22:30:05 by hulamy #+# #+# */ -/* Updated: 2020/03/12 22:30:20 by hulamy ### ########.fr */ +/* Updated: 2020/06/30 00:40:49 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -57,7 +57,7 @@ char *conv_u(char c, unsigned long int i) char *s; if (c == 's') - return (strdup((char *)i)); + return (i == 0 ? ft_strdup("(null)") : ft_strdup((char *)i)); s = ft_utoa(i); if (c == 'u') return (s);