baco/ft_printf
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remplace all write with ft_putchar and ft_puts

Browse Source
This commit is contained in:
gbaconni
2022-04-16 00:53:16 +02:00
parent d7d3f39e54
commit 5aa3e848e9
14 changed files with 107 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libftprintf/Makefile
View File

@@ -6,7 +6,7 @@
# By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ # # By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2022/01/18 15:11:16 by gbaconni #+# #+# # # Created: 2022/01/18 15:11:16 by gbaconni #+# #+# #
# Updated: 2022/04/15 20:19:14 by gbaconni ### lausanne.ch # # Updated: 2022/04/16 00:45:55 by gbaconni ### lausanne.ch #
# # # #
# **************************************************************************** # # **************************************************************************** #
# #
@@ -30,7 +30,10 @@ SRC = \
$(LIBFT)/ft_calloc.c \ $(LIBFT)/ft_calloc.c \
$(LIBFT)/ft_strlen.c \ $(LIBFT)/ft_strlen.c \
$(LIBFT)/ft_itoa.c \ $(LIBFT)/ft_itoa.c \
ft_strrev.c \
ft_ltoa_base.c \ ft_ltoa_base.c \
ft_putchar.c \
ft_puts.c \
ft_vprintf_char.c \ ft_vprintf_char.c \
ft_vprintf_string.c \ ft_vprintf_string.c \
ft_vprintf_pointer.c \ ft_vprintf_pointer.c \

23
libftprintf/ft_ltoa_base.c
View File

@@ -6,14 +6,13 @@
/* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */ /* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2021/08/16 13:51:16 by gbaconni #+# #+# */ /* Created: 2021/08/16 13:51:16 by gbaconni #+# #+# */
/* Updated: 2022/04/15 20:20:23 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/16 00:46:32 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "libftprintf.h" #include "libftprintf.h"
static long ft_longlen_base(long n, long nbase); static long ft_longlen_base(long n, long nbase);
static char *ft_strrev(char *s);
char *ft_ltoa_base(long n, char *base) char *ft_ltoa_base(long n, char *base)
{ {
@@ -57,23 +56,3 @@ static long ft_longlen_base(long n, long nbase)
} }
return (len); return (len);
} }
static char *ft_strrev(char *s)
{
int len;
int i;
int j;
char c;
len = ft_strlen(s);
i = 0;
while (i < (len / 2))
{
j = len - 1 - i;
c = s[i];
s[i] = s[j];
s[j] = c;
i++;
}
return (s);
}

22
libftprintf/ft_putchar.c Normal file
View File

@@ -0,0 +1,22 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_putchar.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/04/16 00:05:56 by gbaconni #+# #+# */
/* Updated: 2022/04/16 00:27:53 by gbaconni ### lausanne.ch */
/* */
/* ************************************************************************** */
#include "libftprintf.h"
int ft_putchar(int c)
{
int ret;
ret = 0;
ret = write(1, &c, 1);
return (ret);
}

23
libftprintf/ft_puts.c Normal file
View File

@@ -0,0 +1,23 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_puts.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/04/16 00:07:17 by gbaconni #+# #+# */
/* Updated: 2022/04/16 00:35:49 by gbaconni ### lausanne.ch */
/* */
/* ************************************************************************** */
#include "libftprintf.h"
int ft_puts(const char *s)
{
int ret;
ret = 0;
while (*s != '\0')
ret += ft_putchar(*s++);
return (ret);
}

33
libftprintf/ft_strrev.c Normal file
View File

@@ -0,0 +1,33 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_strrev.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/04/16 00:44:41 by gbaconni #+# #+# */
/* Updated: 2022/04/16 00:45:08 by gbaconni ### lausanne.ch */
/* */
/* ************************************************************************** */
#include "libftprintf.h"
char *ft_strrev(char *s)
{
int len;
int i;
int j;
char c;
len = ft_strlen(s);
i = 0;
while (i < (len / 2))
{
j = len - 1 - i;
c = s[i];
s[i] = s[j];
s[j] = c;
i++;
}
return (s);
}

4
libftprintf/ft_vprintf.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 11:43:52 by gbaconni #+# #+# */ /* Created: 2022/01/20 11:43:52 by gbaconni #+# #+# */
/* Updated: 2022/04/15 20:44:24 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/15 22:15:16 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -17,7 +17,7 @@ int ft_vprintf(char const *format, va_list ap)
int ret; int ret;
ret = 0; ret = 0;
while (*format) while (*format != 0)
{ {
if (*format == '%') if (*format == '%')
{ {

6
libftprintf/ft_vprintf_char.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 11:54:48 by gbaconni #+# #+# */ /* Created: 2022/01/20 11:54:48 by gbaconni #+# #+# */
/* Updated: 2022/04/12 08:20:53 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/16 00:24:01 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -18,9 +18,7 @@ int ft_vprintf_char(const char *format, va_list ap)
int ret; int ret;
(void) format; (void) format;
ret = 0;
c = (char) va_arg(ap, int); c = (char) va_arg(ap, int);
write(1, &c, 1); ret = ft_putchar(c);
ret++;
return (ret); return (ret);
} }

9
libftprintf/ft_vprintf_decimal.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 11:55:02 by gbaconni #+# #+# */ /* Created: 2022/01/20 11:55:02 by gbaconni #+# #+# */
/* Updated: 2022/04/14 21:49:13 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/16 00:29:49 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -15,18 +15,13 @@
int ft_vprintf_decimal(const char *format, va_list ap) int ft_vprintf_decimal(const char *format, va_list ap)
{ {
int ret; int ret;
int len;
int d; int d;
char *s; char *s;
(void) format; (void) format;
ret = 0;
len = 0;
d = va_arg(ap, int); d = va_arg(ap, int);
s = ft_itoa(d); s = ft_itoa(d);
len = ft_strlen(s); ret = ft_puts(s);
write(1, s, len);
ret += len;
free(s); free(s);
return (ret); return (ret);
} }

11
libftprintf/ft_vprintf_hexadecimal.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 11:55:33 by gbaconni #+# #+# */ /* Created: 2022/01/20 11:55:33 by gbaconni #+# #+# */
/* Updated: 2022/04/15 20:22:19 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/16 00:30:39 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -15,21 +15,16 @@
int ft_vprintf_hexadecimal(const char *format, va_list ap) int ft_vprintf_hexadecimal(const char *format, va_list ap)
{ {
int ret; int ret;
int len;
long l; long l;
char *s; char *s;
(void) format; (void) format;
ret = 0;
len = 0;
l = va_arg(ap, long); l = va_arg(ap, long);
if (format[0] == 'x') if (*format == 'x')
s = ft_ltoa_base(l, "0123456789abcdef"); s = ft_ltoa_base(l, "0123456789abcdef");
else else
s = ft_ltoa_base(l, "0123456789ABCDEF"); s = ft_ltoa_base(l, "0123456789ABCDEF");
len = ft_strlen(s); ret = ft_puts(s);
write(1, s, len);
ret += len;
free(s); free(s);
return (ret); return (ret);
} }

6
libftprintf/ft_vprintf_other.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 12:58:03 by gbaconni #+# #+# */ /* Created: 2022/01/20 12:58:03 by gbaconni #+# #+# */
/* Updated: 2022/04/15 00:23:22 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/16 00:36:48 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -17,8 +17,6 @@ int ft_vprintf_other(const char *format, va_list ap)
int ret; int ret;
(void) ap; (void) ap;
ret = 0; ret = ft_putchar(*format);
write(1, format, 1);
ret++;
return (ret); return (ret);
} }

6
libftprintf/ft_vprintf_percent.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 11:55:58 by gbaconni #+# #+# */ /* Created: 2022/01/20 11:55:58 by gbaconni #+# #+# */
/* Updated: 2022/04/13 00:01:47 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/16 00:32:06 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -18,8 +18,6 @@ int ft_vprintf_percent(const char *format, va_list ap)
(void) format; (void) format;
(void) ap; (void) ap;
ret = 0; ret = ft_putchar('%');
write(1, "%", 1);
ret++;
return (ret); return (ret);
} }

15
libftprintf/ft_vprintf_pointer.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 11:56:16 by gbaconni #+# #+# */ /* Created: 2022/01/20 11:56:16 by gbaconni #+# #+# */
/* Updated: 2022/04/15 20:54:31 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/16 00:34:18 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -15,25 +15,20 @@
int ft_vprintf_pointer(const char *format, va_list ap) int ft_vprintf_pointer(const char *format, va_list ap)
{ {
int ret; int ret;
int len;
void *p; void *p;
char *s; char *s;
(void) format; (void) format;
ret = 0; ret = 0;
len = 0;
p = va_arg(ap, void *); p = va_arg(ap, void *);
if (p == NULL) if (p == NULL)
{ {
len = ft_strlen(NIL); ret = ft_puts(NIL);
write(1, NIL, len); return (ret);
return (len);
} }
s = ft_ltoa_base((long) p, "0123456789abcdef"); s = ft_ltoa_base((long) p, "0123456789abcdef");
len = ft_strlen(s); ret += ft_puts("0x");
write(1, "0x", 2); ret += ft_puts(s);
write(1, s, len);
ret += len + 2;
free(s); free(s);
return (ret); return (ret);
} }

9
libftprintf/ft_vprintf_string.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 11:56:37 by gbaconni #+# #+# */ /* Created: 2022/01/20 11:56:37 by gbaconni #+# #+# */
/* Updated: 2022/04/12 23:50:02 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/16 00:35:13 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -15,15 +15,10 @@
int ft_vprintf_string(const char *format, va_list ap) int ft_vprintf_string(const char *format, va_list ap)
{ {
int ret; int ret;
int len;
char *s; char *s;
(void) format; (void) format;
ret = 0;
len = 0;
s = va_arg(ap, char *); s = va_arg(ap, char *);
len = ft_strlen(s); ret = ft_puts(s);
write(1, s, len);
ret += len;
return (ret); return (ret);
} }

5
libftprintf/libftprintf.h
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/18 15:26:06 by gbaconni #+# #+# */ /* Created: 2022/01/18 15:26:06 by gbaconni #+# #+# */
/* Updated: 2022/04/15 20:20:35 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/16 00:45:36 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -25,7 +25,10 @@
/* Helper */ /* Helper */
char *ft_strrev(char *s);
char *ft_ltoa_base(long n, char *base); char *ft_ltoa_base(long n, char *base);
int ft_putchar(int c);
int ft_puts(const char *s);
/* Mandatory */ /* Mandatory */