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

remove a bunch of lines

Browse source
This commit is contained in:
Khaïs COLIN 2024-11-01 12:38:40 +01:00
parent 8f37c424ad
commit 330db7596a
2 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
get_next_line.c
View file

@ -81,10 +81,8 @@ char *get_next_line(int fd)
num_bytes_read = 1; num_bytes_read = 1;
while (num_bytes_read != 0) while (num_bytes_read != 0)
{ {
// DONE: if newline found,
if (ft_strchr(buffer, '\n')) if (ft_strchr(buffer, '\n'))
{ {
// DONE: copy string until newline to new buffer,
outbuf = malloc((ft_strchr(buffer, '\n') - buffer + 2)); outbuf = malloc((ft_strchr(buffer, '\n') - buffer + 2));
if (outbuf == NULL) if (outbuf == NULL)
{ {
@ -94,10 +92,7 @@ char *get_next_line(int fd)
return (NULL); return (NULL);
} }
ft_strlcpy(outbuf, buffer, ft_strchr(buffer, '\n') - buffer + 2); ft_strlcpy(outbuf, buffer, ft_strchr(buffer, '\n') - buffer + 2);
// DONE: shorten current buffer,
// buffer += ft_strchr(buffer, '\n') - buffer + 1;
buffer = shorten_buffer(buffer); buffer = shorten_buffer(buffer);
// DONE: and return.
free(read_buffer); free(read_buffer);
return (outbuf); return (outbuf);
} }
@ -110,13 +105,9 @@ char *get_next_line(int fd)
return (NULL); return (NULL);
} }
read_buffer[num_bytes_read] = '\0'; read_buffer[num_bytes_read] = '\0';
// DONE: join with big buffer
buffer = ft_strjoin_free_s1(buffer, read_buffer); buffer = ft_strjoin_free_s1(buffer, read_buffer);
if (buffer == NULL) if (buffer == NULL)
{
free(read_buffer);
return (NULL); return (NULL);
}
} }
free(read_buffer); free(read_buffer);
outbuf = buffer; outbuf = buffer;

1
get_next_line_utils.c
View file

@ -94,6 +94,7 @@ char *ft_strjoin_free_s1(char const *s1, char const *s2)
if (out == NULL) if (out == NULL)
{ {
free((void *)s1); free((void *)s1);
free((void *)s2);
return (NULL); return (NULL);
} }
ft_strlcpy(out, s1, len); ft_strlcpy(out, s1, len);