github/thc-hydra
1
0
Fork 0
mirror of https://github.com/vanhauser-thc/thc-hydra.git synced 2025-08-21 13:53:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix warning in ncurses compilation.

Browse source 
"lines" is a macro defined in term.h, hence a local var named lines causes a clash.
This commit is contained in:
Dario Lombardo 2016-05-31 16:17:41 +02:00
commit a6702462b3
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
hydra.c
View file

@ -10,6 +10,11 @@
#include "hydra.h" #include "hydra.h"
#include "bfg.h" #include "bfg.h"
#ifdef LIBNCURSES
#include <curses.h>
#include <term.h>
#endif
extern void service_asterisk(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port); 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_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); 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) { unsigned long int countlines(FILE * fd, int colonmode) {
size_t lines = 0; size_t clines = 0;
char *buf = malloc(MAXLINESIZE); char *buf = malloc(MAXLINESIZE);
int only_one_empty_line = 0; 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 (buf[0] == '\r' || buf[0] == '\n') {
if (only_one_empty_line == 0) { if (only_one_empty_line == 0) {
only_one_empty_line = 1; only_one_empty_line = 1;
lines++; clines++;
} }
} else { } else {
lines++; clines++;
} }
} }
} }
@ -1038,7 +1043,7 @@ unsigned long int countlines(FILE * fd, int colonmode) {
rewind(fp); rewind(fp);
#endif #endif
free(buf); free(buf);
return lines; return clines;
} }
void fill_mem(char *ptr, FILE * fd, int colonmode) { void fill_mem(char *ptr, FILE * fd, int colonmode) {