aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJozanLeClerc <bousset.rudy@gmail.com>2020-03-26 14:15:26 +0100
committerJozanLeClerc <bousset.rudy@gmail.com>2020-03-26 14:15:26 +0100
commitd29165bbb95aef86aeb9d9d9668d035b4430769f (patch)
tree031f29761205f26b540782d42b692165d0ad3f2c /src
parenttab (diff)
download42-cub3d-d29165bbb95aef86aeb9d9d9668d035b4430769f.tar.gz
42-cub3d-d29165bbb95aef86aeb9d9d9668d035b4430769f.tar.bz2
42-cub3d-d29165bbb95aef86aeb9d9d9668d035b4430769f.tar.xz
42-cub3d-d29165bbb95aef86aeb9d9d9668d035b4430769f.tar.zst
42-cub3d-d29165bbb95aef86aeb9d9d9668d035b4430769f.zip
Cool malloc
Diffstat (limited to 'src')
-rw-r--r--src/ft_draw_sprite.c3
-rw-r--r--src/ft_sort_s_t.c14
2 files changed, 10 insertions, 7 deletions
diff --git a/src/ft_draw_sprite.c b/src/ft_draw_sprite.c
index 0c5a8b2..423080d 100644
--- a/src/ft_draw_sprite.c
+++ b/src/ft_draw_sprite.c
@@ -41,7 +41,8 @@ void
{
float **dist_tab;
- ft_alloc_dist_tab(&dist_tab, cl);
+ if (!(dist_tab = ft_alloc_dist_tab()))
+ ft_error(FT_RET_ALLOC_ERR, FT_ERR_ALLOCATE, cl);
while (++jt < cl->mlist.sprite_var)
{
while (++it < cl->mlist.sprite_nbr[jt])
diff --git a/src/ft_sort_s_t.c b/src/ft_sort_s_t.c
index 6a74c61..6c08882 100644
--- a/src/ft_sort_s_t.c
+++ b/src/ft_sort_s_t.c
@@ -15,20 +15,22 @@
#include <stdlib.h>
#include <stdint.h>
-void
- ft_alloc_dist_tab(float ***dist_tab, t_cub *cl)
+float
+ **ft_alloc_dist_tab(void)
{
uint16_t i;
+ float **dist_tab;
- if (!(*dist_tab = (float **)malloc(8 * sizeof(float*))))
- ft_error(FT_RET_ALLOC_ERR, FT_ERR_ALLOCATE, cl);
+ if (!(dist_tab = (float **)malloc(8 * sizeof(float*))))
+ return (NULL);
i = 0;
while (i < 8)
{
- if (!((*dist_tab)[i] = (float *)malloc(4096 * sizeof(float))))
- ft_error(FT_RET_ALLOC_ERR, FT_ERR_ALLOCATE, cl);
+ if (!(dist_tab[i] = (float *)malloc(4096 * sizeof(float))))
+ return (NULL);
i++;
}
+ return (dist_tab);
}
static void