aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--c01/ex03/ft_div_mod.c2
-rw-r--r--c01/ex05/ft_putstr.c4
-rw-r--r--c01/ex07/ft_rev_int_tab.c4
-rw-r--r--c01/ex08/ft_sort_int_tab.c6
-rw-r--r--c01/main.c92
5 files changed, 69 insertions, 39 deletions
diff --git a/c01/ex03/ft_div_mod.c b/c01/ex03/ft_div_mod.c
index 7a5e784..18f7143 100644
--- a/c01/ex03/ft_div_mod.c
+++ b/c01/ex03/ft_div_mod.c
@@ -6,7 +6,7 @@
/* By: cacharle <charles.cabergs@gmail.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/07/03 17:52:21 by cacharle #+# #+# */
-/* Updated: 2019/07/03 18:16:18 by cacharle ### ########.fr */
+/* Updated: 2019/07/04 06:12:43 by cacharle ### ########.fr */
/* */
/* ************************************************************************** */
diff --git a/c01/ex05/ft_putstr.c b/c01/ex05/ft_putstr.c
index 5290837..55d0d43 100644
--- a/c01/ex05/ft_putstr.c
+++ b/c01/ex05/ft_putstr.c
@@ -6,10 +6,12 @@
/* By: cacharle <charles.cabergs@gmail.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/07/03 17:57:28 by cacharle #+# #+# */
-/* Updated: 2019/07/03 18:15:52 by cacharle ### ########.fr */
+/* Updated: 2019/07/04 06:29:50 by cacharle ### ########.fr */
/* */
/* ************************************************************************** */
+#include <unistd.h>
+
void ft_putstr(char *str)
{
while (*str != '\0')
diff --git a/c01/ex07/ft_rev_int_tab.c b/c01/ex07/ft_rev_int_tab.c
index 4219fbc..e6b0dea 100644
--- a/c01/ex07/ft_rev_int_tab.c
+++ b/c01/ex07/ft_rev_int_tab.c
@@ -6,7 +6,7 @@
/* By: cacharle <charles.cabergs@gmail.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/07/03 18:02:02 by cacharle #+# #+# */
-/* Updated: 2019/07/03 18:15:24 by cacharle ### ########.fr */
+/* Updated: 2019/07/04 06:44:57 by cacharle ### ########.fr */
/* */
/* ************************************************************************** */
@@ -17,7 +17,7 @@ void ft_rev_int_tab(int *tab, int size)
int tmp;
i = 0;
- j = size;
+ j = size - 1;
while (i <= j)
{
tmp = tab[i];
diff --git a/c01/ex08/ft_sort_int_tab.c b/c01/ex08/ft_sort_int_tab.c
index 6a0d092..4aa51b0 100644
--- a/c01/ex08/ft_sort_int_tab.c
+++ b/c01/ex08/ft_sort_int_tab.c
@@ -6,7 +6,7 @@
/* By: cacharle <charles.cabergs@gmail.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/07/03 18:06:03 by cacharle #+# #+# */
-/* Updated: 2019/07/03 18:14:54 by cacharle ### ########.fr */
+/* Updated: 2019/07/04 06:52:49 by cacharle ### ########.fr */
/* */
/* ************************************************************************** */
@@ -16,8 +16,11 @@ int is_sorted(int *tab, int size)
i = 0;
while (i < size - 1)
+ {
if (tab[i] > tab[i + 1])
return (0);
+ i++;
+ }
return (1);
}
@@ -28,6 +31,7 @@ void ft_sort_int_tab(int *tab, int size)
while (!is_sorted(tab, size))
{
+ i = 0;
while (i < size - 1)
{
if (tab[i] > tab[i + 1])
diff --git a/c01/main.c b/c01/main.c
index 5d6e31b..c0ba1d0 100644
--- a/c01/main.c
+++ b/c01/main.c
@@ -1,49 +1,73 @@
#include <stdio.h>
-#include <limits.h>
-/*#include "ex00/ft_putchar.c"*/
-/*#include "ex01/ft_print_alphabet.c"*/
-/*#include "ex02/ft_print_reverse_alphabet.c"*/
-/*#include "ex03/ft_print_numbers.c"*/
-/*#include "ex04/ft_is_negative.c"*/
-/*#include "ex05/ft_print_comb.c"*/
-/*#include "ex06/ft_print_comb2.c"*/
-/*#include "ex07/ft_putnbr.c"*/
-#include "ex08/ft_print_combn.c"
+/*#include <limits.h>*/
+#include "ex00/ft_ft.c"
+#include "ex01/ft_ultimate_ft.c"
+#include "ex02/ft_swap.c"
+#include "ex03/ft_div_mod.c"
+#include "ex04/ft_ultimate_div_mod.c"
+#include "ex05/ft_putstr.c"
+#include "ex06/ft_strlen.c"
+#include "ex07/ft_rev_int_tab.c"
+#include "ex08/ft_sort_int_tab.c"
int main()
{
+ int i42 = 2;
+ int *i = &i42;
+ int **a1 = &i;
+ int ***a2 = &a1;
+ int ****a3 = &a2;
+ int *****a4 = &a3;
+ int ******a5 = &a4;
+ int *******a6 = &a5;
+ int ********a7 = &a6;
+ int *********a8 = &a7;
- /*ft_putchar('a');*/
- /*ft_putchar('z');*/
- /*ft_putchar('\n');*/
+ printf("%d before ", i42);
+ ft_ft(i);
+ printf("%d after\n", i42);
- /*ft_putchar('\n');*/
- /*ft_print_alphabet();*/
+ i42 = 3;
+ printf("%d before ", i42);
+ ft_ultimate_ft(a8);
+ printf("%d after\n", i42);
- /*ft_putchar('\n');*/
- /*ft_print_reverse_alphabet();*/
+ int b = 4, c = 6;
+ int *bp = &b, *cp = &c;
+ printf("before: %d, %d\n", b, c);
+ ft_swap(bp, cp);
+ printf("after: %d, %d\n", b, c);
- /*ft_putchar('\n');*/
- /*ft_print_numbers();*/
+ int div, mod;
+ ft_div_mod(20, 7, &div, &mod);
+ printf("div = %d, mod = %d\n", div, mod);
- /*ft_putchar('\n');*/
- /*ft_is_negative(1);*/
- /*ft_is_negative(0);*/
- /*ft_is_negative(-1);*/
+ int a = 20, f = 3;
+ ft_ultimate_div_mod(&a, &f);
+ printf("a div = %d, b mod = %d\n", a, f);
- /*ft_putchar('\n');*/
- /*ft_print_comb();*/
+ char s[] = "bonjour je suis charles";
+ /*int twer =89899999;*/
+ /*char s2[3] = {'a', 'b', 'c'};//, '\0'};*/
+ /*int qwer = 5445;*/
+ ft_putstr(s);
+ printf("\n");
+ /*ft_putstr(s2);*/
+ /*printf("\n");*/
- /*ft_putchar('\n');*/
- /*ft_print_comb2();*/
+ printf("(23) '%s' length = %d\n", s, ft_strlen(s));
- /*ft_putchar('\n');*/
- /*ft_putnbr(INT_MAX);*/
- /*ft_putchar('\n');*/
- /*ft_putnbr(INT_MIN);*/
- /*ft_putchar('\n');*/
- /*ft_putnbr(-42);*/
+ int t[4] = {1, 2, 3, 4};
+ ft_rev_int_tab(t, 4);
+ for (int i = 0; i < 4; i++)
+ printf("%d ", t[i]);
+ printf("\n");
- ft_print_combn(2);
+ int t2[5] = {3, 6, 1, 2, -1};
+ ft_sort_int_tab(t2, 5);
+ for (int i = 0; i < 5; i++)
+ printf("%d ", t2[i]);
+
+ return 0;
}