From 82981d4b0d04c0d52020a209c8322fa0eed012f7 Mon Sep 17 00:00:00 2001 From: Charles Date: Sun, 13 Oct 2019 12:50:44 +0200 Subject: Added precision For integral numbers, min width For strings, max len --- ft_printf.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'ft_printf.c') diff --git a/ft_printf.c b/ft_printf.c index 49781e1..9d82f62 100644 --- a/ft_printf.c +++ b/ft_printf.c @@ -30,6 +30,7 @@ int ft_printf(const char *format, ...) /* else */ /* ap_index++; */ /* printf("\n%d\n", format_list->data->left_adjusted); */ + /* printf("\n%d\n", format_list->data->precision); */ if ((str = convert_to_str(format_list->data, ap)) == NULL) return (-1); ft_putstr(str); @@ -48,20 +49,22 @@ int ft_printf(const char *format, ...) int main() { - /* int test; */ + 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("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 %.2d\n", 43); */ + 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"); return 0; } -- cgit