Skip to content

Commit

Permalink
convert is_invalid_argument to check_args
Browse files Browse the repository at this point in the history
  • Loading branch information
rask24 committed Jan 15, 2024
1 parent 0627033 commit ae0a2d3
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ BUILD_DIR = ./build
INC_DIR = ./include
LIBFT_DIR = ./libft
SRC = $(SRC_DIR)/main.c \
$(SRC_DIR)/is_invalid_argument.c \
$(SRC_DIR)/check_args.c \
$(SRC_DIR)/generate_stack.c \
$(SRC_DIR)/nano_sort.c \
$(SRC_DIR)/utils/exit_with_error.c
Expand Down
4 changes: 2 additions & 2 deletions include/push_swap.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* By: reasuke <[email protected]> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/10 12:37:54 by reasuke #+# #+# */
/* Updated: 2024/01/12 16:02:39 by reasuke ### ########.fr */
/* Updated: 2024/01/15 13:07:40 by reasuke ### ########.fr */
/* */
/* ************************************************************************** */

Expand All @@ -23,7 +23,7 @@

# include "../libft/libft.h"

bool is_invalid_argument(int argc, char **argv);
void check_args(int argc, char **argv);

t_list *generate_stack(int argc, char **argv);

Expand Down
11 changes: 6 additions & 5 deletions src/is_invalid_argument.c → src/check_args.c
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* is_invalid_argument.c :+: :+: :+: */
/* check_args.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: reasuke <[email protected]> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/11 14:44:55 by reasuke #+# #+# */
/* Updated: 2024/01/11 18:16:19 by reasuke ### ########.fr */
/* Updated: 2024/01/15 13:07:33 by reasuke ### ########.fr */
/* */
/* ************************************************************************** */

Expand Down Expand Up @@ -64,9 +64,10 @@ static bool _has_duplicate(int argc, char **argv)
return (false);
}

bool is_invalid_argument(int argc, char **argv)
void check_args(int argc, char **argv)
{
return (_has_not_digit(argc, argv)
if (_has_not_digit(argc, argv)
|| _has_overflow(argc, argv)
|| _has_duplicate(argc, argv));
|| _has_duplicate(argc, argv))
exit_with_error();
}
7 changes: 2 additions & 5 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* By: reasuke <[email protected]> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/10 12:37:36 by reasuke #+# #+# */
/* Updated: 2024/01/15 12:04:04 by reasuke ### ########.fr */
/* Updated: 2024/01/15 13:04:27 by reasuke ### ########.fr */
/* */
/* ************************************************************************** */

Expand Down Expand Up @@ -35,10 +35,7 @@ int main(int argc, char **argv)
{
t_list *stack_a;

if (argc < 2)
return (0);
if (is_invalid_argument(argc, argv))
exit_with_error();
check_args(argc, argv);
stack_a = generate_stack(argc, argv);
if (argc < 5)
nano_sort(stack_a, argc);
Expand Down

0 comments on commit ae0a2d3

Please sign in to comment.