[SCM] Samba Shared Repository - branch v3-5-test updated

[Volker Lendecke]

The branch, v3-5-test has been updated
       via  8cb66e2... s3: Tune if-conditions in a very hot codepath
      from  ca54734... s3: Remove a pointless memset

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 8cb66e2d2310567ff97e3198c37eb4c606ddc45c
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 15 22:22:38 2009 +0100

    s3: Tune if-conditions in a very hot codepath
    
    This looks innocent, but it is visible in a netbench run.  Due to boolean
    short-circuiting we don't have to execute the conditions on the right-hand side
    of the &&. So putting the less likely condition left gains a bit.

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

Summary of changes:
 source3/smbd/reply.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index ae88db7..682f56f 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -67,7 +67,7 @@ static NTSTATUS check_path_syntax_internal(char *path,
 			}
 		}
 
-		if (!posix_path && !stream_started && *s == ':') {
+		if ((*s == ':') && !posix_path && !stream_started) {
 			if (*p_last_component_contains_wcard) {
 				return NT_STATUS_OBJECT_NAME_INVALID;
 			}


-- 
Samba Shared Repository