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

Merge branch 'master' of https://github.com/jzck/42sh

Browse source
This commit is contained in:
Jack Halford 2017-03-22 17:25:44 +01:00
commit cab08b3f71
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
42sh/libft/src/ft_printf/ft_vprintf.c
View file

@ -3,10 +3,10 @@
/* ::: :::::::: */
/* ft_vprintf.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/20 15:52:57 by jhalford #+# #+# */
/* Updated: 2017/03/21 16:34:06 by jhalford ### ########.fr */
/* Updated: 2017/03/22 17:22:30 by gwojda ### ########.fr */
/* */
/* ************************************************************************** */
@ -57,7 +57,7 @@ int ft_vasprintf(char **ret, const char *format, va_list ap)
return (-1);
}
else if (!(final = ft_strjoin(final, (char[]){*str++, 0})))
return (-1);
return (-1);
ft_strdel(&tmp);
}
*ret = final;

6
42sh/libft/src/sys/fd_replace.c
View file

@ -3,10 +3,10 @@
/* ::: :::::::: */
/* fd_replace.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/21 16:32:26 by jhalford #+# #+# */
/* Updated: 2017/03/21 16:42:19 by jhalford ### ########.fr */
/* Updated: 2017/03/22 17:22:55 by gwojda ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,6 +15,6 @@
int fd_replace(int fd1, int fd2)
{
if (fd1 != fd2)
return(dup2_close(fd1, fd2));
return (dup2_close(fd1, fd2));
return (0);
}