Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions holberton.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ int _putchar(char c);
int _printf(const char *format, ...);
int print_char(va_list ap);
int print_string(va_list ap);
int print_int(va_list ap);
int print_digit(int num, int *count);
int call_print_fn(char ch, print_t funcs[], va_list ap);

#endif
38 changes: 38 additions & 0 deletions print_digits.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#include <stdio.h>
#include <stdlib.h>
#include "holberton.h"

int *print_num(int num, int *count);

int main(int argc, char *argv[])
{
int *count;
int counter = 0;

(void) argc;
count = &counter;

print_num(atoi(argv[1]), count);
_putchar('\n');
printf("%d\n", *count);
return (0);
}


int *print_num(int num, int *count)
{

if (num < 0)
{
_putchar('-');
num = -num;
}

if (num / 10)
{
print_num(num / 10, count);
}

(*count) += _putchar((num % 10) + '0');
return (count);
}
45 changes: 45 additions & 0 deletions print_funcs.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,48 @@ int print_string(va_list ap)
return (count);
}

/**
* print_int - prints a digit from va_list
* @ap: va_list object from calling function
* Return: integer count of characters printed
*/
int print_int(va_list ap)
{
int *count_ptr;
int num;

count_ptr = malloc(sizeof(int));

if (!count_ptr)
exit(-1);

*count_ptr = 0;
num = va_arg(ap, int);

(*count_ptr) = print_digit(num, count_ptr);

return (*count_ptr);
}

/**
* print_digit - print the digits recursively
* @num: next num in the va_arg list
* @count: count digits
* Return: Always 0
*/
int print_digit(int num, int *count)
{
if (num < 0)
{
(*count) += _putchar('-');
num = -num;
} /* handle int min & max */

if (num / 10)
{
print_digit(num / 10, count);
}

(*count) += _putchar((num % 10) + '0');
return (*count);
}
5 changes: 4 additions & 1 deletion printf.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ int _printf(const char *format, ...)
print_t funcs[] = {
{"c", print_char},
{"s", print_string},
{"d", print_int},
{"i", print_int},
{NULL, NULL}
};

va_start(ap, format);
for (i = 0; format != NULL && format[i] != '\0'; i++)
{
Expand All @@ -32,6 +33,8 @@ int _printf(const char *format, ...)
break;
case 'c':
case 's':
case 'd':
case 'i':
count += call_print_fn(format[i], funcs, ap);
break;
default:
Expand Down