diff --git a/libftasm/Makefile b/libftasm/Makefile index 4ece6170..3fafa5ef 100644 --- a/libftasm/Makefile +++ b/libftasm/Makefile @@ -65,7 +65,6 @@ dlst/ft_dlstrtostr.c\ dlst/ft_dlstsize.c\ error/error.c\ ft_printf/ft_conversion.c\ -ft_printf/ft_error_message.c\ ft_printf/ft_fmt_simplify.c\ ft_printf/ft_fmt_validate_conv.c\ ft_printf/ft_fmt_validate_flags.c\ @@ -132,7 +131,6 @@ mem/ft_memmove.c\ mem/ft_memset.c\ mem/ft_realloc.c\ path/ft_path_notdir.c\ -printing/ft_error_message.c\ printing/ft_putchar.c\ printing/ft_putendl.c\ printing/ft_putnbr.c\ diff --git a/libftasm/includes/error.h b/libftasm/includes/error.h index c987ed95..c564654b 100644 --- a/libftasm/includes/error.h +++ b/libftasm/includes/error.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/03/14 15:34:21 by jhalford #+# #+# */ -/* Updated: 2017/03/15 21:23:55 by jhalford ### ########.fr */ +/* Updated: 2017/03/16 14:19:49 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,7 +20,7 @@ # define DG_ARGS getpid(), getpid(), ft_path_notdir(__FILE__), __LINE__ # define DG(s, ...) ft_dprintf(STDBUG, DG_PROTO s "{eoc}\n", DG_ARGS, ##__VA_ARGS__) -# define ERR_PROTO(s, ...) "{red}%s: " s "{eoc}\n", PROGNAME +# define ERR_PROTO(s, ...) "{red}%s: " s "{eoc}\n", PROGNAME, ##__VA_ARGS__ # define ERR_SET(n, ...) error_set(n, ##__VA_ARGS__) # define ERRMSG_MAX_SIZE 150 diff --git a/libftasm/src/ft_printf/ft_error_message.c b/libftasm/src/ft_printf/ft_error_message.c deleted file mode 100644 index ed47e8d2..00000000 --- a/libftasm/src/ft_printf/ft_error_message.c +++ /dev/null @@ -1,19 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_error_message.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: ariard +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2017/03/15 20:47:31 by ariard #+# #+# */ -/* Updated: 2017/03/15 20:50:50 by ariard ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -int ft_error_message(char *message) -{ - ft_dprintf(2, message); - return (-1); -} diff --git a/libftasm/src/printing/ft_error_message.c b/libftasm/src/printing/ft_error_message.c deleted file mode 100644 index 2eb9f7d3..00000000 --- a/libftasm/src/printing/ft_error_message.c +++ /dev/null @@ -1,19 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_error_message.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: ariard +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2017/03/15 20:47:31 by ariard #+# #+# */ -/* Updated: 2017/03/15 20:50:58 by ariard ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft.h" - -int ft_error_message(char *message) -{ - ft_dprintf(2, message); - return (-1); -}