Skip to content

Commit 18aff13

Browse files
csphillicsphilli
committed
new normed
1 parent ced7903 commit 18aff13

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+190
-277
lines changed

‎includes/libft.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
/* By: csphilli <[email protected]> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2019/10/17 16:37:29 by cphillip #+# #+# */
9-
/* Updated: 2021/02/05 20:34:52 by csphilli ### ########.fr */
9+
/* Updated: 2021/04/25 09:49:07 by csphilli ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

1313
#ifndef LIBFT_H
1414
# define LIBFT_H
1515
# define BUFF_SIZE 1000
1616
# define BUFF_SIZE_GNL 1000
17-
# define FD_SIZE 1000
17+
# define FD_MAX 1000
1818

1919
# include <string.h>
2020
# include <stdlib.h>
@@ -87,9 +87,8 @@ int get_next_line(const int fd, char **line);
8787
int clean_line(char **fdt, char **line);
8888
int ft_nbr_size_base(uintmax_t nbr, int base);
8989
char *ft_revstr(char *str);
90-
void *ft_s_inlower(char *str);
91-
void *ft_s_inupper(char *str);
9290
void ft_s_toupper(char *str);
91+
void ft_s_tolower(char *str);
9392
char *ft_strndup(char *str, int size);
9493
int ft_intlen_max(uintmax_t nbr);
9594
char *ft_ftoa(long double nbr, int prec, char dot);

‎includes/ll.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@
66
/* By: csphilli <[email protected]> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2021/01/22 21:45:25 by cphillip #+# #+# */
9-
/* Updated: 2021/02/05 20:46:06 by csphilli ### ########.fr */
9+
/* Updated: 2021/04/25 09:54:32 by csphilli ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

1313
#ifndef LL_H
1414
# define LL_H
1515

16-
typedef struct s_node
16+
typedef struct s_node
1717
{
1818
void *data;
1919
struct s_node *next;
2020
} t_node;
2121

22-
typedef struct s_list
22+
typedef struct s_list
2323
{
2424
t_node *head;
2525
t_node *tail;
2626
t_node *cur;
2727
} t_list;
2828

29-
typedef int(*t_compare)(void*, void*);
30-
typedef void(*t_display)(void*);
29+
typedef int (*t_compare)(void*, void*);
30+
typedef void(*t_display)(void*);
3131

3232
/*
3333
** Initializes the list. The struct is created as such:

‎srcs/ft_intlen_max.c

+8-5
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,26 @@
33
/* ::: :::::::: */
44
/* ft_intlen_max.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: cphillip <cphillip@student.hive.fi> +#+ +:+ +#+ */
6+
/* By: csphilli <csphilli@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2020/02/27 10:30:26 by cphillip #+# #+# */
9-
/* Updated: 2020/12/16 13:13:29 by cphillip ### ########.fr */
9+
/* Updated: 2021/04/24 22:42:54 by csphilli ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

1313
#include "libft.h"
1414

15-
int ft_intlen_max(uintmax_t nbr)
15+
int ft_intlen_max(uintmax_t nbr)
1616
{
17-
int len;
17+
int len;
1818

1919
if (nbr < 0)
2020
nbr *= -1;
2121
len = 1;
22-
while ((nbr /= 10) > 0)
22+
while (nbr > 0)
23+
{
24+
nbr /= 10;
2325
len++;
26+
}
2427
return (len);
2528
}

‎srcs/ft_is_str_nbr.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
/* ::: :::::::: */
44
/* ft_is_str_nbr.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: cphillip <cphillip@student.hive.fi> +#+ +:+ +#+ */
6+
/* By: csphilli <csphilli@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2020/11/13 14:26:01 by cphillip #+# #+# */
9-
/* Updated: 2020/12/16 13:13:29 by cphillip ### ########.fr */
9+
/* Updated: 2021/04/24 22:43:33 by csphilli ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

1313
#include "libft.h"
1414

15-
int ft_is_str_num(const char *s1)
15+
int ft_is_str_num(const char *s1)
1616
{
1717
int len;
1818
int i;

‎srcs/ft_isalnum.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
/* ::: :::::::: */
44
/* ft_isalnum.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: cphillip <cphillip@student.hive.fi> +#+ +:+ +#+ */
6+
/* By: csphilli <csphilli@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2019/10/24 12:22:04 by cphillip #+# #+# */
9-
/* Updated: 2019/10/31 09:22:56 by cphillip ### ########.fr */
9+
/* Updated: 2021/04/24 22:44:08 by csphilli ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

13-
int ft_isalnum(int c)
13+
int ft_isalnum(int c)
1414
{
1515
return ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || \
1616
(c >= '0' && c <= '9'));

‎srcs/ft_isalpha.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
/* ::: :::::::: */
44
/* ft_isalpha.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: cphillip <cphillip@student.hive.fi> +#+ +:+ +#+ */
6+
/* By: csphilli <csphilli@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2019/10/24 12:38:35 by cphillip #+# #+# */
9-
/* Updated: 2019/10/31 09:18:09 by cphillip ### ########.fr */
9+
/* Updated: 2021/04/24 22:44:13 by csphilli ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

13-
int ft_isalpha(int c)
13+
int ft_isalpha(int c)
1414
{
1515
return ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'));
1616
}

‎srcs/ft_isascii.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
/* ::: :::::::: */
44
/* ft_isascii.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: cphillip <cphillip@student.hive.fi> +#+ +:+ +#+ */
6+
/* By: csphilli <csphilli@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2019/10/24 12:52:19 by cphillip #+# #+# */
9-
/* Updated: 2019/10/24 12:55:07 by cphillip ### ########.fr */
9+
/* Updated: 2021/04/24 22:44:19 by csphilli ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

13-
int ft_isascii(int c)
13+
int ft_isascii(int c)
1414
{
1515
return (c >= 0 && c <= 127);
1616
}

‎srcs/ft_isdigit.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
/* ::: :::::::: */
44
/* ft_isdigit.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: cphillip <cphillip@student.hive.fi> +#+ +:+ +#+ */
6+
/* By: csphilli <csphilli@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2019/10/24 12:34:01 by cphillip #+# #+# */
9-
/* Updated: 2019/10/31 09:21:10 by cphillip ### ########.fr */
9+
/* Updated: 2021/04/24 22:44:25 by csphilli ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

13-
int ft_isdigit(int c)
13+
int ft_isdigit(int c)
1414
{
1515
return (c >= '0' && c <= '9');
1616
}

‎srcs/ft_isprint.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
/* ::: :::::::: */
44
/* ft_isprint.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: cphillip <cphillip@student.hive.fi> +#+ +:+ +#+ */
6+
/* By: csphilli <csphilli@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2019/10/24 13:16:53 by cphillip #+# #+# */
9-
/* Updated: 2019/10/24 13:22:32 by cphillip ### ########.fr */
9+
/* Updated: 2021/04/24 22:44:32 by csphilli ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

13-
int ft_isprint(int c)
13+
int ft_isprint(int c)
1414
{
1515
return (c >= 32 && c <= 126);
1616
}

‎srcs/ft_isspace.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
/* ::: :::::::: */
44
/* ft_isspace.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: cphillip <cphillip@student.hive.fi> +#+ +:+ +#+ */
6+
/* By: csphilli <csphilli@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2019/10/28 13:44:39 by cphillip #+# #+# */
9-
/* Updated: 2019/11/02 21:43:41 by cphillip ### ########.fr */
9+
/* Updated: 2021/04/24 22:44:37 by csphilli ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

13-
int ft_isspace(int c)
13+
int ft_isspace(int c)
1414
{
1515
return (c == ' ' || c == '\n' || c == '\t' || c == '\v' || \
1616
c == '\f' || c == '\r');

‎srcs/ft_itoa_base.c

+8-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/* ::: :::::::: */
44
/* ft_itoa_base.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: cphillip <cphillip@student.hive.fi> +#+ +:+ +#+ */
6+
/* By: csphilli <csphilli@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2020/03/03 11:40:26 by cphillip #+# #+# */
9-
/* Updated: 2020/12/16 13:13:29 by cphillip ### ########.fr */
9+
/* Updated: 2021/04/24 22:47:07 by csphilli ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -18,14 +18,18 @@ char *ft_itoa_base(uintmax_t nbr, int base)
1818
int j;
1919

2020
j = ft_nbr_size_base(nbr, base);
21-
if (!(new = (char*)malloc(sizeof(char) * j + 1)))
21+
new = (char *)malloc(sizeof(char) * j + 1);
22+
if (new == NULL)
2223
return (NULL);
2324
if (nbr < 0)
2425
new[0] = '-';
2526
new[j] = '\0';
2627
while (j--)
2728
{
28-
new[j] = (nbr % base < 10) ? nbr % base + '0' : nbr % base + 'a' - 10;
29+
if (nbr % base < 10)
30+
new[j] = nbr % base + '0';
31+
else
32+
new[j] = nbr % base + 'a' - 10;
2933
nbr /= base;
3034
}
3135
return (new);

‎srcs/ft_itoa_uintmax.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/* ::: :::::::: */
44
/* ft_itoa_uintmax.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: cphillip <cphillip@student.hive.fi> +#+ +:+ +#+ */
6+
/* By: csphilli <csphilli@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2020/02/27 10:35:30 by cphillip #+# #+# */
9-
/* Updated: 2020/12/16 13:13:29 by cphillip ### ########.fr */
9+
/* Updated: 2021/04/24 22:47:55 by csphilli ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -18,7 +18,8 @@ char *ft_itoa_uintmax(uintmax_t n)
1818
int len;
1919

2020
len = ft_intlen_max(n) + 1;
21-
if (!(new = ft_strnew(len + 1)))
21+
new = ft_strnew(len + 1);
22+
if (new == NULL)
2223
return (NULL);
2324
new[len] = '\0';
2425
len--;

‎srcs/ft_lstadd.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/* ::: :::::::: */
44
/* ft_lstadd.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: cphillip <cphillip@student.hive.fi> +#+ +:+ +#+ */
6+
/* By: csphilli <csphilli@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2020/01/07 11:14:25 by cphillip #+# #+# */
9-
/* Updated: 2021/01/22 22:45:58 by cphillip ### ########.fr */
9+
/* Updated: 2021/04/25 08:58:56 by csphilli ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -15,9 +15,9 @@
1515

1616
void unshift_node(t_list *list, void *data)
1717
{
18-
t_node *new;
18+
t_node *new;
1919

20-
new = (t_node*)malloc(sizeof(t_node));
20+
new = (t_node *)malloc(sizeof(t_node));
2121
new->data = data;
2222
if (list->head == NULL)
2323
{
@@ -33,7 +33,7 @@ void append_node(t_list *list, void *data)
3333
{
3434
t_node *new;
3535

36-
new = (t_node*)malloc(sizeof(t_node));
36+
new = (t_node *)malloc(sizeof(t_node));
3737
new->data = data;
3838
new->next = NULL;
3939
if (!list->head)

‎srcs/ft_lstfuncs.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: csphilli <[email protected]> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2021/01/22 22:15:37 by cphillip #+# #+# */
9-
/* Updated: 2021/02/09 09:22:12 by csphilli ### ########.fr */
9+
/* Updated: 2021/04/25 08:59:29 by csphilli ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -21,7 +21,7 @@ void init_list(t_list *list)
2121

2222
void delete_node(t_list *list, t_node *node)
2323
{
24-
t_node *tmp;
24+
t_node *tmp;
2525

2626
if (list->head && list->head == node)
2727
{
@@ -46,7 +46,7 @@ void delete_node(t_list *list, t_node *node)
4646

4747
void *get_node(t_list *list, t_compare compare, void *data)
4848
{
49-
t_node *tmp;
49+
t_node *tmp;
5050

5151
tmp = list->head;
5252
while (tmp)
@@ -60,7 +60,7 @@ void *get_node(t_list *list, t_compare compare, void *data)
6060

6161
void display_list(t_list *list, t_display display)
6262
{
63-
t_node *tmp;
63+
t_node *tmp;
6464

6565
tmp = list->head;
6666
while (tmp)

‎srcs/ft_lword.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
/* ::: :::::::: */
44
/* ft_lword.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: cphillip <cphillip@student.hive.fi> +#+ +:+ +#+ */
6+
/* By: csphilli <csphilli@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2019/10/29 11:55:24 by cphillip #+# #+# */
9-
/* Updated: 2019/11/06 13:15:44 by cphillip ### ########.fr */
9+
/* Updated: 2021/04/25 08:59:41 by csphilli ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

13-
int ft_lword(const char *s, char c)
13+
int ft_lword(const char *s, char c)
1414
{
1515
int count;
1616

‎srcs/ft_memalloc.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/* ::: :::::::: */
44
/* ft_memalloc.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: cphillip <cphillip@student.hive.fi> +#+ +:+ +#+ */
6+
/* By: csphilli <csphilli@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2019/10/24 13:47:26 by cphillip #+# #+# */
9-
/* Updated: 2021/01/02 12:47:46 by cphillip ### ########.fr */
9+
/* Updated: 2021/04/25 09:00:51 by csphilli ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -16,7 +16,8 @@ void *ft_memalloc(size_t size)
1616
{
1717
void *mem;
1818

19-
if (!(mem = malloc(size)))
19+
mem = malloc(size);
20+
if (!mem)
2021
{
2122
write(2, "ERROR: Failed to allocate memory.\n", 34);
2223
exit(0);

0 commit comments

Comments
 (0)