redmine

Fixed errors from travis: 24044966

... ... @@ -33,6 +33,7 @@
#ifdef CLUSTER_SUPPORT
#include "common.h"
#include "error.h"
#include "cluster.h"
#include "sync.h"
#include "malloc.h"
... ... @@ -582,10 +583,10 @@ static int cluster_recv(clustercmd_t **clustercmd_pp, unsigned int *timeout_p) {
return 0;
}
if(selret == 0) {
printf_ddd("Debug: cluster_recv(): no new messages.");
debug(3, "no new messages.");
return 0;
}
printf_ddd("Debug: cluster_recv(): got new message(s).");
debug(3, "got new message(s).");
// Reading new message's header
clustercmdadler32_t adler32;
... ...
... ... @@ -27,7 +27,7 @@
#define CLUSTER_LOOP_EXPECTCMD(clustercmd_p, clustercmd_id, ret) {\
/* Exit if error */ \
if(ret == -1) { \
printf_e("Error: CLUSTER_LOOP_EXPECTCMD(): Got error while cluster_recv(): %s (%i).\n", strerror(errno), errno); \
error("CLUSTER_LOOP_EXPECTCMD()"); \
return errno; \
}\
\
... ... @@ -244,7 +244,7 @@ typedef int (*cluster_recvproc_funct_t)(clustercmd_t *clustercmd_p);
// Externs
extern int cluster_init(options_t *options_p, indexes_t *indexes_p);
extern int cluster_init(glob_t *glob_p, indexes_t *indexes_p);
extern int cluster_deinit();
extern int cluster_lock(const char *fpath);
... ...
... ... @@ -996,7 +996,7 @@ char *sync_path_abs2rel(glob_t *glob_p, const char *path_abs, size_t path_abs_le
glob_p->watchdirwslash, watchdirlen+1);
if(path_rel[path_rel_len - 1] == '/')
path_rel[--path_rel_len] = 0x00;
printf_ddd("\"%s\" (len: %i)", path_rel, path_rel_len);
debug(3, "\"%s\" (len: %i)", path_rel, path_rel_len);
#endif
if(path_rel_len_p != NULL)
... ...