raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed octal being the default thing used to print

Browse source
This commit is contained in:
Maix0 2024-07-08 19:40:23 +02:00
parent cd66370fcc
commit 7a34a78f16
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
stdme/src/printf/matchers.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */ /* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/11/16 18:07:40 by maiboyer #+# #+# */ /* Created: 2023/11/16 18:07:40 by maiboyer #+# #+# */
/* Updated: 2024/07/07 17:39:37 by maiboyer ### ########.fr */ /* Updated: 2024/07/08 19:37:12 by maiboyer ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -21,15 +21,15 @@ t_matcher_list *get_matchers(void)
{ {
static t_matcher_list printf_matchers = (t_matcher_list){ static t_matcher_list printf_matchers = (t_matcher_list){
.data = { .data = {
{.matcher = "o", .matcher_len = 1, .arg_type = U64, .f = &printf_o}, {.matcher = "o", .matcher_len = 1, .arg_type = U64, .f = printf_o},
{.matcher = "c", .matcher_len = 1, .arg_type = CHAR, .f = &printf_c}, {.matcher = "c", .matcher_len = 1, .arg_type = CHAR, .f = printf_c},
{.matcher = "s", .matcher_len = 1, .arg_type = STR, .f = &printf_s}, {.matcher = "s", .matcher_len = 1, .arg_type = STR, .f = printf_s},
{.matcher = "p", .matcher_len = 1, .arg_type = VOID_PTR, .f = &printf_p}, {.matcher = "p", .matcher_len = 1, .arg_type = VOID_PTR, .f = printf_p},
{.matcher = "d", .matcher_len = 1, .arg_type = I32, .f = &printf_d}, {.matcher = "d", .matcher_len = 1, .arg_type = I32, .f = printf_d},
{.matcher = "i", .matcher_len = 1, .arg_type = I32, .f = &printf_d}, {.matcher = "i", .matcher_len = 1, .arg_type = I32, .f = printf_d},
{.matcher = "u", .matcher_len = 1, .arg_type = U32, .f = &printf_u}, {.matcher = "u", .matcher_len = 1, .arg_type = U32, .f = printf_u},
{.matcher = "x", .matcher_len = 1, .arg_type = U32, .f = &printf_x_low}, {.matcher = "x", .matcher_len = 1, .arg_type = U32, .f = printf_x_low},
{.matcher = "X", .matcher_len = 1, .arg_type = U32, .f = &printf_x_up}, {.matcher = "X", .matcher_len = 1, .arg_type = U32, .f = printf_x_up},
}, },
.next = NULL, .next = NULL,
}; };
@ -54,7 +54,7 @@ bool insert_matcher(t_matcher matcher)
return (true); return (true);
} }
} }
matchers->next = malloc(sizeof(t_matcher_list) * 1); matchers->next = mem_alloc(sizeof(t_matcher_list));
} }
return (false); return (false);
} }
@ -73,7 +73,7 @@ t_matcher *find_matcher(t_const_str fmt, t_matcher_list *matchers,
matcher = &matchers->data[matcher_index]; matcher = &matchers->data[matcher_index];
if (matcher->f) if (matcher->f)
{ {
if (!mem_compare(&fmt[*c_idx], matcher->matcher, if (mem_compare(&fmt[*c_idx], matcher->matcher,
matcher->matcher_len)) matcher->matcher_len))
{ {
*c_idx += matcher->matcher_len; *c_idx += matcher->matcher_len;