From 1cb8a0037034d6a14dca230b283ba6fd5aa7b4a0 Mon Sep 17 00:00:00 2001 From: hugodu69 Date: Thu, 12 Dec 2019 10:36:49 +0100 Subject: [PATCH] main de test part2 pret --- srcs/part2/ft_strtrim.c | 2 +- srcs/part2/main.c | 49 +++++++++++++++++++++++++++++------------ 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/srcs/part2/ft_strtrim.c b/srcs/part2/ft_strtrim.c index 7276835..0e9ede9 100644 --- a/srcs/part2/ft_strtrim.c +++ b/srcs/part2/ft_strtrim.c @@ -11,7 +11,7 @@ /* ************************************************************************** */ /* -** create a copy of s without the firsts and lasts empty characters +** create a copy of s without the firsts and lasts set of characters */ /* diff --git a/srcs/part2/main.c b/srcs/part2/main.c index b520e99..639f964 100644 --- a/srcs/part2/main.c +++ b/srcs/part2/main.c @@ -4,14 +4,14 @@ void print_ft_itoa(int i) { - printf("%d -> '%s'\n", i, ft_itoa(i)); + printf("itoa : %d -> '%s'\n", i, ft_itoa(i)); } void print_ft_split(char *str, char c) { char **tab; - printf("[%s] [%c] -> ", str, c); + printf("split: [%s] [%c] -> ", str, c); tab = ft_split(str, c); while (*tab != NULL) printf("[%s]", *(tab++)); @@ -20,29 +20,50 @@ void print_ft_split(char *str, char c) void print_ft_strjoin(char *s1, char *s2) { - printf("'%s' + '%s' -> '%s'\n", s1, s2, ft_strjoin(s1, s2)); + printf("join : '%s' + '%s' -> '%s'\n", s1, s2, ft_strjoin(s1, s2)); +} + +char touppercase(unsigned int i, char c) +{ + if (i < 3) + c -= 32; + return (c); +} + +void print_ft_strmapi(char const *s) +{ + char touppercase(unsigned int, char); + + printf("mapi : '%s' -> '%s'\n", s, ft_strmapi(s, touppercase)); +} + +void print_ft_substr(char const *s, unsigned int start, size_t len) +{ + printf("substr: [%s](%u,%zu) -> '%s'\n", s, start, len, ft_substr(s, start, len)); +} + +void print_ft_strtrim(char const *s, char const *set) +{ + printf("strtrim: [%s] [%s] -> '%s'\n", s, set, ft_strtrim(s, set)); } int main() { - char **tab; - char *str; - char c; - int i; - - printf("itoa:\n"); print_ft_itoa(1338); + printf("\n"); - printf("\nsplit:\n"); print_ft_split(" dfs zfe f ez f fez ", ' '); + printf("\n"); - printf("\nstrjoin:\n"); print_ft_strjoin("alpha", "bravo"); + printf("\n"); -// printf("strmapi: %s\n", ft_strmapi(1338)); + print_ft_strmapi("truc"); + printf("\n"); -// printf("substr: %s\n", ft_substr(1338)); + print_ft_substr("zeff", 3, 4); + printf("\n"); -// printf("strtrim: %s\n", ft_strtrim(1338)); + print_ft_strtrim(" strtrim ", "m "); return 0; }