aboutsummaryrefslogtreecommitdiff
path: root/ft_printf.c
diff options
context:
space:
mode:
authorCharles <sircharlesaze@gmail.com>2019-10-13 13:55:07 +0200
committerCharles <sircharlesaze@gmail.com>2019-10-13 14:40:48 +0200
commitd744e75aea3145927a4e725eb95496499dc54630 (patch)
tree5a65c3c3de463e60b3f9de9f38ee73ea6b58b9d2 /ft_printf.c
parent82981d4b0d04c0d52020a209c8322fa0eed012f7 (diff)
downloadft_printf-d744e75aea3145927a4e725eb95496499dc54630.tar.gz
ft_printf-d744e75aea3145927a4e725eb95496499dc54630.tar.bz2
ft_printf-d744e75aea3145927a4e725eb95496499dc54630.zip
Added precision and min field width wildcard
Diffstat (limited to 'ft_printf.c')
-rw-r--r--ft_printf.c39
1 files changed, 22 insertions, 17 deletions
diff --git a/ft_printf.c b/ft_printf.c
index 9d82f62..f154685 100644
--- a/ft_printf.c
+++ b/ft_printf.c
@@ -31,12 +31,13 @@ int ft_printf(const char *format, ...)
/* ap_index++; */
/* printf("\n%d\n", format_list->data->left_adjusted); */
/* printf("\n%d\n", format_list->data->precision); */
+ /* printf("\n%d\n", format_list->data->precision_wildcard); */
+ /* printf("\n%d\n", format_list->data->min_field_width); */
if ((str = convert_to_str(format_list->data, ap)) == NULL)
return (-1);
ft_putstr(str);
free(str);
-
print_len += format_list->data->len;
list_pop_front(&format_list);
}
@@ -49,22 +50,26 @@ int ft_printf(const char *format, ...)
int main()
{
- int test;
-
- ft_printf("char: %c\n", 'r');
- ft_printf("string: %s\n", "bonjour");
- ft_printf("pointer: %p\n", &test);
- ft_printf("int: %d or %i\n", 45, 54);
- ft_printf("uint: %u\n", 1 << 31);
- ft_printf("hex lower: %x\n", 0xabcf012);
- ft_printf("hex upper: %X\n", 0xabcf012);
- ft_printf("percent: %%\n");
+ /* int test; */
+ /* */
+ /* ft_printf("char: %c\n", 'r'); */
+ /* ft_printf("string: %s\n", "bonjour"); */
+ /* ft_printf("pointer: %p\n", &test); */
+ /* ft_printf("int: %d or %i\n", 45, 54); */
+ /* ft_printf("uint: %u\n", 1 << 31); */
+ /* ft_printf("hex lower: %x\n", 0xabcf012); */
+ /* ft_printf("hex upper: %X\n", 0xabcf012); */
+ /* ft_printf("percent: %%\n"); */
+ /* */
+ /* ft_printf("precision |%.10d|\n", 43); */
+ /* ft_printf("string precision |%.1s|\n", "bonjour"); */
+ /* ft_printf("min width |%9d|\n", 43); */
+ /* ft_printf("zero padding |%09d|\n", 43); */
+ /* ft_printf("left adjusted |%-9d|\n", 43); */
+ /* ft_printf("string padding |%9s|\n", "bon"); */
- ft_printf("precision |%.10d|\n", 43);
- ft_printf("string precision |%.1s|\n", "bonjour");
- ft_printf("min width |%9d|\n", 43);
- ft_printf("zero padding |%09d|\n", 43);
- ft_printf("left adjusted |%-9d|\n", 43);
- ft_printf("string padding |%9s|\n", "bon");
+ ft_printf("width wildcard |%*d|\n", 5, 43);
+ ft_printf("precision wildcard |%.*d|\n", 3, 43);
+ ft_printf("precision wildcard |%*.*d|\n", 5, 3, 43);
return 0;
}