From 3e92d6c4a6a0bbf76d9ef2890c352e1fe9a3408a Mon Sep 17 00:00:00 2001 From: Baco Date: Sat, 21 Aug 2021 20:25:38 +0200 Subject: [PATCH] commit --- C_08/git/ex03/{ft_abs.h => ft_point.h} | 14 ++++++---- C_08/git/ex03/main.c | 37 +++++--------------------- C_08/git/ex04/ft_point.h | 22 +++++++++++++++ C_08/git/ex04/main.c | 27 +++++++++++++++++++ C_08/git/ex04/main.sh | 9 +++++++ ex.sh | 14 ++++++++++ 6 files changed, 88 insertions(+), 35 deletions(-) rename C_08/git/ex03/{ft_abs.h => ft_point.h} (81%) create mode 100644 C_08/git/ex04/ft_point.h create mode 100644 C_08/git/ex04/main.c create mode 100755 C_08/git/ex04/main.sh create mode 100755 ex.sh diff --git a/C_08/git/ex03/ft_abs.h b/C_08/git/ex03/ft_point.h similarity index 81% rename from C_08/git/ex03/ft_abs.h rename to C_08/git/ex03/ft_point.h index e7adcfe..4ebbbc1 100644 --- a/C_08/git/ex03/ft_abs.h +++ b/C_08/git/ex03/ft_point.h @@ -1,7 +1,7 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* ft_boolean.h :+: :+: :+: */ +/* ft_point.h :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: gbaconni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ @@ -10,9 +10,13 @@ /* */ /* ************************************************************************** */ -#ifndef FT_ABS_H -# define FT_ABS_H - -# define ABS(Value) ((Value < 0)? (-Value): (Value)) +#ifndef FT_POINT_H +# define FT_POINT_H +typedef struct s_point +{ + int x; + int y; +} t_point; +void set_point(t_point *point); #endif diff --git a/C_08/git/ex03/main.c b/C_08/git/ex03/main.c index c609c73..5eb087d 100644 --- a/C_08/git/ex03/main.c +++ b/C_08/git/ex03/main.c @@ -10,41 +10,18 @@ /* */ /* ************************************************************************** */ -#include "ft_abs.h" -#include +#include "ft_point.h" -static int ft_atoi(char *str) +void set_point(t_point *point) { - int nb; - int s; - int i; - - nb = 0; - s = 1; - i = 0; - while (str[i] != '\0' && (str[i] == ' ' || (str[i] >= '\t' && str[i] <= '\r'))) - i++; - while (str[i] != '\0') - { - if (str[i] == '+') - s += 0; - else if (str[i] == '-') - s *= -1; - else if (str[i] >= '0' && str[i] <= '9') - nb = nb * 10 + str[i] - '0'; - else - break ; - i++; - } - return (nb * s); + point->x = 42; + point->y = 21; } -int main(int argc, char *argv[]) +int main(void) { - int n; + t_point point; - (void) argc; - n = ft_atoi(argv[1]); - printf("%d\n", ABS(n)); + set_point(&point); return (0); } diff --git a/C_08/git/ex04/ft_point.h b/C_08/git/ex04/ft_point.h new file mode 100644 index 0000000..4ebbbc1 --- /dev/null +++ b/C_08/git/ex04/ft_point.h @@ -0,0 +1,22 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_point.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: gbaconni +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2021/08/20 10:17:09 by gbaconni #+# #+# */ +/* Updated: 2021/08/20 12:05:50 by gbaconni ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef FT_POINT_H +# define FT_POINT_H + +typedef struct s_point +{ + int x; + int y; +} t_point; +void set_point(t_point *point); +#endif diff --git a/C_08/git/ex04/main.c b/C_08/git/ex04/main.c new file mode 100644 index 0000000..5eb087d --- /dev/null +++ b/C_08/git/ex04/main.c @@ -0,0 +1,27 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* main.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: gbaconni +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2021/08/20 10:26:50 by gbaconni #+# #+# */ +/* Updated: 2021/08/20 10:34:14 by gbaconni ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "ft_point.h" + +void set_point(t_point *point) +{ + point->x = 42; + point->y = 21; +} + +int main(void) +{ + t_point point; + + set_point(&point); + return (0); +} diff --git a/C_08/git/ex04/main.sh b/C_08/git/ex04/main.sh new file mode 100755 index 0000000..109663b --- /dev/null +++ b/C_08/git/ex04/main.sh @@ -0,0 +1,9 @@ +#!/bin/sh +set -e +norminette -R CheckDefine *.h +norminette -R CheckForbiddenSourceHeader ft_*.c +cpp main.c +gcc -Wall -Wextra -Werror -o a.out *.c +echo $(basename $PWD): +./a.out "$@" +rm -f a.out diff --git a/ex.sh b/ex.sh new file mode 100755 index 0000000..dcd2bdb --- /dev/null +++ b/ex.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -e +ex=${1:?$0 } +shift +rm -f a.out +find ../${ex} -type f -name '*.h' -exec \ +norminette -R CheckDefine {} \; +find ../${ex} -type f -name '*.c' \! -name 'main.c' -exec \ +norminette -R CheckForbiddenSourceHeader {} \; +#gcc ${ex}.c +gcc -Wall -Wextra -Werror -o a.out ${ex}.c +echo ${ex}: +./a.out "$@" +rm -f a.out