[libgda: 3/5] ldap-provider: removing warnings
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda: 3/5] ldap-provider: removing warnings
- Date: Fri, 22 Feb 2019 17:48:02 +0000 (UTC)
commit 4a70efdb784e9a0a4145ad6521b5dea7995b4358
Author: Daniel Espinosa Ortiz <esodan gmail com>
Date: Fri Feb 22 08:53:02 2019 -0600
ldap-provider: removing warnings
providers/ldap/gdaprov-data-model-ldap.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/providers/ldap/gdaprov-data-model-ldap.c b/providers/ldap/gdaprov-data-model-ldap.c
index d714145d7..8e43b75a4 100644
--- a/providers/ldap/gdaprov-data-model-ldap.c
+++ b/providers/ldap/gdaprov-data-model-ldap.c
@@ -1136,15 +1136,16 @@ worker_execute_ldap_search (WorkerSearchData *data, GError **error)
}
break;
}
- case LDAP_SERVER_DOWN: {
- gint i;
- for (i = 0; i < 5; i++) {
- if (gda_ldap_rebind (data->cnc, NULL))
- goto retry;
- g_usleep (G_USEC_PER_SEC * 2);
- }
- }
+ case LDAP_SERVER_DOWN:
default: {
+ if (res == LDAP_SERVER_DOWN) {
+ gint i;
+ for (i = 0; i < 5; i++) {
+ if (gda_ldap_rebind (data->cnc, NULL))
+ goto retry;
+ g_usleep (G_USEC_PER_SEC * 2);
+ }
+ }
/* error */
GError *e = NULL;
int ldap_errno;
@@ -1159,7 +1160,7 @@ worker_execute_ldap_search (WorkerSearchData *data, GError **error)
#endif /*GDA_DEBUG_FORCE_ERROR*/
if (data->model->priv->truncated) {
- /* compute totel number of rows now that we know it */
+ /* compute total number of rows now that we know it */
if (data->model->priv->top_exec->ldap_msg)
data->model->priv->n_rows = data->model->priv->current_exec->nb_entries;
else {
@@ -1753,7 +1754,7 @@ row_multiplier_index_next (RowMultiplier *rm)
}
cm = g_array_index (rm->cms, ColumnMultiplier*, i);
- if (cm->index < (cm->values->len - 1)) {
+ if ((guint) cm->index < (guint) (cm->values->len - 1)) {
cm->index ++;
#ifdef GDA_DEBUG_NO
g_print ("RM %p [TRUE]:\n", rm);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]