willem/ft_printf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanuup

Browse Source
This commit is contained in:
whaffman 2024-10-29 11:49:54 +01:00
parent a203ec9581
commit c9e0ff7559
7 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ft_printf/parse_conversion.c
View File

@ -19,7 +19,6 @@ int parse_conversion(const char **format, va_list args)
{ {
int wrote; int wrote;
wrote = 0;
if (**format == 'c') if (**format == 'c')
wrote = print_char(args); wrote = print_char(args);
else if (**format == 's') else if (**format == 's')
@ -34,5 +33,7 @@ int parse_conversion(const char **format, va_list args)
wrote = print_hex(args, 0); wrote = print_hex(args, 0);
else if (ft_strchr("X", **format)) else if (ft_strchr("X", **format))
wrote = print_hex(args, 1); wrote = print_hex(args, 1);
else
wrote = -1;
return (wrote); return (wrote);
} }

1
src/ft_printf/parse_placeholder.c
View File

@ -21,7 +21,6 @@ int parse_placeholder(const char **format, va_list args)
int wrote; int wrote;
(*format)++; (*format)++;
wrote = 0;
while (**format && !ft_strchr(conversions, **format)) while (**format && !ft_strchr(conversions, **format))
(*format)++; (*format)++;
if (**format == '%') if (**format == '%')

3
src/ft_printf/print_hex.c
View File

@ -23,10 +23,9 @@ int print_hex(va_list args, int uppercase)
char *str; char *str;
int wrote; int wrote;
wrote = 0;
str = ft_calloc(sizeof(char), 20); str = ft_calloc(sizeof(char), 20);
if (!str) if (!str)
return (wrote); return (-1);
n = va_arg(args, unsigned int); n = va_arg(args, unsigned int);
if (uppercase) if (uppercase)
ft_putnbr_base(n, "0123456789ABCDEF", str); ft_putnbr_base(n, "0123456789ABCDEF", str);

3
src/ft_printf/print_number.c
View File

@ -23,10 +23,9 @@ int print_number(va_list args)
char *str; char *str;
int wrote; int wrote;
wrote = 0;
str = ft_calloc(sizeof(char), 12); str = ft_calloc(sizeof(char), 12);
if (!str) if (!str)
return (wrote); return (-1);
n = va_arg(args, int); n = va_arg(args, int);
ft_putnbr_signed(n, "0123456789", str); ft_putnbr_signed(n, "0123456789", str);
len = ft_strlen(str); len = ft_strlen(str);

8
src/ft_printf/print_pointer.c
View File

@ -23,16 +23,12 @@ int print_pointer(va_list args)
char *str; char *str;
int wrote; int wrote;
wrote = 0;
n = va_arg(args, unsigned long); n = va_arg(args, unsigned long);
if (!n) if (!n)
{ return (write(1, "(nil)", 5));
write(1, "(nil)", 5);
return (5);
}
str = ft_calloc(sizeof(char), 20); str = ft_calloc(sizeof(char), 20);
if (!str) if (!str)
return (wrote); return (-1);
ft_strlcpy(str, "0x", 3); ft_strlcpy(str, "0x", 3);
ft_putnbr_base(n, "0123456789abcdef", str); ft_putnbr_base(n, "0123456789abcdef", str);
len = ft_strlen(str); len = ft_strlen(str);

5
src/ft_printf/print_string.c
View File

@ -22,10 +22,7 @@ int print_string(va_list args)
str = va_arg(args, char *); str = va_arg(args, char *);
if (!str) if (!str)
{ return (write(1, "(null)", 6));
write(1, "(null)", 6);
return (6);
}
len = ft_strlen(str); len = ft_strlen(str);
return (write(1, str, len)); return (write(1, str, len));
} }

2
src/ft_printf/print_unumber.c
View File

@ -26,7 +26,7 @@ int print_unumber(va_list args)
wrote = 0; wrote = 0;
str = ft_calloc(sizeof(char), 12); str = ft_calloc(sizeof(char), 12);
if (!str) if (!str)
return (wrote); return (-1);
n = va_arg(args, unsigned int); n = va_arg(args, unsigned int);
ft_putnbr_base(n, "0123456789", str); ft_putnbr_base(n, "0123456789", str);
len = ft_strlen(str); len = ft_strlen(str);