ITS#2846 - make veryclean

[openldap] / servers / slapd / schema_init.c

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index a3cd70f295b0159d874af52bee4be9eb0581468a..8369a43204a121943b7c366f538d7e1168b5e2fe 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -1,8 +1,17 @@
 /* schema_init.c - init builtin schema */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -1835,11 +1844,11 @@ UUIDNormalize(
                        return LDAP_INVALID_SYNTAX;
                }
 
-               if( j % 2 ) {
-                       octet = nibble << 4;
-               } else {
+               if( j & 1 ) {
                        octet |= nibble;
                        normalized->bv_val[j>>1] = octet;
+               } else {
+                       octet = nibble << 4;
                }
                j++;
        }