Merge pull request #27 from fperrad/20160325_lint

more linting
This commit is contained in:
Matt Johnston 2016-11-18 23:56:22 +08:00 committed by GitHub
commit 9f674382d5
3 changed files with 3 additions and 4 deletions

View File

@ -234,7 +234,7 @@ static int newtcpforwarded(struct Channel * channel) {
char *origaddr = NULL; char *origaddr = NULL;
unsigned int origport; unsigned int origport;
m_list_elem * iter = NULL; m_list_elem * iter = NULL;
struct TCPFwdEntry *fwd; struct TCPFwdEntry *fwd = NULL;
char portstring[NI_MAXSERV]; char portstring[NI_MAXSERV];
int err = SSH_OPEN_ADMINISTRATIVELY_PROHIBITED; int err = SSH_OPEN_ADMINISTRATIVELY_PROHIBITED;
@ -265,7 +265,7 @@ static int newtcpforwarded(struct Channel * channel) {
} }
if (iter == NULL) { if (iter == NULL || fwd == NULL) {
/* We didn't request forwarding on that port */ /* We didn't request forwarding on that port */
cleantext(origaddr); cleantext(origaddr);
dropbear_log(LOG_INFO, "Server sent unrequested forward from \"%s:%d\"", dropbear_log(LOG_INFO, "Server sent unrequested forward from \"%s:%d\"",

View File

@ -32,7 +32,6 @@
#include "circbuffer.h" #include "circbuffer.h"
#include "dbutil.h" #include "dbutil.h"
#include "channel.h" #include "channel.h"
#include "ssh.h"
#include "listener.h" #include "listener.h"
#include "runopts.h" #include "runopts.h"
#include "netio.h" #include "netio.h"

View File

@ -634,7 +634,7 @@ static void make_connection_string(struct ChanSess *chansess) {
static int sessioncommand(struct Channel *channel, struct ChanSess *chansess, static int sessioncommand(struct Channel *channel, struct ChanSess *chansess,
int iscmd, int issubsys) { int iscmd, int issubsys) {
unsigned int cmdlen; unsigned int cmdlen = 0;
int ret; int ret;
TRACE(("enter sessioncommand")) TRACE(("enter sessioncommand"))