Skip to content

0 task #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickmoran06 merged 4 commits into from
Jul 30, 2019
Merged

0 task #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c1a376
[fix] special conditions v3
Jul 30, 2019
74ab5d5
A duplicate of the header file
dilanrinconhbtn Jul 30, 2019
b63a534
A duplicate in the _printf file
dilanrinconhbtn Jul 30, 2019
0392004
Merge pull request #8 from nickmoran06/master
nickmoran06 Jul 30, 2019
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
4 changes: 2 additions & 2 deletions _printf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ int _printf(const char *format, ...)
int counter = 0;

if (format != NULL)
{
{
va_start(type, format);
for (counter = 0; format[counter] != '\0'; counter++)
{
Expand All @@ -66,7 +66,7 @@ int _printf(const char *format, ...)
else
{
y += (_putchar(format[counter] + _putchar(format[counter + 1])));
counter++;
counter++;
}
}
}
Expand Down
1 change: 1 addition & 0 deletions _putchar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <unistd.h>
#include "holberton.h"

/**
* _putchar - writes the character c to stdout
Expand Down
10 changes: 4 additions & 6 deletions func_pr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#include "holberton.h"

/**
Expand Down Expand Up @@ -29,10 +28,9 @@ int p_string(va_list type_pr)
char *str;

str = va_arg(type_pr, char *);
if (str)
{
for (i = 0; str[i]; i++)
counter += _putchar(str[i]);
}
if (str == NULL)
str = "(null)";
for (i = 0; str[i]; i++)
counter += _putchar(str[i]);
return (counter);
}