42/42_INT_03_ft_printf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change 2 -Wextra errors

Browse Source
This commit is contained in:
hugogogo
2021-05-19 18:03:39 +02:00
parent d23e5add99
commit f0910e0e6b
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Makefile
View File

@@ -2,29 +2,30 @@
# variables names # # variables names #
# - - - - - - - - - # # - - - - - - - - - #
NAME = libftprintf.a NAME = libftprintf.a
CC = gcc CC = gcc
VPATH = srcs VPATH = srcs
IDIR = . IDIR = .
_DEPS = ft_printf.h _DEPS = ft_printf.h
DEPS = $(_DEPS:%.h=$(IDIR)/%.h) DEPS = $(_DEPS:%.h=$(IDIR)/%.h)
LDIR = ./libft/ LDIR = ./libft/
_LIBS = libft.a _LIBS = libft.a
LIBS = $(_LIBS:lib%.a=%) LIBS = $(_LIBS:lib%.a=%)
SRCS = ft_printf.c \ SRCS = ft_printf.c \
ft_next_word.c \ ft_next_word.c \
ft_convert.c \ ft_convert.c \
ft_flag_transform.c \ ft_flag_transform.c \
ft_flag_transform_bonus.c ft_flag_transform_bonus.c
ODIR = ./builds ODIR = ./builds
OBJS = $(SRCS:%.c=$(ODIR)/%.o) OBJS = $(SRCS:%.c=$(ODIR)/%.o)
CFLAGS = -I$(IDIR) -g CFLAGS = -I$(IDIR) -g
LFLAGS = -L$(LDIR) -l$(LIBS) CFLAGS += -Wall -Wextra -Werror
LFLAGS = -L$(LDIR) -l$(LIBS)
# - - - - - - - - - - - # # - - - - - - - - - - - #
# rules to execute # # rules to execute #
@@ -56,7 +57,8 @@ fclean: clean
re: fclean all re: fclean all
gcc: gcc:
$(CC) $(CFLAGS) main.c -L. -lftprintf $(CC) -I$(IDIR) -g main.c -L. -lftprintf
.PHONY: all clean fclean re gcc .PHONY: all clean fclean re gcc

3
srcs/ft_flag_transform.c
View File

@@ -105,7 +105,6 @@ char *width_flags(char *print, char *s, int width, int zero)
{ {
char *tmp; char *tmp;
char *minus; char *minus;
char c;
int len; int len;
len = ft_strlen(print) + zero; len = ft_strlen(print) + zero;
@@ -165,7 +164,7 @@ char *ft_width(char *s, char *print, int *size, char *type)
} }
*size = ft_atoi(tmp); *size = ft_atoi(tmp);
tmp[0] = '\0'; tmp[0] = '\0';
if (*size > ft_strlen(print) + zero) if ((unsigned int)*size > ft_strlen(print) + zero)
print = width_flags(print, s, *size, zero); print = width_flags(print, s, *size, zero);
else else
*size = ft_strlen(print) + zero; *size = ft_strlen(print) + zero;