Fixed some lint errors from cppcheck
This commit is contained in:
parent
8261016c7e
commit
07edf66b72
@ -950,7 +950,7 @@ int yydebug;
|
|||||||
`-----------------------------------------------*/
|
`-----------------------------------------------*/
|
||||||
|
|
||||||
static void
|
static void
|
||||||
yydestruct (const char *yymsg,
|
yydestruct (char *yymsg,
|
||||||
yysymbol_kind_t yykind, YYSTYPE *yyvaluep)
|
yysymbol_kind_t yykind, YYSTYPE *yyvaluep)
|
||||||
{
|
{
|
||||||
YY_USE (yyvaluep);
|
YY_USE (yyvaluep);
|
||||||
@ -1059,6 +1059,7 @@ yysetstate:
|
|||||||
/* Give user a chance to reallocate the stack. Use copies of
|
/* Give user a chance to reallocate the stack. Use copies of
|
||||||
these so that the &'s don't force the real ones into
|
these so that the &'s don't force the real ones into
|
||||||
memory. */
|
memory. */
|
||||||
|
YYSTYPE *yyls1 = yyls;
|
||||||
yy_state_t *yyss1 = yyss;
|
yy_state_t *yyss1 = yyss;
|
||||||
YYSTYPE *yyvs1 = yyvs;
|
YYSTYPE *yyvs1 = yyvs;
|
||||||
|
|
||||||
@ -1069,7 +1070,9 @@ yysetstate:
|
|||||||
yyoverflow (YY_("memory exhausted"),
|
yyoverflow (YY_("memory exhausted"),
|
||||||
&yyss1, yysize * YYSIZEOF (*yyssp),
|
&yyss1, yysize * YYSIZEOF (*yyssp),
|
||||||
&yyvs1, yysize * YYSIZEOF (*yyvsp),
|
&yyvs1, yysize * YYSIZEOF (*yyvsp),
|
||||||
|
&yyls1, yysize * YYSIZEOF (*yylsp),
|
||||||
&yystacksize);
|
&yystacksize);
|
||||||
|
yyls = yyls1;
|
||||||
yyss = yyss1;
|
yyss = yyss1;
|
||||||
yyvs = yyvs1;
|
yyvs = yyvs1;
|
||||||
}
|
}
|
||||||
|
@ -360,7 +360,8 @@ static int expr_check_mailer(const char *str)
|
|||||||
|
|
||||||
static int expr_check_addr(const char *str)
|
static int expr_check_addr(const char *str)
|
||||||
{
|
{
|
||||||
s_faddr addr;
|
s_faddr addr = { 0, 0, 0, 0, 0, '\0' };
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
char abuf1[BF_MAXADDRSTR+1];
|
char abuf1[BF_MAXADDRSTR+1];
|
||||||
char abuf2[BF_MAXADDRSTR+1];
|
char abuf2[BF_MAXADDRSTR+1];
|
||||||
@ -368,6 +369,7 @@ static int expr_check_addr(const char *str)
|
|||||||
DEB((D_EVENT, "[yacc] addr: \"%s\" (session with \"%s\")",
|
DEB((D_EVENT, "[yacc] addr: \"%s\" (session with \"%s\")",
|
||||||
ftn_addrstr(abuf1, addr),
|
ftn_addrstr(abuf1, addr),
|
||||||
ftn_addrstr(abuf2, state.node.addr)));
|
ftn_addrstr(abuf2, state.node.addr)));
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if( !state.valid )
|
if( !state.valid )
|
||||||
|
@ -172,7 +172,7 @@ int log_reopen(const char *logname, const char *ext, const char *tty)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int log(const char *s, ...)
|
void log(const char *s, ...)
|
||||||
|
|
||||||
{
|
{
|
||||||
char timestr[40];
|
char timestr[40];
|
||||||
@ -212,10 +212,10 @@ int log(const char *s, ...)
|
|||||||
|
|
||||||
va_end(args);
|
va_end(args);
|
||||||
|
|
||||||
return 0;
|
//return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int logerr(const char *s, ...)
|
void logerr(const char *s, ...)
|
||||||
{
|
{
|
||||||
char timestr[40];
|
char timestr[40];
|
||||||
va_list args;
|
va_list args;
|
||||||
@ -281,7 +281,7 @@ int logerr(const char *s, ...)
|
|||||||
|
|
||||||
va_end(args);
|
va_end(args);
|
||||||
|
|
||||||
return 0;
|
//return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* USE_SYSLOG */
|
#endif /* USE_SYSLOG */
|
||||||
@ -308,7 +308,7 @@ int log_open(const char *logname, const char *ext, const char *tty)
|
|||||||
p = xstrcat(p, BF_VERSION);
|
p = xstrcat(p, BF_VERSION);
|
||||||
int fac = conf_number(cf_syslog_facility);
|
int fac = conf_number(cf_syslog_facility);
|
||||||
if( tty && *tty )
|
if( tty && *tty )
|
||||||
strncpy(p, tty, sizeof(p));
|
strncpy(p, tty, strlen(p));
|
||||||
openlog(p, LOG_PID, fac);
|
openlog(p, LOG_PID, fac);
|
||||||
slog_active = TRUE;
|
slog_active = TRUE;
|
||||||
return 0;
|
return 0;
|
||||||
@ -330,7 +330,7 @@ int log_close(void)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int log(const char *s, ...)
|
void log(const char *s, ...)
|
||||||
|
|
||||||
{
|
{
|
||||||
char timestr[40];
|
char timestr[40];
|
||||||
@ -357,10 +357,10 @@ int log(const char *s, ...)
|
|||||||
|
|
||||||
va_end(args);
|
va_end(args);
|
||||||
|
|
||||||
return 0;
|
//return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int logerr(const char *s, ...)
|
void logerr(const char *s, ...)
|
||||||
|
|
||||||
{
|
{
|
||||||
char timestr[40];
|
char timestr[40];
|
||||||
@ -379,7 +379,7 @@ int logerr(const char *s, ...)
|
|||||||
|
|
||||||
va_end(args);
|
va_end(args);
|
||||||
|
|
||||||
return 0;
|
// return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* USE_SYSLOG */
|
#endif /* USE_SYSLOG */
|
||||||
@ -530,7 +530,7 @@ int debug_close(void)
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
int debug(unsigned long what, const char *str, ...)
|
void debug(unsigned long what, const char *str, ...)
|
||||||
{
|
{
|
||||||
char buf[40];
|
char buf[40];
|
||||||
va_list args;
|
va_list args;
|
||||||
@ -554,7 +554,7 @@ int debug(unsigned long what, const char *str, ...)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
//return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* DEBUG */
|
#endif /* DEBUG */
|
||||||
|
@ -152,6 +152,7 @@ int exec_redirect_descriptor(int desc, const char *fname, int flags)
|
|||||||
{
|
{
|
||||||
log("exec error: cannot open \"%s\" <--> %d (got %d)",
|
log("exec error: cannot open \"%s\" <--> %d (got %d)",
|
||||||
fname, desc, fd);
|
fname, desc, fd);
|
||||||
|
close(fd);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -329,7 +330,8 @@ int xsystem(const char *command, const char *p_input, const char *p_output)
|
|||||||
{
|
{
|
||||||
pid_t pid;
|
pid_t pid;
|
||||||
int status;
|
int status;
|
||||||
|
int fd;
|
||||||
|
|
||||||
ASSERT(command != NULL);
|
ASSERT(command != NULL);
|
||||||
|
|
||||||
DEB((D_INFO, "xsystem: command \"%s\", input \"%s\", output \"%s\"",
|
DEB((D_INFO, "xsystem: command \"%s\", input \"%s\", output \"%s\"",
|
||||||
@ -342,27 +344,33 @@ int xsystem(const char *command, const char *p_input, const char *p_output)
|
|||||||
if( p_input )
|
if( p_input )
|
||||||
{
|
{
|
||||||
close(0);
|
close(0);
|
||||||
if( open(p_input, O_RDONLY) != 0 )
|
fd = open(p_input, O_RDONLY);
|
||||||
|
if( fd != 0 )
|
||||||
{
|
{
|
||||||
logerr("can't open stdin \"%s\"", p_input);
|
logerr("can't open stdin \"%s\"", p_input);
|
||||||
|
close(fd);
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if( p_output )
|
if( p_output )
|
||||||
{
|
{
|
||||||
close(1);
|
close(1);
|
||||||
if( open(p_output, O_WRONLY|O_APPEND|O_CREAT, 0600) != 1 )
|
fd = open(p_output, O_WRONLY|O_APPEND|O_CREAT, 0600);
|
||||||
|
if( fd != 1 )
|
||||||
{
|
{
|
||||||
logerr("can't open stdout \"%s\"", p_output);
|
logerr("can't open stdout \"%s\"", p_output);
|
||||||
|
close(fd);
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if( p_output )
|
if( p_output )
|
||||||
{
|
{
|
||||||
close(2);
|
close(2);
|
||||||
if( open(p_output, O_WRONLY|O_APPEND|O_CREAT, 0600) != 2 )
|
fd = open(p_output, O_WRONLY|O_APPEND|O_CREAT, 0600);
|
||||||
|
if( fd != 2 )
|
||||||
{
|
{
|
||||||
logerr("can't open stderr \"%s\"", p_output);
|
logerr("can't open stderr \"%s\"", p_output);
|
||||||
|
close(fd);
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -65,8 +65,8 @@ void log_setident(const char *ident);
|
|||||||
int log_open(const char *logname, const char *ext, const char *tty);
|
int log_open(const char *logname, const char *ext, const char *tty);
|
||||||
int log_close(void);
|
int log_close(void);
|
||||||
int log_reopen(const char *logname, const char *ext, const char *tty);
|
int log_reopen(const char *logname, const char *ext, const char *tty);
|
||||||
int log(const char *s, ...);
|
void log(const char *s, ...);
|
||||||
int logerr(const char *s, ...);
|
void logerr(const char *s, ...);
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
//void debug_setlevel(long newlevel, bool logit);
|
//void debug_setlevel(long newlevel, bool logit);
|
||||||
@ -75,7 +75,7 @@ bool debug_isopened(void);
|
|||||||
//int debug_parsestring(char *str, unsigned long *deblevel);
|
//int debug_parsestring(char *str, unsigned long *deblevel);
|
||||||
int debug_open();
|
int debug_open();
|
||||||
int debug_close();
|
int debug_close();
|
||||||
int debug(unsigned long what, const char *str, ...);
|
void debug(unsigned long what, const char *str, ...);
|
||||||
void debug_configure();
|
void debug_configure();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user