[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  b197de7 libndr: Avoid ommitting display of unset bitmap flags.
      from  5241617 pidl-wireshark: fix the trailling white space in the generated headers

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


- Log -----------------------------------------------------------------
commit b197de754f5359f02f786bcd5e8a7671fb0bb48b
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 9 17:47:29 2013 +0200

    libndr: Avoid ommitting display of unset bitmap flags.
    
    In 816e68f94fe500b9d68fd29021d432b84d3139b7 the display of unset bits has been
    effectively disabled while only the check for 0 bits was supposed to be avoided
    (because it creates the infite loop).
    
    Guenther
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Wed Oct  9 19:56:39 CEST 2013 on sn-devel-104

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

Summary of changes:
 librpc/ndr/ndr_basic.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c
index ae5af7a..a6cf607 100644
--- a/librpc/ndr/ndr_basic.c
+++ b/librpc/ndr/ndr_basic.c
@@ -1017,13 +1017,13 @@ _PUBLIC_ void ndr_print_enum(struct ndr_print *ndr, const char *name, const char
 
 _PUBLIC_ void ndr_print_bitmap_flag(struct ndr_print *ndr, size_t size, const char *flag_name, uint32_t flag, uint32_t value)
 {
-	/* this is an attempt to support multi-bit bitmap masks */
-	value &= flag;
-
-	if (value == 0) {
+	if (flag == 0) {
 		return;
 	}
 
+	/* this is an attempt to support multi-bit bitmap masks */
+	value &= flag;
+
 	while (!(flag & 1)) {
 		flag >>= 1;
 		value >>= 1;


-- 
Samba Shared Repository