diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2010-08-31 21:17:30 -0600 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2010-09-01 11:50:05 -0600 |
| commit | e89048c403090ad87ff0ee963f09865945196dbc (patch) | |
| tree | 5b6fe33825f8b75419f7d58315e43c879392244c /ldap/servers/slapd/back-ldbm | |
| parent | 481ed4a2b5ccd8da5fdff445d36389a546593297 (diff) | |
| download | ds-e89048c403090ad87ff0ee963f09865945196dbc.tar.gz ds-e89048c403090ad87ff0ee963f09865945196dbc.tar.xz ds-e89048c403090ad87ff0ee963f09865945196dbc.zip | |
fix compiler warnings - unused vars/funcs, invalid castswarnings
This commit fixes many compiler warnings, mostly for things like unused
variables, functions, goto labels.
One place was using csngen_free instead of csn_free. A couple of places
were using casts incorrectly, and several places needed some casts added.
Diffstat (limited to 'ldap/servers/slapd/back-ldbm')
| -rw-r--r-- | ldap/servers/slapd/back-ldbm/import-threads.c | 4 | ||||
| -rw-r--r-- | ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c | 2 | ||||
| -rw-r--r-- | ldap/servers/slapd/back-ldbm/ldbm_usn.c | 3 | ||||
| -rw-r--r-- | ldap/servers/slapd/back-ldbm/perfctrs.c | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/ldap/servers/slapd/back-ldbm/import-threads.c b/ldap/servers/slapd/back-ldbm/import-threads.c index 60a92b38..12018dbf 100644 --- a/ldap/servers/slapd/back-ldbm/import-threads.c +++ b/ldap/servers/slapd/back-ldbm/import-threads.c @@ -1321,7 +1321,7 @@ upgradedn_producer(void *param) /* call post-entry plugin */ plugin_call_entryfetch_plugins((char **)&data.dptr, &data.dsize); - slapi_ch_free_string((void**)&ecopy); + slapi_ch_free_string(&ecopy); ecopy = (char *)slapi_ch_malloc(data.dsize + 1); memcpy(ecopy, data.dptr, data.dsize); *(ecopy + data.dsize) = '\0'; @@ -1732,7 +1732,7 @@ error: info->state = ABORTED; done: - slapi_ch_free_string((void**)&ecopy); + slapi_ch_free_string(&ecopy); slapi_ch_free(&(data.data)); } diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c index 83130207..deb818d6 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c @@ -1014,7 +1014,7 @@ attrcrypt_decrypt_index_key(backend *be, rc = -1; goto bail; } - (*out) = ber_bvdup(out_bv); + (*out) = ber_bvdup((struct berval *)out_bv); if (NULL == *out) { rc = -1; } diff --git a/ldap/servers/slapd/back-ldbm/ldbm_usn.c b/ldap/servers/slapd/back-ldbm/ldbm_usn.c index 2bb64bc2..67396725 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_usn.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_usn.c @@ -81,7 +81,7 @@ ldbm_usn_init(struct ldbminfo *li) sdn = slapi_get_next_suffix_ext( &node, 0 )) { be = slapi_mapping_tree_find_backend_for_sdn(sdn); slapi_log_error(SLAPI_LOG_BACKLDBM, "ldbm_usn_init", - "backend: %s \n", be->be_name, isglobal?"(global mode)":""); + "backend: %s%s%s\n", be->be_name, isglobal?" ":"", isglobal?"(global mode)":""); rc = usn_get_last_usn(be, &last_usn); if (0 == rc) { /* only when the last usn is available */ if (isglobal) { @@ -201,7 +201,6 @@ int ldbm_set_last_usn(Slapi_Backend *be) { PRUint64 last_usn = 0; - PRUint64 current_usn = 0; int isglobal = config_get_entryusn_global(); int rc = -1; diff --git a/ldap/servers/slapd/back-ldbm/perfctrs.c b/ldap/servers/slapd/back-ldbm/perfctrs.c index 521ba1f2..bb5ba00f 100644 --- a/ldap/servers/slapd/back-ldbm/perfctrs.c +++ b/ldap/servers/slapd/back-ldbm/perfctrs.c @@ -211,7 +211,6 @@ void perfctrs_init(struct ldbminfo *li, perfctrs_private **ret_priv) *ret_priv = priv; return; -error: #if !defined(_WIN32) if (priv) slapi_ch_free((void**)&priv->memory); #endif |