From edf42814c56604b083eb3cf244289ae1a6db9fdb Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Thu, 9 Sep 2010 08:13:23 -0700 Subject: Bug 630094 - (cov#15459) Remove NULL check for srdn in ldif2ldbm code In the call to slapi_log_error(), we are guaranteed that srdn is NULL if we are checking it for NULL due to the way the conditions are nested. The only time we check if srdn is NULL is if be is non-NULL, and the if condition guarantees that either be or srdn are NULL. We can just use the string "srdn" in our log message if be is non-NULL. --- ldap/servers/slapd/back-ldbm/ldif2ldbm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ldap') diff --git a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c index f1b50ae3..25cc265c 100644 --- a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c +++ b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c @@ -3052,7 +3052,7 @@ _get_and_add_parent_rdns(backend *be, if (NULL == be || NULL == srdn) { slapi_log_error(SLAPI_LOG_FATAL, "ldif2dbm", "_get_and_add_parent_rdns: Empty %s\n", - NULL==be?"be":NULL==srdn?"srdn":"unknown"); + NULL==be?"be":"srdn"); return rc; } -- cgit