From adc087a5cf60bd03d6bc155531df5d96ac1c0cef Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Thu, 15 Dec 2016 18:32:22 +0100 Subject: [PATCH] stuff --- libft/includes/ft_printf.h | 2 +- libft/includes/get_next_line.h | 2 +- libft/includes/libft.h | 15 ++++++++------- libft/src/btree/btree_delone.c | 2 +- libft/src/ft_printf/ft_printf.c | 2 +- libft/src/ft_printf/ft_printf_parse.c | 2 +- libft/src/get_next_line/get_next_line.c | 2 +- libft/src/lst/ft_lst_delif.c | 2 +- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/libft/includes/ft_printf.h b/libft/includes/ft_printf.h index 1434cb83..6db739f4 100644 --- a/libft/includes/ft_printf.h +++ b/libft/includes/ft_printf.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/07 13:22:54 by jhalford #+# #+# */ -/* Updated: 2016/12/06 19:12:15 by jhalford ### ########.fr */ +/* Updated: 2016/12/15 15:29:22 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/libft/includes/get_next_line.h b/libft/includes/get_next_line.h index 8036a06e..b63d0ac2 100644 --- a/libft/includes/get_next_line.h +++ b/libft/includes/get_next_line.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/05 12:21:36 by jhalford #+# #+# */ -/* Updated: 2016/12/06 15:33:20 by jhalford ### ########.fr */ +/* Updated: 2016/12/15 13:07:58 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/libft/includes/libft.h b/libft/includes/libft.h index 75873159..707ce85f 100644 --- a/libft/includes/libft.h +++ b/libft/includes/libft.h @@ -6,16 +6,21 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/07 13:49:04 by jhalford #+# #+# */ -/* Updated: 2016/12/13 17:22:16 by jhalford ### ########.fr */ +/* Updated: 2016/12/15 15:21:08 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef LIBFT_H # define LIBFT_H -# define DG_MSG0 "{inv}{yel}%13s {bol}{blu}%-3d{eoc}" +# define STDIN 0 +# define STDOUT 1 +# define STDERR 2 +# define STDBUG 3 + +# define DG_MSG0 "{inv}{yel}%21s {bol}{blu}%-3d{eoc}" # define DG_MSG1 ft_path_notdir(__FILE__), __LINE__ -# define DG(f, ...) ft_dprintf(2, DG_MSG0 f "{eoc}\n", DG_MSG1, ##__VA_ARGS__) +# define DG(f, ...) ft_dprintf(STDBUG, DG_MSG0 f "{eoc}\n", DG_MSG1, ##__VA_ARGS__) # include "get_next_line.h" # include "ft_xattr.h" @@ -41,10 +46,6 @@ # define FT_MAX(a, b) ((a) > (b) ? (a) : (b)) # define FT_DIST(a, b) (FT_ABS((a) - (b))) -# define STDIN 0 -# define STDOUT 1 -# define STDERR 2 - typedef struct s_stof t_stof; typedef struct s_stos t_stos; diff --git a/libft/src/btree/btree_delone.c b/libft/src/btree/btree_delone.c index 6994e405..17ce1c4a 100644 --- a/libft/src/btree/btree_delone.c +++ b/libft/src/btree/btree_delone.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/05 11:45:51 by jhalford #+# #+# */ -/* Updated: 2016/12/05 14:07:12 by jhalford ### ########.fr */ +/* Updated: 2016/12/15 12:48:55 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/libft/src/ft_printf/ft_printf.c b/libft/src/ft_printf/ft_printf.c index bf9e1d85..07e65e14 100644 --- a/libft/src/ft_printf/ft_printf.c +++ b/libft/src/ft_printf/ft_printf.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/07 13:33:27 by jhalford #+# #+# */ -/* Updated: 2016/12/13 11:20:36 by jhalford ### ########.fr */ +/* Updated: 2016/12/15 15:26:48 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/libft/src/ft_printf/ft_printf_parse.c b/libft/src/ft_printf/ft_printf_parse.c index 62de8046..e2d91035 100644 --- a/libft/src/ft_printf/ft_printf_parse.c +++ b/libft/src/ft_printf/ft_printf_parse.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/07 13:33:24 by jhalford #+# #+# */ -/* Updated: 2016/12/09 15:48:31 by jhalford ### ########.fr */ +/* Updated: 2016/12/15 15:30:49 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/libft/src/get_next_line/get_next_line.c b/libft/src/get_next_line/get_next_line.c index 5ba7280a..cc5f6145 100644 --- a/libft/src/get_next_line/get_next_line.c +++ b/libft/src/get_next_line/get_next_line.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/15 13:12:06 by jhalford #+# #+# */ -/* Updated: 2016/11/17 13:12:08 by jhalford ### ########.fr */ +/* Updated: 2016/12/15 13:00:23 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/libft/src/lst/ft_lst_delif.c b/libft/src/lst/ft_lst_delif.c index 5e51d819..bbc67363 100644 --- a/libft/src/lst/ft_lst_delif.c +++ b/libft/src/lst/ft_lst_delif.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/04 11:09:12 by jhalford #+# #+# */ -/* Updated: 2016/12/12 12:40:15 by jhalford ### ########.fr */ +/* Updated: 2016/12/15 17:58:29 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */