diff options
Diffstat (limited to 'src/ft_get_tex.c')
| -rw-r--r-- | src/ft_get_tex.c | 66 |
1 files changed, 29 insertions, 37 deletions
diff --git a/src/ft_get_tex.c b/src/ft_get_tex.c index 58a0358..f8a817c 100644 --- a/src/ft_get_tex.c +++ b/src/ft_get_tex.c @@ -12,32 +12,30 @@ #include <libft.h> #include <cub3d.h> -#include <stdlib.h> +#include <stdint.h> int8_t ft_get_tex_no(char **words, t_cub *clist) { if (!(*words) || !(*(words + 1)) || (*(words + 2))) { - ft_strlcpy(clist->errmsg, FT_ERR_ARGS, ft_strlen(FT_ERR_ARGS) + 1); + ft_sprintf(clist->errmsg, "%s", FT_ERR_ARGS); return (-1); } if (ft_check_ext(*(words + 1), ".xpm") < 0) { - ft_strlcpy(clist->errmsg, FT_ERR_NOT_A_XPM, - ft_strlen(FT_ERR_NOT_A_XPM) + 1); + ft_sprintf(clist->errmsg, "%s", FT_ERR_NOT_A_XPM); return (-1); } - ft_memdel((void**)&clist->mlist->no_tex_path); - if (!(clist->mlist->no_tex_path = ft_strdup(*(words + 1)))) + ft_memdel((void**)&clist->mlist.no_tex_path); + if (!(clist->mlist.no_tex_path = ft_strdup(*(words + 1)))) { - ft_strlcpy(clist->errmsg, FT_ERR_ALLOCATE, - ft_strlen(FT_ERR_ALLOCATE) + 1); + ft_sprintf(clist->errmsg, "%s", FT_ERR_ALLOCATE); return (-1); } - if (ft_check_not_found(clist->mlist->no_tex_path) < 0) + if (ft_check_not_found(clist->mlist.no_tex_path) < 0) { - ft_strlcpy(clist->errmsg, FT_ERR_RD_NO, ft_strlen(FT_ERR_RD_NO) + 1); + ft_sprintf(clist->errmsg, "%s", FT_ERR_RD_NO); return (-1); } return (0); @@ -48,25 +46,23 @@ int8_t { if (!(*words) || !(*(words + 1)) || (*(words + 2))) { - ft_strlcpy(clist->errmsg, FT_ERR_ARGS, ft_strlen(FT_ERR_ARGS) + 1); + ft_sprintf(clist->errmsg, "%s", FT_ERR_ARGS); return (-1); } if (ft_check_ext(*(words + 1), ".xpm") < 0) { - ft_strlcpy(clist->errmsg, FT_ERR_NOT_A_XPM, - ft_strlen(FT_ERR_NOT_A_XPM) + 1); + ft_sprintf(clist->errmsg, "%s", FT_ERR_NOT_A_XPM); return (-1); } - ft_memdel((void**)&clist->mlist->so_tex_path); - if (!(clist->mlist->so_tex_path = ft_strdup(*(words + 1)))) + ft_memdel((void**)&clist->mlist.so_tex_path); + if (!(clist->mlist.so_tex_path = ft_strdup(*(words + 1)))) { - ft_strlcpy(clist->errmsg, FT_ERR_ALLOCATE, - ft_strlen(FT_ERR_ALLOCATE) + 1); + ft_sprintf(clist->errmsg, "%s", FT_ERR_ALLOCATE); return (-1); } - if (ft_check_not_found(clist->mlist->so_tex_path) < 0) + if (ft_check_not_found(clist->mlist.so_tex_path) < 0) { - ft_strlcpy(clist->errmsg, FT_ERR_RD_SO, ft_strlen(FT_ERR_RD_SO) + 1); + ft_sprintf(clist->errmsg, "%s", FT_ERR_RD_SO); return (-1); } return (0); @@ -77,25 +73,23 @@ int8_t { if (!(*words) || !(*(words + 1)) || (*(words + 2))) { - ft_strlcpy(clist->errmsg, FT_ERR_ARGS, ft_strlen(FT_ERR_ARGS) + 1); + ft_sprintf(clist->errmsg, "%s", FT_ERR_ARGS); return (-1); } if (ft_check_ext(*(words + 1), ".xpm") < 0) { - ft_strlcpy(clist->errmsg, FT_ERR_NOT_A_XPM, - ft_strlen(FT_ERR_NOT_A_XPM) + 1); + ft_sprintf(clist->errmsg, "%s", FT_ERR_NOT_A_XPM); return (-1); } - ft_memdel((void**)&clist->mlist->ea_tex_path); - if (!(clist->mlist->ea_tex_path = ft_strdup(*(words + 1)))) + ft_memdel((void**)&clist->mlist.ea_tex_path); + if (!(clist->mlist.ea_tex_path = ft_strdup(*(words + 1)))) { - ft_strlcpy(clist->errmsg, FT_ERR_ALLOCATE, - ft_strlen(FT_ERR_ALLOCATE) + 1); + ft_sprintf(clist->errmsg, "%s", FT_ERR_ALLOCATE); return (-1); } - if (ft_check_not_found(clist->mlist->ea_tex_path) < 0) + if (ft_check_not_found(clist->mlist.ea_tex_path) < 0) { - ft_strlcpy(clist->errmsg, FT_ERR_RD_EA, ft_strlen(FT_ERR_RD_EA) + 1); + ft_sprintf(clist->errmsg, "%s", FT_ERR_RD_EA); return (-1); } return (0); @@ -106,25 +100,23 @@ int8_t { if (!(*words) || !(*(words + 1)) || (*(words + 2))) { - ft_strlcpy(clist->errmsg, FT_ERR_ARGS, ft_strlen(FT_ERR_ARGS) + 1); + ft_sprintf(clist->errmsg, "%s", FT_ERR_ARGS); return (-1); } if (ft_check_ext(*(words + 1), ".xpm") < 0) { - ft_strlcpy(clist->errmsg, FT_ERR_NOT_A_XPM, - ft_strlen(FT_ERR_NOT_A_XPM) + 1); + ft_sprintf(clist->errmsg, "%s", FT_ERR_NOT_A_XPM); return (-1); } - ft_memdel((void**)&clist->mlist->we_tex_path); - if (!(clist->mlist->we_tex_path = ft_strdup(*(words + 1)))) + ft_memdel((void**)&clist->mlist.we_tex_path); + if (!(clist->mlist.we_tex_path = ft_strdup(*(words + 1)))) { - ft_strlcpy(clist->errmsg, FT_ERR_ALLOCATE, - ft_strlen(FT_ERR_ALLOCATE) + 1); + ft_sprintf(clist->errmsg, "%s", FT_ERR_ALLOCATE); return (-1); } - if (ft_check_not_found(clist->mlist->we_tex_path) < 0) + if (ft_check_not_found(clist->mlist.we_tex_path) < 0) { - ft_strlcpy(clist->errmsg, FT_ERR_RD_WE, ft_strlen(FT_ERR_RD_WE) + 1); + ft_sprintf(clist->errmsg, "%s", FT_ERR_RD_WE); return (-1); } return (0); |