From a6702462b35070efe6b081ae2a5502623645a7a1 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Tue, 31 May 2016 16:17:41 +0200 Subject: [PATCH] Fix warning in ncurses compilation. "lines" is a macro defined in term.h, hence a local var named lines causes a clash. --- hydra.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hydra.c b/hydra.c index 22c5c4b..fb9aacf 100644 --- a/hydra.c +++ b/hydra.c @@ -10,6 +10,11 @@ #include "hydra.h" #include "bfg.h" +#ifdef LIBNCURSES +#include +#include +#endif + extern void service_asterisk(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port); extern void service_telnet(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port); extern void service_ftp(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port); @@ -1000,7 +1005,7 @@ void kill_children(int signo) { } unsigned long int countlines(FILE * fd, int colonmode) { - size_t lines = 0; + size_t clines = 0; char *buf = malloc(MAXLINESIZE); int only_one_empty_line = 0; @@ -1024,10 +1029,10 @@ unsigned long int countlines(FILE * fd, int colonmode) { if (buf[0] == '\r' || buf[0] == '\n') { if (only_one_empty_line == 0) { only_one_empty_line = 1; - lines++; + clines++; } } else { - lines++; + clines++; } } } @@ -1038,7 +1043,7 @@ unsigned long int countlines(FILE * fd, int colonmode) { rewind(fp); #endif free(buf); - return lines; + return clines; } void fill_mem(char *ptr, FILE * fd, int colonmode) {