diff --git a/hdrs/libft.h b/hdrs/libft.h index c9f6803..8b65d36 100644 --- a/hdrs/libft.h +++ b/hdrs/libft.h @@ -3,15 +3,7 @@ # include -typedef struct s_string -{ - size_t len; - char *data; -} t_string; - int ft_strcmp(const char *s1, const char *s2); -size_t ft_strlen(const char *s); -int ft_putstr(const char *s); int ft_islower(int c); int ft_isupper(int c); int ft_tolower(int c); @@ -26,12 +18,5 @@ void *ft_memcpy(void *dst, const void *src, size_t n); void *ft_memcpy32(void *dst, const void *src, size_t n); void *ft_memcpy64(void *dst, const void *src, size_t n); int ft_atoi(const char *str); -int ft_putchar(char c); -int ft_putnbr(int n); -int ft_putunbr(unsigned int n); -int ft_puthex(unsigned int n, int uppercase); -void ft_putptr(void *ptr); -int ft_printf(const char *format, ...); -int ft_putaddr(unsigned long n); #endif diff --git a/srcs/ft_printf.c b/srcs/ft_printf.c deleted file mode 100644 index 5b065c3..0000000 --- a/srcs/ft_printf.c +++ /dev/null @@ -1,45 +0,0 @@ -#include "libft.h" -#include -#include - -static int ft_print_format(const char *fmt, va_list args) -{ - if (*fmt == 'c') - return (ft_putchar(va_arg(args, int))); - else if (*fmt == 's') - return (ft_putstr(va_arg(args, char *))); - else if (*fmt == 'p') - return (ft_putaddr((uintptr_t)va_arg(args, void *))); - else if (*fmt == 'd' || *fmt == 'i') - return (ft_putnbr(va_arg(args, int))); - else if (*fmt == 'u') - return (ft_putunbr(va_arg(args, unsigned int))); - else if (*fmt == 'x') - return (ft_puthex(va_arg(args, unsigned int), 0)); - else if (*fmt == 'X') - return (ft_puthex(va_arg(args, unsigned int), 1)); - else if (*fmt == '%') - return (ft_putchar('%')); - return (0); -} - -int ft_printf(const char *format, ...) -{ - va_list args; - int i = 0; - int count = 0; - - va_start(args, format); - while (format[i]) - { - if (format[i] == '%' && format[i + 1]) - { - count += ft_print_format(&format[++i], args); - } - else - count += ft_putchar(format[i]); - i++; - } - va_end(args); - return (count); -} diff --git a/srcs/ft_putaddr.c b/srcs/ft_putaddr.c deleted file mode 100644 index 4c66ce0..0000000 --- a/srcs/ft_putaddr.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "libft.h" - -int ft_putaddr(unsigned long n) -{ - int count = 0; - char *digits = "0123456789abcdef"; - - if (n >= 16) - count += ft_putaddr(n / 16); - count += ft_putchar(digits[n % 16]); - return count; -} \ No newline at end of file diff --git a/srcs/ft_putchar.c b/srcs/ft_putchar.c deleted file mode 100644 index c1b9f17..0000000 --- a/srcs/ft_putchar.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "libft.h" -#include - -int ft_putchar(char c) -{ - write(1, &c, 1); - return 1; -} diff --git a/srcs/ft_puthex.c b/srcs/ft_puthex.c deleted file mode 100644 index 6958c8c..0000000 --- a/srcs/ft_puthex.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "libft.h" // for ft_putchar - -int ft_puthex(unsigned int n, int uppercase) -{ - int count = 0; - char *digits = uppercase ? "0123456789ABCDEF" : "0123456789abcdef"; - - if (n >= 16) - count += ft_puthex(n / 16, uppercase); - count += ft_putchar(digits[n % 16]); - return count; -} \ No newline at end of file diff --git a/srcs/ft_putnbr.c b/srcs/ft_putnbr.c deleted file mode 100644 index 2710ba1..0000000 --- a/srcs/ft_putnbr.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "libft.h" -#include - -int ft_putnbr(int n) -{ - int count = 0; - char c; - - if (n == -2147483648) - return write(1, "-2147483648", 11); - if (n < 0) - { - count += ft_putchar('-'); - n = -n; - } - if (n >= 10) - count += ft_putnbr(n / 10); - c = '0' + (n % 10); - count += ft_putchar(c); - return count; -} diff --git a/srcs/ft_putstr.c b/srcs/ft_putstr.c deleted file mode 100644 index e5b6bd1..0000000 --- a/srcs/ft_putstr.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "libft.h" -#include - -int ft_putstr(const char *s) -{ - int len = 0; - if (!s) - return write(1, "(null)", 6); - while (s[len]) - write(1, &s[len++], 1); - return len; -} diff --git a/srcs/ft_putunbr.c b/srcs/ft_putunbr.c deleted file mode 100644 index 40c9dea..0000000 --- a/srcs/ft_putunbr.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "libft.h" -#include - -int ft_putunbr(unsigned int n) -{ - int count = 0; - char c; - - if (n >= 10) - count += ft_putunbr(n / 10); - c = '0' + (n % 10); - count += ft_putchar(c); - return count; -}