Browse Source

Trac Ticket #531 - loading an entry from the database should use str2entry_f

https://fedorahosted.org/389/ticket/531

Description: Based upon the comments by Rich Megginson (Thanks!!),
changing the newly introduced macro to all upper case.  Plus, it
was pointed out that the meaning of the macro name was opposite.
Fixing these 2 issues, this patch replaces the macro str2entry_
can_use_fast with STR2ENTRY_CANNOT_USE_FAST.
Noriko Hosoi 13 years ago
parent
commit
b3a0ab7860
1 changed files with 3 additions and 3 deletions
  1. 3 3
      ldap/servers/slapd/entry.c

+ 3 - 3
ldap/servers/slapd/entry.c

@@ -1343,7 +1343,7 @@ free_and_return:
  * not handled by str2entry_fast() has been passed in, call the
  * slower but more forgiving str2entry_dupcheck() function.
  */
-#define str2entry_can_use_fast(flags) \
+#define STR2ENTRY_CANNOT_USE_FAST(flags) \
 			(((flags) & SLAPI_STR2ENTRY_NOT_WELL_FORMED_LDIF) || \
 			 ((flags) & ~SLAPI_STRENTRY_FLAGS_HANDLED_BY_STR2ENTRY_FAST))
 
@@ -1363,7 +1363,7 @@ slapi_str2entry( char *s, int flags )
 	 * not handled by str2entry_fast() has been passed in, call the
 	 * slower but more forgiving str2entry_dupcheck() function.
 	 */
-	if (str2entry_can_use_fast(flags))
+	if (STR2ENTRY_CANNOT_USE_FAST(flags))
 	{
 	    e= str2entry_dupcheck( NULL/*dn*/, s, flags, read_stateinfo );
 	}
@@ -1424,7 +1424,7 @@ slapi_str2entry_ext( const char *normdn, char *s, int flags )
 	 * not handled by str2entry_fast() has been passed in, call the
 	 * slower but more forgiving str2entry_dupcheck() function.
 	 */
-	if (str2entry_can_use_fast(flags))
+	if (STR2ENTRY_CANNOT_USE_FAST(flags))
 	{
 	    e = str2entry_dupcheck( normdn, s, 
 	                    flags|SLAPI_STR2ENTRY_DN_NORMALIZED, read_stateinfo );