code organization changes

LeeSinLiang · Jun 27, 2023 · 18e7d0d · 18e7d0d
1 parent 06b5a57
commit 18e7d0d
Show file tree

Hide file tree

Showing 47 changed files with 31 additions and 10 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -13,5 +13,5 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: make
-      run: make
+    - name: make all
+      run: make all
diff --git a/Makefile b/Makefile
@@ -1,3 +1,4 @@
+SRCS_DIR = src/
 SRCS	=	ft_atoi.c \
 			ft_bzero.c \
 			ft_calloc.c \
@@ -44,15 +45,18 @@ SRCS_B = 	ft_lstadd_back.c \
 			ft_lstsize.c
 
 
-OBJS	= ${SRCS:.c=.o}
-OBJS_B	= ${SRCS_B:.c=.o}
-INCS	= includes
+CFILES = $(addprefix $(SRCS_DIR), $(SRCS))
+CFILES_B = $(addprefix $(SRCS_DIR), $(SRCS_B))
+
+OBJS	= ${CFILES:.c=.o}
+OBJS_B	= ${CFILES_B:.c=.o}
+INCS	= ./inc
 NAME	= libft.a
 LIBC	= ar rcs
 LIBR	= ranlib
 CC		= gcc
 RM		= rm -f
-CFLAGS	= -Wall -Wextra -Werror
+CFLAGS	= -std=c11 -Wall -Wextra -Werror -I$(INCS)
 
 
 all: ${NAME}

diff --git a/libft.h → inc/libft.h b/libft.h → inc/libft.h
@@ -17,6 +17,8 @@
 # include <string.h>
 # include <unistd.h>
 # include <stdbool.h>
+# include <limits.h>
+# include <stdint.h>
 
 typedef struct s_list
 {

diff --git a/main.c b/main.c
@@ -0,0 +1,19 @@
+char	**ft_split(char const *s, char c);
+
+#include <stdio.h>
+int		main(int argc, char **argv)
+{
+	int		index;
+	char	**split;
+
+	split = ft_split(argv[1], argv[2][0]);
+	index = 0;
+	printf("tab start\n");
+	while (split[index])
+	{
+		printf("tab[%d]: $%s$\n", index, split[index]);
+		fflush(stdout);
+		index++;
+	}
+	printf("tab end\n");
+}
diff --git a/ft_atoi.c → src/ft_atoi.c b/ft_atoi.c → src/ft_atoi.c
diff --git a/ft_bzero.c → src/ft_bzero.c b/ft_bzero.c → src/ft_bzero.c
diff --git a/ft_calloc.c → src/ft_calloc.c b/ft_calloc.c → src/ft_calloc.c
@@ -17,9 +17,7 @@
 void	*ft_calloc(size_t count, size_t size)
 {
 	void		*ptr;
-	size_t		i;
 
-	i = 0;
 	if (count == SIZE_MAX || size == SIZE_MAX)
 		return (NULL);
 	ptr = malloc(count * size);

diff --git a/ft_isalnum.c → src/ft_isalnum.c b/ft_isalnum.c → src/ft_isalnum.c
diff --git a/ft_isalpha.c → src/ft_isalpha.c b/ft_isalpha.c → src/ft_isalpha.c
diff --git a/ft_isascii.c → src/ft_isascii.c b/ft_isascii.c → src/ft_isascii.c
diff --git a/ft_isdigit.c → src/ft_isdigit.c b/ft_isdigit.c → src/ft_isdigit.c
diff --git a/ft_isprint.c → src/ft_isprint.c b/ft_isprint.c → src/ft_isprint.c
diff --git a/ft_itoa.c → src/ft_itoa.c b/ft_itoa.c → src/ft_itoa.c
diff --git a/ft_lstadd_back.c → src/ft_lstadd_back.c b/ft_lstadd_back.c → src/ft_lstadd_back.c
diff --git a/ft_lstadd_front.c → src/ft_lstadd_front.c b/ft_lstadd_front.c → src/ft_lstadd_front.c
diff --git a/ft_lstclear.c → src/ft_lstclear.c b/ft_lstclear.c → src/ft_lstclear.c
diff --git a/ft_lstdelone.c → src/ft_lstdelone.c b/ft_lstdelone.c → src/ft_lstdelone.c
diff --git a/ft_lstiter.c → src/ft_lstiter.c b/ft_lstiter.c → src/ft_lstiter.c
diff --git a/ft_lstlast.c → src/ft_lstlast.c b/ft_lstlast.c → src/ft_lstlast.c
diff --git a/ft_lstmap.c → src/ft_lstmap.c b/ft_lstmap.c → src/ft_lstmap.c
diff --git a/ft_lstnew.c → src/ft_lstnew.c b/ft_lstnew.c → src/ft_lstnew.c
diff --git a/ft_lstsize.c → src/ft_lstsize.c b/ft_lstsize.c → src/ft_lstsize.c
diff --git a/ft_memchr.c → src/ft_memchr.c b/ft_memchr.c → src/ft_memchr.c
diff --git a/ft_memcmp.c → src/ft_memcmp.c b/ft_memcmp.c → src/ft_memcmp.c
diff --git a/ft_memcpy.c → src/ft_memcpy.c b/ft_memcpy.c → src/ft_memcpy.c
diff --git a/ft_memmove.c → src/ft_memmove.c b/ft_memmove.c → src/ft_memmove.c
diff --git a/ft_memset.c → src/ft_memset.c b/ft_memset.c → src/ft_memset.c
diff --git a/ft_putchar_fd.c → src/ft_putchar_fd.c b/ft_putchar_fd.c → src/ft_putchar_fd.c
diff --git a/ft_putendl_fd.c → src/ft_putendl_fd.c b/ft_putendl_fd.c → src/ft_putendl_fd.c
diff --git a/ft_putnbr_fd.c → src/ft_putnbr_fd.c b/ft_putnbr_fd.c → src/ft_putnbr_fd.c
diff --git a/ft_putstr_fd.c → src/ft_putstr_fd.c b/ft_putstr_fd.c → src/ft_putstr_fd.c
diff --git a/ft_split.c → src/ft_split.c b/ft_split.c → src/ft_split.c
@@ -21,10 +21,8 @@ static bool	check_seperator(char c_str, char c)
 
 static int	count_strings(char *str, char c)
 {
-	int	i;
 	int	count;
 
-	i = 0;
 	count = 0;
 	while (*str)
 	{

diff --git a/ft_strchr.c → src/ft_strchr.c b/ft_strchr.c → src/ft_strchr.c
diff --git a/ft_strdup.c → src/ft_strdup.c b/ft_strdup.c → src/ft_strdup.c
diff --git a/ft_striteri.c → src/ft_striteri.c b/ft_striteri.c → src/ft_striteri.c
diff --git a/ft_strjoin.c → src/ft_strjoin.c b/ft_strjoin.c → src/ft_strjoin.c
diff --git a/ft_strlcat.c → src/ft_strlcat.c b/ft_strlcat.c → src/ft_strlcat.c
diff --git a/ft_strlcpy.c → src/ft_strlcpy.c b/ft_strlcpy.c → src/ft_strlcpy.c
diff --git a/ft_strlen.c → src/ft_strlen.c b/ft_strlen.c → src/ft_strlen.c
diff --git a/ft_strmapi.c → src/ft_strmapi.c b/ft_strmapi.c → src/ft_strmapi.c
diff --git a/ft_strncmp.c → src/ft_strncmp.c b/ft_strncmp.c → src/ft_strncmp.c
diff --git a/ft_strnstr.c → src/ft_strnstr.c b/ft_strnstr.c → src/ft_strnstr.c
diff --git a/ft_strrchr.c → src/ft_strrchr.c b/ft_strrchr.c → src/ft_strrchr.c
diff --git a/ft_strtrim.c → src/ft_strtrim.c b/ft_strtrim.c → src/ft_strtrim.c
diff --git a/ft_substr.c → src/ft_substr.c b/ft_substr.c → src/ft_substr.c
diff --git a/ft_tolower.c → src/ft_tolower.c b/ft_tolower.c → src/ft_tolower.c
diff --git a/ft_toupper.c → src/ft_toupper.c b/ft_toupper.c → src/ft_toupper.c