logistic-bot/get_next_line
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove final lines

Browse source
This commit is contained in:
Khaïs COLIN 2024-11-01 13:27:44 +01:00
parent 01da2291c8
commit b5a957f5a4
2 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
get_next_line.c
View file

@ -6,7 +6,7 @@
/* By: kcolin <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/23 20:32:46 by kcolin #+# #+# */
/* Updated: 2024/11/01 13:17:01 by kcolin ### ########.fr */
/* Updated: 2024/11/01 13:26:41 by kcolin ### ########.fr */
/* */
/* ************************************************************************** */
@ -16,7 +16,7 @@
char *ft_strchr(const char *s, int c);
size_t ft_strlen(const char *s);
size_t ft_strlcpy(char *dst, const char *src, size_t size);
char *ft_strjoin_free_s1(char const *s1, char const *s2);
char *ft_strjoin_and_free_originals(char const *s1, char const *s2);
/*
static int num_allocs = 0;
@ -97,12 +97,24 @@ char *prepare_output_buffer(char **buffer, char *read_buffer)
return (outbuf);
}
char *cleanup(char **buffer, char *read_buffer)
{
free(read_buffer);
read_buffer = *buffer;
if (ft_strlen(*buffer) == 0)
{
free(*buffer);
read_buffer = NULL;
}
*buffer = NULL;
return (read_buffer);
}
char *get_next_line(int fd)
{
static char *buffer = NULL;
char *read_buffer;
int num_bytes_read;
char *outbuf;
if (setup_buffers(&buffer, &read_buffer) != 0)
return (NULL);
@ -120,17 +132,9 @@ char *get_next_line(int fd)
return (NULL);
}
read_buffer[num_bytes_read] = '\0';
buffer = ft_strjoin_free_s1(buffer, read_buffer);
buffer = ft_strjoin_and_free_originals(buffer, read_buffer);
if (buffer == NULL)
return (NULL);
}
free(read_buffer);
outbuf = buffer;
if (ft_strlen(buffer) == 0)
{
free(buffer);
outbuf = NULL;
}
buffer = NULL;
return (outbuf);
return (cleanup(&buffer, read_buffer));
}

4
get_next_line_utils.c
View file

@ -6,7 +6,7 @@
/* By: kcolin <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/11/01 12:31:58 by kcolin #+# #+# */
/* Updated: 2024/11/01 12:32:00 by kcolin ### ########.fr */
/* Updated: 2024/11/01 12:37:32 by kcolin ### ########.fr */
/* */
/* ************************************************************************** */
@ -84,7 +84,7 @@ size_t ft_strlcat(char *dst, const char *src, size_t size)
return (dst_len + src_len);
}
char *ft_strjoin_free_s1(char const *s1, char const *s2)
char *ft_strjoin_and_free_originals(char const *s1, char const *s2)
{
char *out;
size_t len;