Skip to content

Commit b9b46a2

Browse files
author
Hikari Shinagawa
committed
fix test error
1 parent 23de635 commit b9b46a2

File tree

3 files changed

+59
-58
lines changed

3 files changed

+59
-58
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
libftTester/
2+
*.o
3+
a.out
4+
*.so

‎Makefile

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# By: hshinaga <[email protected]> +#+ +:+ +#+ #
77
# +#+#+#+#+#+ +#+ #
88
# Created: 2024/11/02 15:37:41 by hshinaga #+# #+# #
9-
# Updated: 2024/11/05 18:05:19 by hshinaga ### ########.fr #
9+
# Updated: 2024/11/05 22:59:03 by hshinaga ### ########.fr #
1010
# #
1111
# **************************************************************************** #
1212

@@ -65,24 +65,22 @@ BONUS_OBJS = $(BONUS_SRCS:.c=.o)
6565
all: $(NAME)
6666

6767
$(NAME): $(OBJS)
68-
ar rcs $(NAME) $(OBJS)
68+
ar rcs $(NAME) $(OBJS)
6969

7070
%.o: %.c libft.h
71-
$(CC) $(CFLAGS) -c $< -o $@
71+
$(CC) $(CFLAGS) -c $< -o $@
7272

7373
clean:
74-
rm -f $(OBJS) $(BONUS_OBJS)
74+
rm -f $(OBJS)
7575

7676
fclean: clean
77-
rm -f $(NAME)
77+
rm -f $(NAME)
7878

7979
re: fclean all
8080

81-
bonus: $(OBJS) $(BONUS_OBJS)
82-
ar rcs $(NAME) $(OBJS) $(BONUS_OBJS)
8381

8482
so:
85-
$(CC) -nostartfiles -fPIC $(CFLAGS) $(SRCS)
86-
gcc -nostartfiles -shared -o libft.so $(OBJS)
83+
$(CC) -nostartfiles -fPIC $(CFLAGS) $(SRCS)
84+
gcc -nostartfiles -shared -o libft.so $(OBJS)
8785

8886
.PHONY: all clean fclean re bonus

‎libft.h

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: hshinaga <[email protected]> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2024/10/23 22:29:21 by hshinaga #+# #+# */
9-
/* Updated: 2024/11/05 18:00:50 by hshinaga ### ########.fr */
9+
/* Updated: 2024/11/05 22:56:56 by hshinaga ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -17,60 +17,60 @@
1717
# include <unistd.h>
1818

1919
/* Part 1 - Libc functions */
20-
int ft_isalpha(int c);
21-
int ft_isdigit(int c);
22-
int ft_isalnum(int c);
23-
int ft_isascii(int c);
24-
int ft_isprint(int c);
25-
size_t ft_strlen(const char *s);
26-
void *ft_memset(void *b, int c, size_t len);
27-
void ft_bzero(void *s, size_t n);
28-
void *ft_memcpy(void *dst, const void *src, size_t n);
29-
void *ft_memmove(void *dst, const void *src, size_t len);
30-
size_t ft_strlcpy(char *dst, const char *src, size_t dstsize);
31-
size_t ft_strlcat(char *dst, const char *src, size_t dstsize);
32-
int ft_toupper(int c);
33-
int ft_tolower(int c);
34-
char *ft_strchr(const char *str, int c);
35-
char *ft_strrchr(const char *str, int c);
36-
int ft_strncmp(const char *s1, const char *s2, size_t n);
37-
void *ft_memchr(const void *s, int c, size_t n);
38-
int ft_memcmp(const void *s1, const void *s2, size_t n);
39-
char *ft_strnstr(const char *big, const char *little, size_t len);
40-
int ft_atoi(const char *str);
41-
void *ft_calloc(size_t count, size_t size);
42-
char *ft_strdup(const char *s1);
20+
int ft_isalpha(int c);
21+
int ft_isdigit(int c);
22+
int ft_isalnum(int c);
23+
int ft_isascii(int c);
24+
int ft_isprint(int c);
25+
size_t ft_strlen(const char *s);
26+
void *ft_memset(void *b, int c, size_t len);
27+
void ft_bzero(void *s, size_t n);
28+
void *ft_memcpy(void *dst, const void *src, size_t n);
29+
void *ft_memmove(void *dst, const void *src, size_t len);
30+
size_t ft_strlcpy(char *dst, const char *src, size_t dstsize);
31+
size_t ft_strlcat(char *dst, const char *src, size_t dstsize);
32+
int ft_toupper(int c);
33+
int ft_tolower(int c);
34+
char *ft_strchr(const char *str, int c);
35+
char *ft_strrchr(const char *str, int c);
36+
int ft_strncmp(const char *s1, const char *s2, size_t n);
37+
void *ft_memchr(const void *s, int c, size_t n);
38+
int ft_memcmp(const void *s1, const void *s2, size_t n);
39+
char *ft_strnstr(const char *big, const char *little,
40+
size_t len);
41+
int ft_atoi(const char *str);
42+
void *ft_calloc(size_t count, size_t size);
43+
char *ft_strdup(const char *s1);
4344

4445
/* Part 2 - Additional functions */
45-
char *ft_substr(char const *s, unsigned int start, size_t len);
46-
char *ft_strjoin(char const *s1, char const *s2);
47-
char *ft_strtrim(char const *s1, char const *set);
48-
char **ft_split(char const *s, char c);
49-
char *ft_itoa(int n);
50-
char *ft_strmapi(char const *s, char (*f)(unsigned int, char));
51-
void ft_striteri(char *s, void (*f)(unsigned int, char *));
52-
void ft_putchar_fd(char c, int fd);
53-
void ft_putstr_fd(char *s, int fd);
54-
void ft_putendl_fd(char *s, int fd);
55-
void ft_putnbr_fd(int n, int fd);
46+
char *ft_substr(char const *s, unsigned int start, size_t len);
47+
char *ft_strjoin(char const *s1, char const *s2);
48+
char *ft_strtrim(char const *s1, char const *set);
49+
char **ft_split(char const *s, char c);
50+
char *ft_itoa(int n);
51+
char *ft_strmapi(char const *s, char (*f)(unsigned int, char));
52+
void ft_striteri(char *s, void (*f)(unsigned int, char *));
53+
void ft_putchar_fd(char c, int fd);
54+
void ft_putstr_fd(char *s, int fd);
55+
void ft_putendl_fd(char *s, int fd);
56+
void ft_putnbr_fd(int n, int fd);
5657

5758
/* Bonus Part */
5859
typedef struct s_list
5960
{
60-
void *content;
61-
struct s_list *next;
62-
} t_list;
61+
void *content;
62+
struct s_list *next;
63+
} t_list;
6364

64-
t_list *ft_lstnew(void *content);
65-
void ft_lstadd_front(t_list **lst, t_list *new);
66-
int ft_lstsize(t_list *lst);
67-
t_list *ft_lstlast(t_list *lst);
68-
void ft_lstadd_back(t_list **lst, t_list *new);
69-
void ft_lstdelone(t_list *lst, void (*del)(void *));
70-
void ft_lstclear(t_list **lst, void (*del)(void *));
71-
void ft_lstiter(t_list *lst, void (*f)(void *));
72-
t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *));
65+
t_list *ft_lstnew(void *content);
66+
void ft_lstadd_front(t_list **lst, t_list *new);
67+
int ft_lstsize(t_list *lst);
68+
t_list *ft_lstlast(t_list *lst);
69+
void ft_lstadd_back(t_list **lst, t_list *new);
70+
void ft_lstdelone(t_list *lst, void (*del)(void *));
71+
void ft_lstclear(t_list **lst, void (*del)(void *));
72+
void ft_lstiter(t_list *lst, void (*f)(void *));
73+
t_list *ft_lstmap(t_list *lst, void *(*f)(void *),
74+
void (*del)(void *));
7375

7476
#endif
75-
76-
#endif

0 commit comments

Comments
 (0)