aboutsummaryrefslogtreecommitdiff
path: root/sys/netsmb
diff options
context:
space:
mode:
authorMateusz Guzik <mjg@FreeBSD.org>2020-09-01 21:19:14 +0000
committerMateusz Guzik <mjg@FreeBSD.org>2020-09-01 21:19:14 +0000
commit662c13053f4bf2d6245ba7e2b66c10d1cd5c1fb9 (patch)
tree5cffe4473640975abc443ef4b8047b34cdb4a039 /sys/netsmb
parent586ee69f09c5060621486b34722a4a806581f93d (diff)
downloadsrc-662c13053f4bf2d6245ba7e2b66c10d1cd5c1fb9.tar.gz
src-662c13053f4bf2d6245ba7e2b66c10d1cd5c1fb9.zip
net: clean up empty lines in .c and .h files
Notes
Notes: svn path=/head/; revision=365071
Diffstat (limited to 'sys/netsmb')
-rw-r--r--sys/netsmb/smb.h2
-rw-r--r--sys/netsmb/smb_conn.c8
-rw-r--r--sys/netsmb/smb_conn.h2
-rw-r--r--sys/netsmb/smb_crypt.c2
-rw-r--r--sys/netsmb/smb_dev.c7
-rw-r--r--sys/netsmb/smb_dev.h1
-rw-r--r--sys/netsmb/smb_iod.c7
-rw-r--r--sys/netsmb/smb_rq.c1
-rw-r--r--sys/netsmb/smb_rq.h1
-rw-r--r--sys/netsmb/smb_smb.c2
-rw-r--r--sys/netsmb/smb_subr.h1
-rw-r--r--sys/netsmb/smb_trantcp.c3
-rw-r--r--sys/netsmb/smb_trantcp.h1
13 files changed, 9 insertions, 29 deletions
diff --git a/sys/netsmb/smb.h b/sys/netsmb/smb.h
index d532b496a8d3..42c14bc5fdb7 100644
--- a/sys/netsmb/smb.h
+++ b/sys/netsmb/smb.h
@@ -31,7 +31,7 @@
/*
* Common definitions and structures for SMB/CIFS protocol
*/
-
+
#ifndef _NETSMB_SMB_H_
#define _NETSMB_SMB_H_
diff --git a/sys/netsmb/smb_conn.c b/sys/netsmb/smb_conn.c
index 52aeb49ae4d4..a1fe0a1983ce 100644
--- a/sys/netsmb/smb_conn.c
+++ b/sys/netsmb/smb_conn.c
@@ -726,7 +726,7 @@ u_short
smb_vc_nextmid(struct smb_vc *vcp)
{
u_short r;
-
+
sx_xlock(&vcp->obj.co_interlock);
r = vcp->vc_mid++;
sx_unlock(&vcp->obj.co_interlock);
@@ -834,7 +834,7 @@ smb_share_get(struct smb_share *ssp, struct smb_cred *scred)
void
smb_share_put(struct smb_share *ssp, struct smb_cred *scred)
{
-
+
smb_co_put(SSTOCP(ssp), scred);
}
@@ -843,7 +843,7 @@ smb_share_lock(struct smb_share *ssp)
{
struct smb_connobj *cp;
int error;
-
+
cp = SSTOCP(ssp);
sx_xlock(&cp->co_interlock);
error = smb_co_lock(cp);
@@ -855,7 +855,7 @@ void
smb_share_unlock(struct smb_share *ssp)
{
struct smb_connobj *cp;
-
+
cp = SSTOCP(ssp);
sx_xlock(&cp->co_interlock);
smb_co_unlock(cp);
diff --git a/sys/netsmb/smb_conn.h b/sys/netsmb/smb_conn.h
index d26303a43db5..1ce8e3b623ac 100644
--- a/sys/netsmb/smb_conn.h
+++ b/sys/netsmb/smb_conn.h
@@ -79,7 +79,6 @@
/*#define SMBV_FAILED 0x0200*/ /* last reconnect attempt has failed */
#define SMBV_UNICODE 0x0400 /* connection is configured to use Unicode */
-
/*
* smb_share flags
*/
@@ -125,7 +124,6 @@ enum smbiod_state {
SMBIOD_ST_DEAD /* connection broken, transport is down */
};
-
/*
* Info structures
*/
diff --git a/sys/netsmb/smb_crypt.c b/sys/netsmb/smb_crypt.c
index 46c841cba3df..82626c5546e6 100644
--- a/sys/netsmb/smb_crypt.c
+++ b/sys/netsmb/smb_crypt.c
@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
static u_char N8[] = {0x4b, 0x47, 0x53, 0x21, 0x40, 0x23, 0x24, 0x25};
-
static void
smb_E(const u_char *key, u_char *data, u_char *dest)
{
@@ -88,7 +87,6 @@ smb_E(const u_char *key, u_char *data, u_char *dest)
free(ksp, M_SMBTEMP);
}
-
int
smb_encrypt(const u_char *apwd, u_char *C8, u_char *RN)
{
diff --git a/sys/netsmb/smb_dev.c b/sys/netsmb/smb_dev.c
index f88d14330c4a..0b577564aff7 100644
--- a/sys/netsmb/smb_dev.c
+++ b/sys/netsmb/smb_dev.c
@@ -69,7 +69,6 @@ MODULE_VERSION(netsmb, NSMB_VERSION);
static int smb_version = NSMB_VERSION;
struct sx smb_lock;
-
SYSCTL_DECL(_net_smb);
SYSCTL_INT(_net_smb, OID_AUTO, version, CTLFLAG_RD, &smb_version, 0, "");
@@ -172,7 +171,6 @@ sdp_trydestroy(struct smb_dev *sdp)
return;
}
-
static int
nsmb_dev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td)
{
@@ -238,7 +236,7 @@ nsmb_dev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thre
case SMBIOC_SETFLAGS: {
struct smbioc_flags *fl = (struct smbioc_flags*)data;
int on;
-
+
if (fl->ioc_level == SMBL_VC) {
if (fl->ioc_mask & SMBV_PERMANENT) {
on = fl->ioc_flags & SMBV_PERMANENT;
@@ -309,7 +307,7 @@ nsmb_dev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thre
struct smbioc_rw *rwrq = (struct smbioc_rw*)data;
struct uio auio;
struct iovec iov;
-
+
if ((ssp = sdp->sd_share) == NULL) {
error = ENOTCONN;
goto out;
@@ -412,4 +410,3 @@ smb_dev2share(int fd, int mode, struct smb_cred *scred,
SMB_UNLOCK();
return error;
}
-
diff --git a/sys/netsmb/smb_dev.h b/sys/netsmb/smb_dev.h
index 6828602781f3..2c927346a96d 100644
--- a/sys/netsmb/smb_dev.h
+++ b/sys/netsmb/smb_dev.h
@@ -195,7 +195,6 @@ int smb_usr_t2request(struct smb_share *ssp, struct smbioc_t2rq *data,
int smb_dev2share(int fd, int mode, struct smb_cred *scred,
struct smb_share **sspp, struct smb_dev **ssdp);
-
#endif /* _KERNEL */
#endif /* _NETSMB_DEV_H_ */
diff --git a/sys/netsmb/smb_iod.c b/sys/netsmb/smb_iod.c
index e93787c3bb1d..bc53d01edad4 100644
--- a/sys/netsmb/smb_iod.c
+++ b/sys/netsmb/smb_iod.c
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/endian.h>
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
#include <netsmb/smb_tran.h>
#include <netsmb/smb_trantcp.h>
-
#define SMBIOD_SLEEP_TIMO 2
#define SMBIOD_PING_TIMO 60 /* seconds */
@@ -59,7 +58,6 @@ __FBSDID("$FreeBSD$");
#define smb_iod_wakeup(iod) wakeup(&(iod)->iod_flags)
-
static MALLOC_DEFINE(M_SMBIOD, "SMBIOD", "SMB network io daemon");
static int smb_iod_next;
@@ -506,7 +504,6 @@ smb_iod_waitrq(struct smb_rq *rqp)
}
smb_iod_removerq(rqp);
return rqp->sr_lerror;
-
}
SMBRQ_SLOCK(rqp);
if (rqp->sr_rpgen == rqp->sr_rplast)
@@ -528,7 +525,6 @@ smb_iod_waitrq(struct smb_rq *rqp)
return error;
}
-
static int
smb_iod_sendall(struct smbiod *iod)
{
@@ -719,4 +715,3 @@ smb_iod_done(void)
{
return 0;
}
-
diff --git a/sys/netsmb/smb_rq.c b/sys/netsmb/smb_rq.c
index 544bfd1194f0..57bf053034ad 100644
--- a/sys/netsmb/smb_rq.c
+++ b/sys/netsmb/smb_rq.c
@@ -366,7 +366,6 @@ smb_rq_reply(struct smb_rq *rqp)
return error ? error : rperror;
}
-
#define ALIGN4(a) (((a) + 3) & ~3)
/*
diff --git a/sys/netsmb/smb_rq.h b/sys/netsmb/smb_rq.h
index 861fa2c722bb..c8f16539a938 100644
--- a/sys/netsmb/smb_rq.h
+++ b/sys/netsmb/smb_rq.h
@@ -56,7 +56,6 @@
#define SMBRQ_SUNLOCK(rqp) smb_sl_unlock(&(rqp)->sr_slock)
#define SMBRQ_SLOCKPTR(rqp) (&(rqp)->sr_slock)
-
enum smbrq_state {
SMBRQ_NOTSENT, /* rq have data to send */
SMBRQ_SENT, /* send procedure completed */
diff --git a/sys/netsmb/smb_smb.c b/sys/netsmb/smb_smb.c
index 6761e9675b62..efd1fa18ac71 100644
--- a/sys/netsmb/smb_smb.c
+++ b/sys/netsmb/smb_smb.c
@@ -852,7 +852,7 @@ smb_smb_write(struct smb_share *ssp, u_int16_t fid, int *len, int *rresid,
if (*len && SSTOVC(ssp)->vc_sopt.sv_caps & SMB_CAP_LARGE_WRITEX)
return (smb_smb_writex(ssp, fid, len, rresid, uio, scred));
-
+
blksz = SSTOVC(ssp)->vc_txmax - SMB_HDRLEN - 16;
if (blksz > 0xffff)
blksz = 0xffff;
diff --git a/sys/netsmb/smb_subr.h b/sys/netsmb/smb_subr.h
index e32fbc424593..e24c50f7978c 100644
--- a/sys/netsmb/smb_subr.h
+++ b/sys/netsmb/smb_subr.h
@@ -79,7 +79,6 @@ void m_dumpm(struct mbuf *m);
#define smb_sl_lock(mtx) mtx_lock(mtx)
#define smb_sl_unlock(mtx) mtx_unlock(mtx)
-
#define SMB_STRFREE(p) do { if (p) smb_strfree(p); } while(0)
typedef u_int16_t smb_unichar;
diff --git a/sys/netsmb/smb_trantcp.c b/sys/netsmb/smb_trantcp.c
index 8101993277a3..051aade51217 100644
--- a/sys/netsmb/smb_trantcp.c
+++ b/sys/netsmb/smb_trantcp.c
@@ -600,7 +600,6 @@ abort:
return error;
}
-
static int
smb_nbst_recv(struct smb_vc *vcp, struct mbuf **mpp, struct thread *td)
{
@@ -682,7 +681,6 @@ smb_nbst_fatal(struct smb_vc *vcp, int error)
return 0;
}
-
struct smb_tran_desc smb_tran_nbtcp_desc = {
SMBT_NBTCP,
smb_nbst_create, smb_nbst_done,
@@ -692,4 +690,3 @@ struct smb_tran_desc smb_tran_nbtcp_desc = {
smb_nbst_getparam, smb_nbst_setparam,
smb_nbst_fatal
};
-
diff --git a/sys/netsmb/smb_trantcp.h b/sys/netsmb/smb_trantcp.h
index 1fbed212a95f..889a43acaea1 100644
--- a/sys/netsmb/smb_trantcp.h
+++ b/sys/netsmb/smb_trantcp.h
@@ -47,7 +47,6 @@ enum nbstate {
NBST_REFUSED
};
-
/*
* socket specific data
*/