[PATCH] s3: Fix max indentation and max column
Swen Schillig
swen at vnet.ibm.com
Tue Mar 6 10:43:13 UTC 2018
Please review.... and push :-)
Thanks in advance.
Cheers Swen.
-------------- next part --------------
From 4c21d655669233d67b3887f4450da803997f6925 Mon Sep 17 00:00:00 2001
From: Swen Schillig <swen at vnet.ibm.com>
Date: Mon, 5 Mar 2018 12:55:23 +0100
Subject: [PATCH] s3: Fix max indentation and max column
Minor cleanup reducing the max indentation level and max column length.
Signed-off-by: Swen Schillig <swen at vnet.ibm.com>
---
source3/smbd/dir.c | 43 +++++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 20 deletions(-)
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 6621b4ee387..95fe5777aad 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -159,29 +159,32 @@ static struct dptr_struct *dptr_get(struct smbd_server_connection *sconn,
int key, bool forclose)
{
struct dptr_struct *dptr;
+ const int dirhandles_open = sconn->searches.dirhandles_open;
- for(dptr = sconn->searches.dirptrs; dptr; dptr = dptr->next) {
- if(dptr->dnum == key) {
- if (!forclose && !dptr->dir_hnd) {
- if (sconn->searches.dirhandles_open >= MAX_OPEN_DIRECTORIES)
- dptr_idleoldest(sconn);
- DEBUG(4,("dptr_get: Reopening dptr key %d\n",key));
-
- if (!(dptr->dir_hnd = OpenDir(NULL,
- dptr->conn,
- dptr->smb_dname,
- dptr->wcard,
- dptr->attr))) {
- DEBUG(4,("dptr_get: Failed to "
- "open %s (%s)\n",
- dptr->smb_dname->base_name,
- strerror(errno)));
- return NULL;
- }
+ for (dptr = sconn->searches.dirptrs; dptr; dptr = dptr->next) {
+ if(dptr->dnum != key) {
+ continue;
+ }
+
+ if (!forclose && !dptr->dir_hnd) {
+ if (dirhandles_open >= MAX_OPEN_DIRECTORIES)
+ dptr_idleoldest(sconn);
+
+ DEBUG(4,("dptr_get: Reopening dptr key %d\n",key));
+
+ dptr->dir_hnd = OpenDir(NULL, dptr->conn,
+ dptr->smb_dname,
+ dptr->wcard, dptr->attr);
+
+ if (dptr->dir_hnd == NULL) {
+ DEBUG(4,("dptr_get: Failed to open %s (%s)\n",
+ dptr->smb_dname->base_name,
+ strerror(errno)));
+ return NULL;
}
- DLIST_PROMOTE(sconn->searches.dirptrs,dptr);
- return dptr;
}
+ DLIST_PROMOTE(sconn->searches.dirptrs, dptr);
+ return dptr;
}
return(NULL);
}
--
2.14.3
More information about the samba-technical
mailing list