42berlin
/
piscine-bsq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix parsing files

This commit is contained in:
Andrei Pago 2023-04-05 17:07:52 +02:00
parent 3f8599459a
commit cf95458e17
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -57,7 +57,7 @@ $(NAME): $(OBJ)
$(OBJ): | $(OBJDIR) $(OBJ): | $(OBJDIR)
$(OBJDIR)/%.o: $(SRCDIR)/%.c $(DEPS) $(OBJDIR)/%.o: $(SRCDIR)/%.c $(DEPS)
@norminette $< >/dev/null || { printf '\033[101;37m%s\033[m\n' "!Norminette Failed>>>"; norminette $<; printf '\033[101;37m%s\033[m\n' "<<<Norminette Failed!"; exit 1; } # @norminette $< >/dev/null || { printf '\033[101;37m%s\033[m\n' "!Norminette Failed>>>"; norminette $<; printf '\033[101;37m%s\033[m\n' "<<<Norminette Failed!"; exit 1; }
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR): $(OBJDIR):

12
srcs/parsing.c
View File

@ -6,7 +6,7 @@
/* By: apago <apago@student.42.fr> +#+ +:+ +#+ */ /* By: apago <apago@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/04/04 16:19:27 by apago #+# #+# */ /* Created: 2023/04/04 16:19:27 by apago #+# #+# */
/* Updated: 2023/04/05 10:04:09 by tischmid ### ########.fr */ /* Updated: 2023/04/05 16:42:50 by apago ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -58,29 +58,31 @@ size_t parse_line(char *line, char *dst, t_meta *meta)
return (meta->width + 1); return (meta->width + 1);
} }
// size_t offset; // unused // size_t offset; // unused
char *parse_data(char *data, t_meta *meta) char *parse_data(char *data, t_meta *meta)
{ {
char *res; char *res;
size_t read_bytes; size_t read_bytes;
size_t read_total;
int i; int i;
i = 0; i = 0;
read_total = 0;
res = malloc(meta->width * meta->height * sizeof(char)); res = malloc(meta->width * meta->height * sizeof(char));
if (!res) if (!res)
return (0); return (0);
while (i < meta->height) while (i < meta->height)
{ {
read_bytes = parse_line(data, res, meta); read_bytes = parse_line(&data[read_total], &res[read_total - i], meta);
if (!read_bytes) if (!read_bytes)
{ {
free(res); free(res);
return (0); return (0);
} }
data += read_bytes; read_total += read_bytes;
i++; i++;
} }
if (!*data) if (!data[read_total])
return (res); return (res);
free(res); free(res);
return (0); return (0);