commented things to clarify
This commit is contained in:
18
printf.c
18
printf.c
@@ -10,21 +10,21 @@
|
|||||||
**/
|
**/
|
||||||
int _printf(const char *format, ...)
|
int _printf(const char *format, ...)
|
||||||
{
|
{
|
||||||
int buff_idx, fmt_idx;
|
int buff_idx, fmt_idx; /* Indexes */
|
||||||
unsigned int identifiers, BUFF_SIZE, printed;
|
unsigned int identifiers, BUFF_SIZE, printed;
|
||||||
char *buffer;
|
char *buffer; /*where non formated things are stored*/
|
||||||
va_list args;
|
va_list args;
|
||||||
|
|
||||||
va_start(args, format);
|
va_start(args, format);
|
||||||
|
|
||||||
identifiers = _contains(format, '%');
|
identifiers = _contains(format, '%'); /* instances of %s, %c etc */
|
||||||
BUFF_SIZE = _strlen(format) - identifiers;
|
BUFF_SIZE = _strlen(format) - identifiers;
|
||||||
buffer = malloc(BUFF_SIZE);
|
buffer = malloc(BUFF_SIZE); /* sized of the non % instances only*/
|
||||||
|
|
||||||
if (!format) /* No string. No laundry */
|
if (!format) /* No string. No laundry */
|
||||||
return (0);
|
return (0);
|
||||||
|
|
||||||
buff_idx = 0;
|
buff_idx = 0; /* was there a way to squish these together? */
|
||||||
fmt_idx = 0;
|
fmt_idx = 0;
|
||||||
printed = 0;
|
printed = 0;
|
||||||
while (*(format + fmt_idx))
|
while (*(format + fmt_idx))
|
||||||
@@ -35,6 +35,7 @@ int _printf(const char *format, ...)
|
|||||||
{
|
{
|
||||||
_puts(buffer);
|
_puts(buffer);
|
||||||
BUFF_SIZE -= _strlen(buffer);
|
BUFF_SIZE -= _strlen(buffer);
|
||||||
|
printed += _strlen(buffer);
|
||||||
free(buffer);
|
free(buffer);
|
||||||
buffer = malloc(BUFF_SIZE);
|
buffer = malloc(BUFF_SIZE);
|
||||||
buff_idx = 0;
|
buff_idx = 0;
|
||||||
@@ -42,12 +43,13 @@ int _printf(const char *format, ...)
|
|||||||
switch (*(format + fmt_idx + 1)) /*this needs to shrink*/
|
switch (*(format + fmt_idx + 1)) /*this needs to shrink*/
|
||||||
{
|
{
|
||||||
case 's':
|
case 's':
|
||||||
_puts(va_arg(args, char*));
|
printed += _puts(va_arg(args, char*));
|
||||||
break;
|
break;
|
||||||
case 'c':
|
case 'c':
|
||||||
_putchar(va_arg(args, int));
|
printed += _putchar(va_arg(args, int));
|
||||||
break;
|
break;
|
||||||
case '%': /*add 1 byte*/
|
case '%': /*add 1 byte*/
|
||||||
|
printed += _putchar('%');
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
fmt_idx += 2;
|
fmt_idx += 2;
|
||||||
@@ -61,7 +63,7 @@ int _printf(const char *format, ...)
|
|||||||
}
|
}
|
||||||
if (*buffer)
|
if (*buffer)
|
||||||
{
|
{
|
||||||
_puts(buffer);
|
printed += _puts(buffer);
|
||||||
free(buffer);
|
free(buffer);
|
||||||
}
|
}
|
||||||
return (printed);
|
return (printed);
|
||||||
|
|||||||
Reference in New Issue
Block a user