aboutsummaryrefslogtreecommitdiff
path: root/ft_printf.c
diff options
context:
space:
mode:
authorCharles <sircharlesaze@gmail.com>2019-10-25 04:42:08 +0200
committerCharles <sircharlesaze@gmail.com>2019-10-25 04:42:08 +0200
commitfeb71e200972bb78fe86130629ef040ef80811a7 (patch)
tree24b84b3f4937ab4eb930e1ad851494d8d49a9775 /ft_printf.c
parent1b4df01bfa793fe91a58192a4b79917909bf1614 (diff)
downloadft_printf-feb71e200972bb78fe86130629ef040ef80811a7.tar.gz
ft_printf-feb71e200972bb78fe86130629ef040ef80811a7.tar.bz2
ft_printf-feb71e200972bb78fe86130629ef040ef80811a7.zip
WIP: Added libft submodule, make ft_printf lib
Diffstat (limited to 'ft_printf.c')
-rw-r--r--ft_printf.c94
1 files changed, 31 insertions, 63 deletions
diff --git a/ft_printf.c b/ft_printf.c
index 96641b1..27b4734 100644
--- a/ft_printf.c
+++ b/ft_printf.c
@@ -6,23 +6,23 @@
int ft_printf(const char *format, ...)
{
int print_len;
- va_list ap;
- /* va_list ap_start; */
- /* int ap_index; */
- t_list *format_list;
- char *str;
-
- if ((format_list = parse(format)) == NULL)
- return (-1);
- /* ap_index = 0; */
- va_start(ap, format);
-
- /* va_copy(ap_start, ap); */
- print_len = -1;
- while (format[++print_len])
- {
- if (format[print_len] == '%')
- {
+ /* va_list ap; */
+ /* #<{(| va_list ap_start; |)}># */
+ /* #<{(| int ap_index; |)}># */
+ /* t_list *format_list; */
+ /* char *str; */
+ /* */
+ /* if ((format_list = parse(format)) == NULL) */
+ /* return (-1); */
+ /* #<{(| ap_index = 0; |)}># */
+ /* va_start(ap, format); */
+ /* */
+ /* #<{(| va_copy(ap_start, ap); |)}># */
+ /* print_len = -1; */
+ /* while (format[++print_len]) */
+ /* { */
+ /* if (format[print_len] == '%') */
+ /* { */
/* if (format_list->data->ap_index != -1) */
/* { */
/* ap_index = format_list->data->ap_index; */
@@ -33,51 +33,19 @@ int ft_printf(const char *format, ...)
/* 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);
- }
- else
- write(STDOUT_FILENO, format + print_len, 1);
- }
- va_end(ap);
+ /* if ((str = convert_to_str(format_list->content, ap)) == NULL) */
+ /* return (-1); */
+ /* ft_putstr(str); */
+ /* free(str); */
+ /* */
+ /* print_len += format_list->content->len; */
+ /* list_pop_front(&format_list); */
+ /* } */
+ /* else */
+ /* write(STDOUT_FILENO, format + print_len, 1); */
+ /* } */
+ /* va_end(ap); */
+ (void)format;
+ print_len = 0;
return (print_len);
}
-
-#ifndef TESTING
-
-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"); */
-
- /* ft_printf("precision |%.9d|\n", 43); */
- /* ft_printf("string precision |%.9s|\n", "jesuisbonjourbonjour"); */
- /* 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", 5, 43);
- ft_printf("precision/width wildcard |%*.*d|\n", 5, 3, 43);
- ft_printf("left adjusted |%*d|\n", -5, 43);
-
- /* ft_printf("overwrite |%*3d|\n", 5, 43); */
- /* ft_printf("overwrite |%*-1d|\n", 0, 43); */
- return 0;
-}
-
-#endif