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

some norminettes and error in memorybook when adding a 2d pointer

Browse Source
This commit is contained in:
Hugo LAMY
2022-05-04 18:54:21 +02:00
parent 6000629c17
commit d4e5f298fa
12 changed files with 85 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -107,7 +107,7 @@ $(NAME): $(OBJS)
$(CC) $(OBJS) -o $@ $(LFLAGS) $(CFLAGS) $(CC) $(OBJS) -o $@ $(LFLAGS) $(CFLAGS)
leaks: $(NAME) leaks: $(NAME)
valgrind --leak-check=full --show-leak-kinds=all ./$(NAME) valgrind --leak-check=full --show-leak-kinds=all ./$(NAME) maps/map_valid_03.cub
clean: clean:
$(RM_OBJS) $(RM_OBJS)

4
headers/memorybook.h
View File

@@ -6,7 +6,7 @@
/* By: pblagoje <marvin@42.fr> +#+ +:+ +#+ */ /* By: pblagoje <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/05/04 13:35:47 by pblagoje #+# #+# */ /* Created: 2022/05/04 13:35:47 by pblagoje #+# #+# */
/* Updated: 2022/05/04 13:36:44 by pblagoje ### ########.fr */ /* Updated: 2022/05/04 17:39:33 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -14,7 +14,7 @@
# define MEMORYBOOK_H # define MEMORYBOOK_H
// memorybook.c // memorybook.c
void mb_init(void(*f)(void*), void *param); void mb_init(void (*f)(void*), void *param);
void *mb_alloc(size_t size); void *mb_alloc(size_t size);
void mb_add(void *addr); void mb_add(void *addr);
void mb_free(void *addr); void mb_free(void *addr);

24
libft.txt
View File

@@ -1,24 +0,0 @@
ft_abs
ft_arrint
ft_atoi
ft_bzero
ft_free_2d
ft_lstcreate
ft_lsterase
ft_lstfind
ft_lstfree
ft_lstpush_back
ft_memalloc
ft_putchar_fd
ft_putnbr_fd
ft_putstr_fd
ft_sign
ft_split
ft_strchr
ft_strcmp
ft_strdup
ft_strlen
ft_strlen_2d
ft_strnstr
ft_strrchr
ft_substr

2
libs/libft/Makefile
View File

@@ -11,7 +11,7 @@ _DEP = libft.h
DEPS = $(_DEP:%.h=$(IDIR)/%.h) DEPS = $(_DEP:%.h=$(IDIR)/%.h)
CFLAGS = -I$(IDIR) CFLAGS = -I$(IDIR)
CFLAGS += -Wall -Wextra -Werror CFLAGS += -Wall -Wextra -Werror -g3
SRCS = \ SRCS = \
ft_bzero.c \ ft_bzero.c \

0
libs/libft/includes/ft_gnl.h → libs/libft/includes/ft_gnl.bak
View File

0
libs/libft/includes/ft_printf.h → libs/libft/includes/ft_printf.bak
View File

10
libs/libft/includes/libft.h
View File

@@ -6,7 +6,7 @@
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */ /* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/11/25 14:45:53 by hulamy #+# #+# */ /* Created: 2019/11/25 14:45:53 by hulamy #+# #+# */
/* Updated: 2022/05/04 16:04:03 by hulamy ### ########.fr */ /* Updated: 2022/05/04 18:18:01 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -28,7 +28,7 @@ void ft_putchar_fd(char c, int fd);
void ft_putstr_fd(char *s, int fd); void ft_putstr_fd(char *s, int fd);
void ft_putnbr_fd(int n, int fd); void ft_putnbr_fd(int n, int fd);
typedef struct s_list typedef struct s_list
{ {
void *content; void *content;
struct s_list *prev; struct s_list *prev;
@@ -37,14 +37,14 @@ typedef struct s_list
t_list *ft_lstcreate(void *content); t_list *ft_lstcreate(void *content);
void *ft_lstpush_back(t_list **lst, t_list *new); void *ft_lstpush_back(t_list **lst, t_list *new);
t_list *ft_lstfind(t_list *lst, void *to_find, int (*comp)(void*, void *)); t_list *ft_lstfind(t_list *lst, void *to_find,
int (*comp)(void*, void *));
void ft_lsterase(t_list *lst, void (*del)(void *)); void ft_lsterase(t_list *lst, void (*del)(void *));
void ft_lstfree(t_list *lst, void (*del)(void *)); void ft_lstfree(t_list *lst, void (*del)(void *));
int ft_strcmp(const char *s1, const char *s2); int ft_strcmp(const char *s1, const char *s2);
void *ft_memalloc(size_t size); void *ft_memalloc(size_t size);
int ft_abs(int n); int ft_abs(int n);
int ft_sign(int i); int ft_sign(int i);
int ft_arrint(int *intarr, int comp, size_t size);
int ft_arrint(int * intarr, int comp, size_t size);
#endif #endif

53
libs/libft/srcs/ft_split.c
View File

@@ -5,8 +5,8 @@
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */ /* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/12/12 22:41:54 by hulamy #+# #+# */ /* Created: 2022/05/04 18:15:10 by hulamy #+# #+# */
/* Updated: 2022/05/04 14:11:07 by pblagoje ### ########.fr */ /* Updated: 2022/05/04 18:35:56 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -15,25 +15,25 @@
*/ */
/* /*
** #include <stdio.h>
** #include <stdlib.h> ** #include <stdlib.h>
** #include <unistd.h> ** #include <unistd.h>
** ** #include <stdio.h>
**
** size_t ft_strlen(const char *str) ** size_t ft_strlen(const char *str)
** { ** {
** size_t i; ** size_t i;
** **
** i = 0; ** i = 0;
** while (str[i]) ** while (str[i])
** i++; ** i++;
** return (i); ** return (i);
** } ** }
** **
** char *ft_substr(char const *s, unsigned int start, size_t len) ** char *ft_substr(char const *s, unsigned int start, size_t len)
** { ** {
** char *str; ** char *str;
** size_t i; ** size_t i;
** **
** if (!s) ** if (!s)
** return (NULL); ** return (NULL);
** if (ft_strlen(s) < start) ** if (ft_strlen(s) < start)
@@ -46,29 +46,30 @@
** str[i] = '\0'; ** str[i] = '\0';
** return (str); ** return (str);
** } ** }
** **
** char **ft_split(char const *s, char c); ** char **ft_split(char const *s, char c);
** char **ft_strsplit(char const *s, char c); ** char **ft_strsplit(char const *s, char c);
** **
** int main(void) ** int main(void)
** { ** {
** char **str; ** char **str;
** int i; ** int i;
** **
** char *s; ** char *s;
** char c; ** char c;
** **
** i = -1; ** i = -1;
** s = NULL; ** // s = NULL;
** s = "hello les amis :)";
** c = ' '; ** c = ' ';
** str = ft_split(s, c); ** str = ft_split(s, c);
** //if (str) ** printf("s : '%s'\n", s);
** //{ ** printf("*str : '%p'\n", str[0]);
** printf("s : '%s'\n", s); ** while (str[++i])
** printf("*str : '%p'\n", str[0]); ** printf("str[%i] : '%s'\n", i, str[i]);
** while (str[++i]) ** while (str[--i])
** printf("str[%i] : '%s'\n", i, str[i]); ** free(str[i]);
** //} ** free(str);
** return (0); ** return (0);
** } ** }
*/ */
@@ -89,7 +90,7 @@ static int count(char const *s, char c)
return (words); return (words);
} }
void *ft_free(char **array, int w) void *free_array(char **array, int w)
{ {
int i; int i;
@@ -109,6 +110,14 @@ char **empty_s(char **empty)
return (empty); return (empty);
} }
static int copy_portion(char **array, char const *s, int len)
{
*array = ft_substr(s, 0, len);
if (!(*array))
return (0);
return (1);
}
char **ft_split(char const *s, char c) char **ft_split(char const *s, char c)
{ {
char **array; char **array;
@@ -128,8 +137,8 @@ char **ft_split(char const *s, char c)
{ {
while (s[len] != '\0' && s[len] != c) while (s[len] != '\0' && s[len] != c)
len++; len++;
if (!(array[w++] = ft_substr(s, 0, len))) if (!copy_portion(&array[w++], s, len))
return (ft_free(array, w)); return (free_array(array, w));
s += len - 1; s += len - 1;
} }
s++; s++;

2
maps/map_valid_03.cub
View File

@@ -4,7 +4,7 @@ WE ./textures/wood.xpm
EA ./textures/blue.xpm EA ./textures/blue.xpm
F 66, 66 , 66 F 66, 66 , 66
C 33 , 5 55 , 33 C 33 , 55 , 33
111111111111111111111111 111111111111111111111111
100000000000000000000001 100000000000000000000001

6
srcs/hook/keyhook.c
View File

@@ -6,7 +6,7 @@
/* By: pblagoje <marvin@42.fr> +#+ +:+ +#+ */ /* By: pblagoje <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/05/04 13:45:52 by pblagoje #+# #+# */ /* Created: 2022/05/04 13:45:52 by pblagoje #+# #+# */
/* Updated: 2022/05/04 13:47:13 by pblagoje ### ########.fr */ /* Updated: 2022/05/04 17:23:50 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -47,7 +47,7 @@ int hook_action(t_game *game)
int keypress(int keycode, t_game *game) int keypress(int keycode, t_game *game)
{ {
unsigned i; unsigned int i;
print_keycode(keycode, &game->plr); print_keycode(keycode, &game->plr);
i = 0; i = 0;
@@ -62,7 +62,7 @@ int keypress(int keycode, t_game *game)
int keyrelease(int keycode, t_game *game) int keyrelease(int keycode, t_game *game)
{ {
unsigned i; unsigned int i;
i = 0; i = 0;
while (i < MAX_NB_KEY && game->k_hook[i] != keycode) while (i < MAX_NB_KEY && game->k_hook[i] != keycode)

4
srcs/mem/memorybook_2d.c
View File

@@ -6,7 +6,7 @@
/* By: pblagoje <marvin@42.fr> +#+ +:+ +#+ */ /* By: pblagoje <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/05/04 13:55:48 by pblagoje #+# #+# */ /* Created: 2022/05/04 13:55:48 by pblagoje #+# #+# */
/* Updated: 2022/05/04 13:55:51 by pblagoje ### ########.fr */ /* Updated: 2022/05/04 18:32:14 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -22,6 +22,7 @@ void mb_add_2d(void **addr, int nb)
mb_add(addr[i]); mb_add(addr[i]);
i++; i++;
} }
mb_add(addr);
} }
void mb_free_2d(void **addr, int nb) void mb_free_2d(void **addr, int nb)
@@ -34,4 +35,5 @@ void mb_free_2d(void **addr, int nb)
mb_free(addr[i]); mb_free(addr[i]);
i++; i++;
} }
mb_free(addr);
} }

38
srcs/mem/memorybook_2d.c~ Normal file
View File

@@ -0,0 +1,38 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* memorybook_2d.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: pblagoje <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/05/04 13:55:48 by pblagoje #+# #+# */
/* Updated: 2022/05/04 18:31:18 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "cube3d.h"
void mb_add_2d(void **addr, int nb)
{
int i;
i = 0;
while (i < nb)
{
mb_add(addr[i]);
i++;
}
mb_add(addr);
}
void mb_free_2d(void **addr, int nb)
{
int i;
i = 0;
while (i < nb)
{
mb_free(addr[i]);
i++;
}
}