[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  8195832... s3: file_walk_table -> files_forall
       via  6788150... s3: Fix some nonempty blank lines
      from  c8a9533... s4:registry - "patchfile.c" - consider also the hives in the generated diffs

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8195832c6cde7ebb2de5543be76979a111bd5712
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Mar 22 09:16:57 2010 +0100

    s3: file_walk_table -> files_forall
    
    This is more in line with the rest of the Samba code, like connections_forall
    etc.

commit 678815081da171e10123b1f6768a554adc1bedb4
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Mar 22 09:11:24 2010 +0100

    s3: Fix some nonempty blank lines

-----------------------------------------------------------------------

Summary of changes:
 source3/include/proto.h        |    2 +-
 source3/modules/vfs_aio_fork.c |    2 +-
 source3/smbd/files.c           |   14 +++++++-------
 source3/smbd/server.c          |    1 -
 4 files changed, 9 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9200802..69fd591 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6378,7 +6378,7 @@ void file_close_pid(uint16 smbpid, int vuid);
 void file_init(void);
 void file_close_user(int vuid);
 void file_dump_open_table(void);
-struct files_struct *file_walk_table(
+struct files_struct *files_forall(
 	struct files_struct *(*fn)(struct files_struct *fsp,
 				   void *private_data),
 	void *private_data);
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index c725fa6..ebad4b4 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -479,7 +479,7 @@ static NTSTATUS create_aio_child(struct aio_child_list *children,
 	if (result->pid == 0) {
 		close(fdpair[0]);
 		result->sockfd = fdpair[1];
-		file_walk_table(close_fsp_fd, NULL);
+		files_forall(close_fsp_fd, NULL);
 		aio_child_loop(result->sockfd, result->map);
 	}
 
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 455666f..abd654c 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -2,17 +2,17 @@
    Unix SMB/CIFS implementation.
    Files[] structure handling
    Copyright (C) Andrew Tridgell 1998
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -142,7 +142,7 @@ NTSTATUS file_new(struct smb_request *req, connection_struct *conn,
 void file_close_conn(connection_struct *conn)
 {
 	files_struct *fsp, *next;
-	
+
 	for (fsp=Files;fsp;fsp=next) {
 		next = fsp->next;
 		if (fsp->conn == conn) {
@@ -158,7 +158,7 @@ void file_close_conn(connection_struct *conn)
 void file_close_pid(uint16 smbpid, int vuid)
 {
 	files_struct *fsp, *next;
-	
+
 	for (fsp=Files;fsp;fsp=next) {
 		next = fsp->next;
 		if ((fsp->file_pid == smbpid) && (fsp->vuid == vuid)) {
@@ -196,7 +196,7 @@ open files, %d are available.\n", request_max_open_files, real_max_open_files));
 	SMB_ASSERT(real_max_open_files > 100);
 
 	file_bmap = bitmap_allocate(real_max_open_files);
-	
+
 	if (!file_bmap) {
 		exit_server("out of memory in file_init");
 	}
@@ -222,7 +222,7 @@ void file_close_user(int vuid)
  * Walk the files table until "fn" returns non-NULL
  */
 
-struct files_struct *file_walk_table(
+struct files_struct *files_forall(
 	struct files_struct *(*fn)(struct files_struct *fsp,
 				   void *private_data),
 	void *private_data)
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index d3fc499..400edcf 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -157,7 +157,6 @@ static void msg_inject_fault(struct messaging_context *msg,
 	int sig;
 
 	if (data->length != sizeof(sig)) {
-		
 		DEBUG(0, ("Process %s sent bogus signal injection request\n",
 			  procid_str_static(&src)));
 		return;


-- 
Samba Shared Repository