From 197c1d7381e6eb455210e2a785525c2b45b0e32a Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Wed, 8 Sep 2010 15:48:21 -0700 Subject: Bug 630094 - (cov#15456) Remove NULL check for srdn in import 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 inst is non-NULL, and the if condition guarantees that either inst or srdn are NULL. We can just use the string "srdn" in our log message if inst is non-NULL. --- ldap/servers/slapd/back-ldbm/import-threads.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldap/servers/slapd/back-ldbm/import-threads.c b/ldap/servers/slapd/back-ldbm/import-threads.c index 12018dbf..7bdf32f7 100644 --- a/ldap/servers/slapd/back-ldbm/import-threads.c +++ b/ldap/servers/slapd/back-ldbm/import-threads.c @@ -3279,7 +3279,7 @@ import_get_and_add_parent_rdns(ImportWorkerInfo *info, if (NULL == inst || NULL == srdn) { slapi_log_error(SLAPI_LOG_FATAL, "ldif2dbm", "import_get_and_add_parent_rdns: Empty %s\n", - NULL==inst?"inst":NULL==srdn?"srdn":"unknown"); + NULL==inst?"inst":"srdn"); return rc; } li = inst->inst_li; -- cgit