Fix warnings.

Author: kvap

Makefile

@@ -1,5 +1,5 @@
 #override CC := clang
-override CFLAGS += -Wfatal-errors -O0 -g
+override CFLAGS += -fpic -Wall -Wfatal-errors -O0 -g -pedantic -std=c99
 override CPPFLAGS += -I. -Iinclude -DDEBUG
 override HEART_LDFLAGS += -Llib -lraft -ljansson
 
@@ -8,12 +8,12 @@ ARFLAGS = -cru
 
 .PHONY: all clean bindir objdir libdir
 
-all: lib/libraft.a bin/heart
-	@echo Done.
-
 lib/libraft.a: obj/raft.o obj/util.o | libdir objdir
 	$(AR) $(ARFLAGS) lib/libraft.a obj/raft.o obj/util.o
 
+all: lib/libraft.a bin/heart
+	@echo Done.
+
 bin/heart: obj/heart.o lib/libraft.a | bindir objdir
 	$(CC) -o bin/heart $(CFLAGS) $(CPPFLAGS) \
 		obj/heart.o $(HEART_LDFLAGS)

example/heart.c

@@ -1,3 +1,5 @@
+#define _POSIX_C_SOURCE 2
+#define _BSD_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -54,8 +56,6 @@ static void applier(void *state, raft_update_t update, raft_bool_t snapshot) {
 }
 
 static raft_update_t snapshooter(void *state) {
-	json_error_t error;
-
 	raft_update_t shot;
 	shot.data = json_dumps(state, JSON_SORT_KEYS);
 	shot.len = strlen(shot.data);
@@ -98,7 +98,6 @@ static void main_loop(char *host, int port) {
 	while (true) {
 		int ms;
 		raft_msg_t m;
-		int applied;
 
 		ms = mstimer_reset(&t);
 

include/raft.h

@@ -11,22 +11,26 @@ typedef int raft_bool_t;
 typedef struct raft_update_t {
 	int len;
 	char *data;
-	void *userdata; // use this to track which query caused this update
+	void *userdata; /* use this to track which query caused this update */
 } raft_update_t;
 
-// --- Callbacks ---
+/* --- Callbacks --- */
 
-// This should be a function that applies an 'update' to the state machine.
-// 'snapshot' is true if 'update' contains a snapshot. 'userdata' is the
-// userdata that raft was configured with.
+/*
+ * This should be a function that applies an 'update' to the state machine.
+ * 'snapshot' is true if 'update' contains a snapshot. 'userdata' is the
+ * userdata that raft was configured with.
+ */
 typedef void (*raft_applier_t)(void *userdata, raft_update_t update, raft_bool_t snapshot);
 
-// This should be a function that makes a snapshot of the state machine. Used
-// for raft log compaction. 'userdata' is the userdata that raft was configured
-// with.
+/*
+ * This should be a function that makes a snapshot of the state machine. Used
+ * for raft log compaction. 'userdata' is the userdata that raft was configured
+ * with.
+ */
 typedef raft_update_t (*raft_snapshooter_t)(void *userdata);
 
-// --- Configuration ---
+/* --- Configuration --- */
 
 typedef struct raft_config_t {
 	int peernum_max;
@@ -40,56 +44,80 @@ typedef struct raft_config_t {
 	int chunk_len;
 	int msg_len_max;
 
-	void *userdata; // this will get passed to applier() and snapshooter()
+	void *userdata; /* this will get passed to applier() and snapshooter() */
 	raft_applier_t applier;
 	raft_snapshooter_t snapshooter;
 } raft_config_t;
 
-// Initialize a raft instance. Returns NULL on failure.
+/*
+ * Initialize a raft instance. Returns NULL on failure.
+ */
 raft_t raft_init(raft_config_t *config);
 
-// Add a peer named 'id'. 'self' should be true, if that peer is this instance.
-// Only one peer should have 'self' == true.
+/*
+ * Add a peer named 'id'. 'self' should be true, if that peer is this instance.
+ * Only one peer should have 'self' == true.
+ */
 raft_bool_t raft_peer_up(raft_t r, int id, char *host, int port, raft_bool_t self);
 
-// Remove a previously added peer named 'id'.
+/*
+ * Remove a previously added peer named 'id'.
+ */
 raft_bool_t raft_peer_down(raft_t r, int id);
 
-// --- Log Actions ---
+/* --- Log Actions --- */
 
-// Emit an 'update'. Returns the log index if emitted successfully, or -1
-// otherwise.
+/*
+ * Emit an 'update'. Returns the log index if emitted successfully, or -1
+ * otherwise.
+ */
 int raft_emit(raft_t r, raft_update_t update);
 
-// Checks whether an entry at 'index' has been applied by the peer named 'id'.
+/*
+ * Checks whether an entry at 'index' has been applied by the peer named 'id'.
+ */
 raft_bool_t raft_applied(raft_t t, int id, int index);
 
-// --- Control ---
-
-// Note, that UDP socket and raft messages are exposed to the user. This gives
-// the user the opportunity to incorporate the socket with other sockets in
-// select() or poll(). Thus, the messages will be processed as soon as they
-// come, not as soon as we call raft_tick().
-
-// Perform various raft logic tied to time. Call this function once in a while
-// and pass the elapsed 'msec' from the previous call. This function will only
-// trigger time-related events, and will not receive and process messages (see
-// the note above).
+/* --- Control --- */
+
+/*
+ * Note, that UDP socket and raft messages are exposed to the user. This gives
+ * the user the opportunity to incorporate the socket with other sockets in
+ * select() or poll(). Thus, the messages will be processed as soon as they
+ * come, not as soon as we call raft_tick().
+ */
+
+/*
+ * Perform various raft logic tied to time. Call this function once in a while
+ * and pass the elapsed 'msec' from the previous call. This function will only
+ * trigger time-related events, and will not receive and process messages (see
+ * the note above).
+ */
 void raft_tick(raft_t r, int msec);
 
-// Receive a raft message. Returns NULL if no message available.
+/*
+ * Receive a raft message. Returns NULL if no message available.
+ */
 raft_msg_t raft_recv_message(raft_t r);
 
-// Process the message.
+/*
+ * Process the message.
+ */
 void raft_handle_message(raft_t r, raft_msg_t m);
 
-// Create the raft socket.
+/*
+ * Create the raft socket.
+ */
 int raft_create_udp_socket(raft_t r);
 
-// Returns true if this peer thinks it is the leader.
+/*
+ * Returns true if this peer thinks it is the leader.
+ */
 raft_bool_t raft_is_leader(raft_t r);
 
-// Returns the id of the current leader, or NOBODY if no leader.
+/*
+ * Returns the id of the current leader, or NOBODY if no leader.
+ */
 int raft_get_leader(raft_t r);
 
 #endif

include/util.h

@@ -32,15 +32,19 @@ struct timeval ms2tv(int ms);
 
 // ------ logging ------
 
-#ifndef DEBUG
-#define debug(...)
+#ifdef DEBUG
+#define DEBUG_ENABLED 1
 #else
+#define DEBUG_ENABLED 0
+#endif
+
 #define debug(...) \
 	do { \
-		fprintf(stderr, __VA_ARGS__); \
-		fflush(stderr); \
+		if (DEBUG_ENABLED) {\
+			fprintf(stderr, __VA_ARGS__); \
+			fflush(stderr); \
+		}\
 	} while (0)
-#endif
 
 #define shout(...) \
 	do { \

src/raft.c

@@ -1,4 +1,8 @@
+#define _BSD_SOURCE
+#include <sys/socket.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
+
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>
@@ -448,7 +452,6 @@ static void raft_beat(raft_t r, int dst) {
 
 	if (p->acked.entries <= RAFT_LOG_LAST_INDEX(r)) {
 		int sendindex;
-		int sendbyte;
 
 		if (p->acked.entries < RAFT_LOG_FIRST_INDEX(r)) {
 			// The peer has woken up from anabiosis. Send the first
@@ -721,8 +724,6 @@ static bool raft_restore(raft_t r, int previndex, raft_entry_t *e) {
 static bool raft_appendable(raft_t r, int previndex, int prevterm) {
 	int low, high;
 
-	raft_log_t *l = &r->log;
-
 	low = RAFT_LOG_FIRST_INDEX(r);
 	if (low == 0) low = -1; // allow appending at the start
 	high = RAFT_LOG_LAST_INDEX(r);
@@ -743,6 +744,8 @@ static bool raft_appendable(raft_t r, int previndex, int prevterm) {
 			return false;
 		}
 	}
+
+	return true;
 }
 
 static bool raft_append(raft_t r, int previndex, int prevterm, raft_entry_t *e) {
@@ -754,7 +757,7 @@ static bool raft_append(raft_t r, int previndex, int prevterm, raft_entry_t *e)
 	debug(
 		"log_append(%p, previndex=%d, prevterm=%d,"
 		" term=%d)\n",
-		l, previndex, prevterm,
+		(void *)l, previndex, prevterm,
 		e->term
 	);