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 @@ -18,7 +18,9 @@ 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_unsigned(va_list ap);
int print_digit(int num, int *count);
int print_digit_unsigned(unsigned int num, int *count);
int call_print_fn(char ch, print_t funcs[], va_list ap);

#endif
72 changes: 61 additions & 11 deletions print_funcs.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <stdarg.h> /* va_list, va_start, va_arg, va_end macros */
#include <stdlib.h> /* NULL macro */
#include <limits.h>
#include "holberton.h" /* _putchar */

/**
Expand Down Expand Up @@ -31,7 +32,7 @@ int print_string(va_list ap)
}

/**
* print_int - prints a digit from va_list
* print_int - prints an integer from va_list
* @ap: va_list object from calling function
* Return: integer count of characters printed
*/
Expand All @@ -40,7 +41,7 @@ int print_int(va_list ap)
int *count_ptr;
int num;

count_ptr = malloc(sizeof(int));
count_ptr = malloc(sizeof(*count_ptr));

if (!count_ptr)
exit(-1);
Expand All @@ -55,22 +56,71 @@ int print_int(va_list ap)

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

if (num == INT_MIN)
{
(*count) += _putchar('-');
num++;
num = -num;
if (num / 10)
print_digit(num / 10, count);
(*count) += _putchar((num % 10) + 1 + '0');
return (*count);
}
else
{
(*count) += _putchar('-');
num = -num;
}
}
if (num / 10)
{
print_digit(num / 10, count);
}

(*count) += _putchar((num % 10) + '0');
return (*count);
}

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

count_ptr = malloc(sizeof(*count_ptr));

if (!count_ptr)
exit(-1);

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

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

return (*count_ptr);
}

/**
* print_digit_unsigned - print the digits recursively
* @num: next unsigned int in the va_arg list
* @count: pointer to integer count digits
* Return: pointer to integer count of character printed
*/
int print_digit_unsigned(unsigned int num, int *count)
{
if (num / 10)
print_digit_unsigned(num / 10, count);


(*count) += _putchar((num % 10) + '0');
return (*count);
Expand Down
2 changes: 2 additions & 0 deletions printf.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ int _printf(const char *format, ...)
{"s", print_string},
{"d", print_int},
{"i", print_int},
{"u", print_unsigned},
{NULL, NULL}
};
va_start(ap, format);
Expand All @@ -35,6 +36,7 @@ int _printf(const char *format, ...)
case 's':
case 'd':
case 'i':
case 'u':
count += call_print_fn(format[i], funcs, ap);
break;
default:
Expand Down
5 changes: 3 additions & 2 deletions tests/small_tests.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <stdio.h>
#include <limits.h>
#include "../holberton.h"

/**
Expand All @@ -10,8 +11,8 @@ int main(void)
int a = 0;
int b = 0;

a = printf("stdio%");
b = _printf("ours%");
a = printf("stdio %d\n", INT_MIN);
b = _printf("ours %d\n", INT_MIN);
/* printf("%d", a);*/
printf("(%d, %d)\n", a, b);

Expand Down