[389-ds-base] branch master updated (4e8bf06 -> bdcbf5b)

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

lkrispen pushed a change to branch master
in repository 389-ds-base.

from  4e8bf06   Issue 49451 - Add environment markers to lib389 dependencies
       new  bdcbf5b   Ticket 48118 - fix compiler warning for incorrect return type

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.

Summary of changes:
 ldap/servers/plugins/replication/cl5_api.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

[389-ds-base] 01/01: Ticket 48118 - fix compiler warning for incorrect return type

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

lkrispen pushed a commit to branch master
in repository 389-ds-base.

commit bdcbf5bfdb45bf51a3ea306394ca1e3649be38a9
Author: Ludwig Krispenz 
Date:   Wed Nov 15 13:17:00 2017 +0100

Ticket 48118 - fix compiler warning for incorrect return type
---
 ldap/servers/plugins/replication/cl5_api.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c
index 55032df..721013a 100644
--- a/ldap/servers/plugins/replication/cl5_api.c
+++ b/ldap/servers/plugins/replication/cl5_api.c
@@ -250,8 +250,8 @@ static void _cl5ReadBerval(struct berval *bv, char **buff);
 static void _cl5WriteBerval(struct berval *bv, char **buff);
 static int _cl5ReadBervals(struct berval ***bv, char **buff, unsigned int size);
 static int _cl5WriteBervals(struct berval **bv, char **buff, u_int32_t *size);
-static int64_t _cl5CheckMaxRUV(CL5DBFile *file, RUV *maxruv);
-static int64_t _cl5CheckCSNinCL(const ruv_enum_data *element, void *arg);
+static int32_t _cl5CheckMaxRUV(CL5DBFile *file, RUV *maxruv);
+static int32_t _cl5CheckCSNinCL(const ruv_enum_data *element, void *arg);

/* replay iteration */
 #ifdef FOR_DEBUGGING
@@ -2718,7 +2718,7 @@ _cl5WriteBervals(struct berval **bv, char **buff, u_int32_t *size)
     return CL5_SUCCESS;
 }

-static int64_t
+static int32_t
 _cl5CheckCSNinCL(const ruv_enum_data *element, void *arg)
 {
     CL5DBFile *file = (CL5DBFile *)arg;
@@ -2739,7 +2739,7 @@ _cl5CheckCSNinCL(const ruv_enum_data *element, void *arg)
     return rc;
 }

-static int64_t
+static int32_t
 _cl5CheckMaxRUV(CL5DBFile *file, RUV *maxruv)
 {
     int rc = 0;