From: Ondřej Kuzník <ondra@openldap.org>
Date: Tue, 19 Feb 2019 10:27:34 +0000 (+0000)
Subject: Silence compiler warnings
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~67^2~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=117dcbc54d88c3283211bb86aa02ef7029026279;p=thirdparty%2Fopenldap.git

Silence compiler warnings
---

diff --git a/clients/tools/common.c b/clients/tools/common.c
index dbf4e0c5b5..4c1c4d774e 100644
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -2503,6 +2503,7 @@ print_dirsync( LDAP *ld, LDAPControl *ctrl )
 			}
 		}
 	}
+	return rc;
 }
 #endif
 
diff --git a/libraries/liblunicode/ure/ure.c b/libraries/liblunicode/ure/ure.c
index 4ad66f9f6e..b3f36b6139 100644
--- a/libraries/liblunicode/ure/ure.c
+++ b/libraries/liblunicode/ure/ure.c
@@ -1859,7 +1859,7 @@ ure_write_dfa(ure_dfa_t dfa, FILE *out)
                     if (sym->props & (1 << k)) {
                         if (h != 0)
                           putc(',', out);
-                        fprintf(out, "%hd", k + 1);
+                        fprintf(out, "%d", k + 1);
                         h = 1;
                     }
                 }
diff --git a/libraries/librewrite/map.c b/libraries/librewrite/map.c
index c64b6b177e..47d408b29c 100644
--- a/libraries/librewrite/map.c
+++ b/libraries/librewrite/map.c
@@ -462,7 +462,6 @@ rewrite_map_apply(
 				val );
 		else
 			rc = REWRITE_ERR;
-			break;
 		break;
 	}
 
diff --git a/servers/slapd/back-mdb/monitor.c b/servers/slapd/back-mdb/monitor.c
index 205291fb62..a3c473d4d6 100644
--- a/servers/slapd/back-mdb/monitor.c
+++ b/servers/slapd/back-mdb/monitor.c
@@ -196,13 +196,13 @@ mdb_monitor_update(
 	a = attr_find( e->e_attrs, ad_olmMDBReadersMax );
 	assert( a != NULL );
 	bv.bv_val = buf;
-	bv.bv_len = snprintf( buf, sizeof( buf ), "%lu", mei.me_maxreaders );
+	bv.bv_len = snprintf( buf, sizeof( buf ), "%u", mei.me_maxreaders );
 	ber_bvreplace( &a->a_vals[ 0 ], &bv );
 
 	a = attr_find( e->e_attrs, ad_olmMDBReadersUsed );
 	assert( a != NULL );
 	bv.bv_val = buf;
-	bv.bv_len = snprintf( buf, sizeof( buf ), "%lu", mei.me_numreaders );
+	bv.bv_len = snprintf( buf, sizeof( buf ), "%u", mei.me_numreaders );
 	ber_bvreplace( &a->a_vals[ 0 ], &bv );
 
 	rc = mdb_txn_begin( mdb->mi_dbenv, NULL, MDB_RDONLY, &txn );
diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 22041c0991..b853a9f31a 100644
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -1555,7 +1555,7 @@ syncprov_add_slog( Operation *op )
 			ldap_pvt_thread_mutex_lock( &sl->sl_mutex );
 			/* can only do this if no one else is reading the log at the moment */
 			if (!sl->sl_playing) {
-			while ( se = sl->sl_head ) {
+			while ( (se = sl->sl_head) ) {
 				sl->sl_head = se->se_next;
 				ch_free( se );
 			}