42/42_INT_01_libft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renomme get next line en ft_gnl

Browse Source
This commit is contained in:
hugogogo
2021-07-24 11:49:36 +02:00
parent 8fd5257b23
commit b07259e037
4 changed files with 12 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -95,7 +95,7 @@ SRCS = ft_memset.c \
ft_arraymap.c \
ft_strmultisplit.c \
\
ft_get_next_line.c \
ft_gnl.c \
ft_concat_free.c \
\
ft_printf.c \

2
includes/ft_get_next_line.h → includes/ft_gnl.h
View File

@@ -24,7 +24,7 @@ typedef struct s_gnlist
struct s_gnlist *next;
} t_gnlist;
int get_next_line(const int fd, char **line);
int ft_gnl(const int fd, char **line);
int multi_fd(int fd, t_gnlist **lst);
int free_lst(t_gnlist **lst, int ret);

63
includes/libft.h
View File

@@ -12,12 +12,10 @@
#ifndef LIBFT_H
# define LIBFT_H
# include <string.h>
# include <unistd.h>
# include <stdlib.h>
# include "ft_get_next_line.h"
# include <unistd.h> // for write
# include <stdlib.h> // for malloc and free
# include "ft_gnl.h"
# include "ft_printf.h"
# include <stdarg.h> // to use va_arg in ft_printf
void *ft_memset(void *b, int c, size_t len);
void ft_bzero(void *s, size_t n);
@@ -105,65 +103,10 @@ int ft_issort(int *tab, int length, int (*f)(int, int));
int *ft_arraymap(int *tab, int length, int(*f)(int));
void ft_putnbrendl(int n);
void ft_putnbrendl_fd(int n, int fd);
int ft_get_next_line(const int fd, char **line);
char *ft_concat_free(char *str1, char *str2);
int ft_abs(int n);
int ft_greater(int a, int b);
int ft_smaller(int a, int b);
int ft_sign(int i);
# include <stdarg.h> // to use va_arg
/*
** ft_printf.c
*/
char *specifier(char *s);
int ft_expand_star(int nbr, char **string);
int ft_put_word(char *s, char *type, int size);
char *convert_with_flags(char *s, va_list ap, char *type, int *size);
int ft_printf(char *string, ...);
/*
** ft_next_word.c
*/
int width_precision(char *s);
int word_length(char *s);
char *next_word(char **s);
/*
** ft_convert.c
*/
char *conv_i(char c, long int i);
char *conv_u(char c, unsigned long int i);
char *ft_convert(va_list ap, char *type, char **s);
/*
** ft_flag_transform.c
*/
char *precision_int(char *print, int precision);
char *ft_precision(char *s, char *print, char *type);
char *width_flags(char *print, char *s, int width, int zero);
char *ft_width(char *s, char *print, int *size, char *type);
char *ft_flag_transform(char *s, char *print, char *type, int *size);
/*
** ft_flag_transform_bonus.c
*/
char *ft_plus(char *s, char *print, char *type);
char *ft_sharp(char *s, char *print, char *type);
char *ft_sharp_again(char *s, char *print, char *type);
char *ft_space(char *s, char *print, char *type, int *size);
#endif

15
srcs/ft_get_next_line.c → srcs/ft_gnl.c
View File

@@ -13,7 +13,6 @@
#include "libft.h"
/*
** #include <stdio.h> //for printf
** #include <fcntl.h> //for open
**
** int main(int ac, char **av)
@@ -24,29 +23,29 @@
** int ret;
** char *line = NULL;
**
** fd = (int *)malloc(sizeof(int) * ac);
** fd = (int *)ft_calloc(ac, sizeof(int));
** while (++i <= ac - 1)
** fd[i - 1] = open(av[i], O_RDONLY);
** i = 0;
** while (j < ac - 1)
** {
** if ((ret = get_next_line(fd[i], &line)) > 0)
** if ((ret = ft_gnl(fd[i], &line)) > 0)
** {
** printf(" [fd%i-%i] %s\n", fd[i], ret, line);
** ft_printf(" [fd%i-%i] %s\n", fd[i], ret, line);
** free(line);
** j = 0;
** }
** else if (ret == -1)
** {
** printf("[fd%i-%i] *ERROR*\n", fd[i], ret);
** ft_printf("[fd%i-%i] *ERROR*\n", fd[i], ret);
** free(line);
** j++;
** }
** else if (*line != '\0')
** printf(" [fd%i-%i] %s\n", fd[i], ret, line);
** ft_printf(" [fd%i-%i] %s\n", fd[i], ret, line);
** else
** {
** printf("[fd%i-%i] %s *FINI*\n", fd[i], ret, line);
** ft_printf("[fd%i-%i] %s *FINI*\n", fd[i], ret, line);
** free(line);
** j++;
** }
@@ -108,7 +107,7 @@ int multi_fd(int fd, t_gnlist **lst)
return (1);
}
int get_next_line(const int fd, char **line)
int ft_gnl(const int fd, char **line)
{
char buf[BUFFER_SIZE + 1];
int ret;