jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Jack Halford 2017-03-15 21:24:00 +01:00
commit ba7353ef2a
6 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libft/Makefile
View file

@ -65,6 +65,7 @@ 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\
@ -131,6 +132,7 @@ 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\

2
libft/includes/error.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/14 15:34:21 by jhalford #+# #+# */
/* Updated: 2017/03/15 20:45:42 by jhalford ### ########.fr */
/* Updated: 2017/03/15 21:23:55 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

4
libft/includes/libft.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/07 13:49:04 by jhalford #+# #+# */
/* Updated: 2017/03/14 20:24:05 by jhalford ### ########.fr */
/* Updated: 2017/03/15 20:51:55 by ariard ### ########.fr */
/* */
/* ************************************************************************** */
@ -80,6 +80,8 @@ void ft_putendl(char const *s);
void ft_putnbr(long n);
void ft_putnbr_hex(long n);
int ft_error_message(char *message);
int ft_putchar_fd(int c, int fd);
void ft_putstr_fd(char const *s, int fd);
void ft_putendl_fd(char const *s, int fd);

2
libft/src/btree/btree_map.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/08 11:50:46 by jhalford #+# #+# */
/* Updated: 2017/03/08 12:03:17 by jhalford ### ########.fr */
/* Updated: 2017/03/15 18:43:15 by ariard ### ########.fr */
/* */
/* ************************************************************************** */

19
libft/src/ft_printf/ft_error_message.c Normal file
View file

@ -0,0 +1,19 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_error_message.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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);
}

19
libft/src/printing/ft_error_message.c Normal file
View file

@ -0,0 +1,19 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_error_message.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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);
}