diff --git a/libftasm/includes/libft.h b/libftasm/includes/libft.h index 68f14403..cb5ad4d1 100644 --- a/libftasm/includes/libft.h +++ b/libftasm/includes/libft.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/07 13:49:04 by jhalford #+# #+# */ -/* Updated: 2017/03/10 16:52:40 by jhalford ### ########.fr */ +/* Updated: 2017/03/11 13:13:18 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/libftasm/src/ft_printf/ft_conversion.c b/libftasm/src/ft_printf/ft_conversion.c index eb5bd915..0a03d5c5 100644 --- a/libftasm/src/ft_printf/ft_conversion.c +++ b/libftasm/src/ft_printf/ft_conversion.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/07 13:31:48 by jhalford #+# #+# */ -/* Updated: 2017/03/10 16:58:21 by jhalford ### ########.fr */ +/* Updated: 2017/03/11 13:14:19 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/libftasm/src/ft_printf/ft_printf.c b/libftasm/src/ft_printf/ft_printf.c index 5749004a..b94ab68d 100644 --- a/libftasm/src/ft_printf/ft_printf.c +++ b/libftasm/src/ft_printf/ft_printf.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/07 13:33:27 by jhalford #+# #+# */ -/* Updated: 2017/03/10 16:54:15 by jhalford ### ########.fr */ +/* Updated: 2017/03/11 13:14:24 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/libftasm/src/ft_printf/ft_printf_color.c b/libftasm/src/ft_printf/ft_printf_color.c index 52669067..d59547b4 100644 --- a/libftasm/src/ft_printf/ft_printf_color.c +++ b/libftasm/src/ft_printf/ft_printf_color.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/06 18:07:39 by jhalford #+# #+# */ -/* Updated: 2017/03/10 16:58:51 by jhalford ### ########.fr */ +/* Updated: 2017/03/11 14:00:20 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,13 +14,13 @@ t_stos g_colors[] = { - {"{bla}", FG_BLACK}, {"{red}", FG_RED}, {"{gre}", FG_GREEN}, {"{yel}", FG_YELLOW}, {"{blu}", FG_BLUE}, {"{mag}", FG_MAGENTA}, {"{cya}", FG_CYAN}, + {"{bla}", FG_BLACK}, {"{eoc}", FG_DEFAULT}, {"{bol}", ON_BOLD}, {"{und}", ON_UNDERLINED}, @@ -35,7 +35,7 @@ void ft_printf_color(char **final, char **str, va_list ap) i = 0; if (ft_strncmp(*str, "{ran}", 5) == 0) { - i = va_arg(ap, int) % 7 + 1; + i = va_arg(ap, int) % 6; *final = ft_strjoin(*final, g_colors[i].val); *str += 5; return ;