Clean up: current code re-uses the "rc" variable to count LDAP entries. I'm about to remove "rc" in many places.
Take the opportunity to use a better variable name. Signed-off-by: Chuck Lever <[email protected]> --- src/libnsdb/administrator.c | 16 +++++++------- src/libnsdb/fileserver.c | 50 ++++++++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/libnsdb/administrator.c b/src/libnsdb/administrator.c index 7fc5f71..d22e8c0 100644 --- a/src/libnsdb/administrator.c +++ b/src/libnsdb/administrator.c @@ -312,9 +312,9 @@ nsdb_search_fsn_dn_s(LDAP *ld, const char *nce, const char *fsn_uuid, char **dn, unsigned int *ldap_err) { LDAPMessage *response; + int len, rc, entries; FedFsStatus retval; char filter[128]; - int len, rc; /* watch out for buffer overflow */ len = snprintf(filter, sizeof(filter), @@ -344,8 +344,8 @@ nsdb_search_fsn_dn_s(LDAP *ld, const char *nce, const char *fsn_uuid, return FEDFS_ERR_NSDB_FAULT; } - rc = ldap_count_messages(ld, response); - switch (rc) { + entries = ldap_count_messages(ld, response); + switch (entries) { case -1: xlog(D_GENERAL, "%s: Empty LDAP response", __func__); retval = FEDFS_ERR_NSDB_RESPONSE; @@ -356,7 +356,7 @@ nsdb_search_fsn_dn_s(LDAP *ld, const char *nce, const char *fsn_uuid, retval = FEDFS_ERR_NSDB_NOFSN; goto out; default: - xlog(D_CALL, "%s: received %d messages", __func__, rc); + xlog(D_CALL, "%s: received %d messages", __func__, entries); } *dn = ldap_get_dn(ld, response); @@ -968,9 +968,9 @@ nsdb_search_fsl_dn_s(LDAP *ld, const char *nce, const char *fsl_uuid, char **dn, unsigned int *ldap_err) { LDAPMessage *response; + int len, rc, entries; FedFsStatus retval; char filter[128]; - int len, rc; /* watch out for buffer overflow */ len = snprintf(filter, sizeof(filter), @@ -1000,8 +1000,8 @@ nsdb_search_fsl_dn_s(LDAP *ld, const char *nce, const char *fsl_uuid, return FEDFS_ERR_NSDB_FAULT; } - rc = ldap_count_messages(ld, response); - switch (rc) { + entries = ldap_count_messages(ld, response); + switch (entries) { case -1: xlog(D_GENERAL, "%s: Empty LDAP response", __func__); retval = FEDFS_ERR_NSDB_RESPONSE; @@ -1012,7 +1012,7 @@ nsdb_search_fsl_dn_s(LDAP *ld, const char *nce, const char *fsl_uuid, retval = FEDFS_ERR_NSDB_NOFSL; goto out; default: - xlog(D_CALL, "%s: received %d messages", __func__, rc); + xlog(D_CALL, "%s: received %d messages", __func__, entries); } *dn = ldap_get_dn(ld, response); diff --git a/src/libnsdb/fileserver.c b/src/libnsdb/fileserver.c index 9484591..872d10c 100644 --- a/src/libnsdb/fileserver.c +++ b/src/libnsdb/fileserver.c @@ -384,7 +384,7 @@ nsdb_old_get_ncedn_s(nsdb_t host, const char *naming_context, char **dn, LDAP *ld = host->fn_ldap; FedFsStatus retval; char *tmp = NULL; - int rc; + int rc, entries; rc = nsdb_search_nsdb_attr_s(ld, naming_context, "(objectClass=*)", "fedfsNceDN", &response); @@ -408,13 +408,13 @@ nsdb_old_get_ncedn_s(nsdb_t host, const char *naming_context, char **dn, return FEDFS_ERR_NSDB_FAULT; } - rc = ldap_count_messages(ld, response); - if (rc == -1) { + entries = ldap_count_messages(ld, response); + if (entries == -1) { xlog(D_GENERAL, "%s: Empty LDAP response\n", __func__); retval = FEDFS_ERR_NSDB_FAULT; goto out; } - xlog(D_CALL, "%s: received %d messages", __func__, rc); + xlog(D_CALL, "%s: received %d messages", __func__, entries); tmp = NULL; retval = FEDFS_OK; @@ -521,8 +521,8 @@ nsdb_new_get_ncedn_s(nsdb_t host, const char *naming_context, char **dn, LDAPMessage *response, *message; LDAP *ld = host->fn_ldap; FedFsStatus retval; + int rc, entries; unsigned count; - int rc; rc = nsdb_search_nsdb_all_s(ld, naming_context, LDAP_SCOPE_SUBTREE, "(objectClass=fedfsNsdbContainerEntry)", @@ -547,13 +547,13 @@ nsdb_new_get_ncedn_s(nsdb_t host, const char *naming_context, char **dn, return FEDFS_ERR_NSDB_FAULT; } - rc = ldap_count_messages(ld, response); - if (rc == -1) { + entries = ldap_count_messages(ld, response); + if (entries == -1) { xlog(D_GENERAL, "%s: Empty LDAP response\n", __func__); retval = FEDFS_ERR_NSDB_FAULT; goto out; } - xlog(D_CALL, "%s: received %d messages", __func__, rc); + xlog(D_CALL, "%s: received %d messages", __func__, entries); retval = FEDFS_OK; for (message = ldap_first_message(ld, response), count = 0; @@ -728,8 +728,8 @@ nsdb_get_naming_contexts_s(nsdb_t host, char ***contexts, LDAPMessage *response, *message; LDAP *ld = host->fn_ldap; FedFsStatus retval; + int rc, entries; char **tmp; - int rc; if (host == NULL) { xlog(L_ERROR, "%s: Invalid host parameter", __func__); @@ -765,8 +765,8 @@ nsdb_get_naming_contexts_s(nsdb_t host, char ***contexts, return FEDFS_ERR_NSDB_FAULT; } - rc = ldap_count_messages(ld, response); - switch (rc) { + entries = ldap_count_messages(ld, response); + switch (entries) { case -1: xlog(D_GENERAL, "%s: Empty LDAP response", __func__); retval = FEDFS_ERR_NSDB_FAULT; @@ -776,7 +776,7 @@ nsdb_get_naming_contexts_s(nsdb_t host, char ***contexts, retval = FEDFS_ERR_NSDB_FAULT; goto out; default: - xlog(D_CALL, "%s: received %d messages", __func__, rc); + xlog(D_CALL, "%s: received %d messages", __func__, entries); break; } @@ -1188,9 +1188,9 @@ nsdb_resolve_fsn_find_entry_s(nsdb_t host, const char *nce, const char *fsn_uuid LDAPMessage *response, *message; LDAP *ld = host->fn_ldap; struct fedfs_fsl *tmp; + int len, rc, entries; FedFsStatus retval; char *filter; - int len, rc; filter = malloc(128); if (filter == NULL) { @@ -1228,13 +1228,13 @@ nsdb_resolve_fsn_find_entry_s(nsdb_t host, const char *nce, const char *fsn_uuid return FEDFS_ERR_NSDB_FAULT; } - rc = ldap_count_messages(ld, response); - if (rc == -1) { + entries = ldap_count_messages(ld, response); + if (entries == -1) { xlog(D_GENERAL, "%s: Empty LDAP response", __func__); ldap_msgfree(response); return FEDFS_ERR_NSDB_FAULT; } - xlog(D_CALL, "%s: Received %d messages", __func__, rc); + xlog(D_CALL, "%s: Received %d messages", __func__, entries); tmp = NULL; retval = FEDFS_OK; @@ -1512,9 +1512,9 @@ nsdb_get_fsn_find_entry_s(nsdb_t host, const char *nce, const char *fsn_uuid, LDAPMessage *response, *message; LDAP *ld = host->fn_ldap; struct fedfs_fsn *tmp; + int len, rc, entries; FedFsStatus retval; char *filter; - int len, rc; filter = malloc(128); if (filter == NULL) { @@ -1551,13 +1551,13 @@ nsdb_get_fsn_find_entry_s(nsdb_t host, const char *nce, const char *fsn_uuid, return FEDFS_ERR_NSDB_FAULT; } - rc = ldap_count_messages(ld, response); - if (rc == -1) { + entries = ldap_count_messages(ld, response); + if (entries == -1) { xlog(D_GENERAL, "%s: Empty LDAP response", __func__); ldap_msgfree(response); return FEDFS_ERR_NSDB_FAULT; } - xlog(D_CALL, "%s: Received %d messages", __func__, rc); + xlog(D_CALL, "%s: Received %d messages", __func__, entries); tmp = NULL; retval = FEDFS_OK; @@ -1775,8 +1775,8 @@ nsdb_list_find_entries_s(nsdb_t host, const char *nce, char ***fsns, LDAPMessage *response, *message; LDAP *ld = host->fn_ldap; FedFsStatus retval; + int rc, entries; char **tmp; - int rc; rc = nsdb_search_nsdb_all_s(ld, nce, LDAP_SCOPE_ONE, "(objectClass=fedfsFsn)", &response); @@ -1799,18 +1799,18 @@ nsdb_list_find_entries_s(nsdb_t host, const char *nce, char ***fsns, return FEDFS_ERR_NSDB_FAULT; } - rc = ldap_count_messages(ld, response); - if (rc == -1) { + entries = ldap_count_messages(ld, response); + if (entries == -1) { xlog(D_GENERAL, "%s: Empty LDAP response", __func__); ldap_msgfree(response); return FEDFS_ERR_NSDB_FAULT; } - xlog(D_CALL, "%s: Received %d messages", __func__, rc); + xlog(D_CALL, "%s: Received %d messages", __func__, entries); /* Assume one FSN per LDAP message, minus the RESULT message, * plus the NULL pointer on the end of the array */ retval = FEDFS_ERR_SVRFAULT; - tmp = calloc(rc, sizeof(char *)); + tmp = calloc(entries, sizeof(char *)); if (tmp == NULL) goto out; tmp[0] = NULL; _______________________________________________ fedfs-utils-devel mailing list [email protected] https://oss.oracle.com/mailman/listinfo/fedfs-utils-devel
