Use custom bool. Minor changes in makefile.

kvap · kvap · commit 7c7795cf7e6f · 2016-03-24T20:27:27.000+03:00
diff --git a/Makefile b/Makefile
@@ -1,8 +1,7 @@
 #override CC := clang
 override CFLAGS += -Wfatal-errors -O0 -g
 override CPPFLAGS += -I. -Iinclude -DDEBUG
-override SERVER_LDFLAGS += -Llib -lraft -ljansson
-override CLIENT_LDFLAGS += -ljansson
+override HEART_LDFLAGS += -Llib -lraft -ljansson
 
 AR = ar
 ARFLAGS = -cru
@@ -17,7 +16,7 @@ lib/libraft.a: obj/raft.o obj/util.o | libdir objdir
 
 bin/heart: obj/heart.o lib/libraft.a | bindir objdir
 	$(CC) -o bin/heart $(CFLAGS) $(CPPFLAGS) \
-		obj/heart.o $(SERVER_LDFLAGS)
+		obj/heart.o $(HEART_LDFLAGS)
 
 obj/%.o: src/%.c | objdir
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
diff --git a/example/heart.c b/example/heart.c
@@ -15,7 +15,7 @@
 #include "raft.h"
 #include "util.h"
 
-static void applier(void *state, raft_update_t update, bool snapshot) {
+static void applier(void *state, raft_update_t update, raft_bool_t snapshot) {
 	json_error_t error;
 
 	json_t *patch = json_loadb(update.data, update.len, 0, &error);
diff --git a/include/raft.h b/include/raft.h
@@ -6,6 +6,8 @@
 typedef struct raft_data_t *raft_t;
 typedef struct raft_msg_data_t *raft_msg_t;
 
+typedef int raft_bool_t;
+
 typedef struct raft_update_t {
 	int len;
 	char *data;
@@ -17,7 +19,7 @@ typedef struct raft_update_t {
 // 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, bool snapshot);
+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
@@ -48,10 +50,10 @@ 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.
-bool raft_peer_up(raft_t r, int id, char *host, int port, bool self);
+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'.
-bool raft_peer_down(raft_t r, int id);
+raft_bool_t raft_peer_down(raft_t r, int id);
 
 // --- Log Actions ---
 
@@ -60,7 +62,7 @@ bool raft_peer_down(raft_t r, int id);
 int raft_emit(raft_t r, raft_update_t update);
 
 // Checks whether an entry at 'index' has been applied by the peer named 'id'.
-bool raft_applied(raft_t t, int id, int index);
+raft_bool_t raft_applied(raft_t t, int id, int index);
 
 // --- Control ---
 
@@ -85,7 +87,7 @@ void raft_handle_message(raft_t r, raft_msg_t m);
 int raft_create_udp_socket(raft_t r);
 
 // Returns true if this peer thinks it is the leader.
-bool raft_is_leader(raft_t r);
+raft_bool_t raft_is_leader(raft_t r);
 
 // Returns the id of the current leader, or NOBODY if no leader.
 int raft_get_leader(raft_t r);
diff --git a/include/util.h b/include/util.h
@@ -1,14 +1,13 @@
 #ifndef UTIL_H
 #define UTIL_H
 
-#include <stdbool.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-bool inrange(int min, int x, int max);
+int inrange(int min, int x, int max);
 
 static inline int min(int a, int b) {
 	return a < b ? a : b;
diff --git a/src/raft.c b/src/raft.c
@@ -2,12 +2,15 @@
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>
-#include <stdbool.h>
 #include <string.h>
 
 #include "raft.h"
 #include "util.h"
 
+#define bool raft_bool_t
+#define true 1
+#define false 0
+
 #define DEFAULT_LISTENHOST "0.0.0.0"
 #define DEFAULT_LISTENPORT 6543
 
diff --git a/src/util.c b/src/util.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 #include "util.h"
 
-bool inrange(int min, int x, int max) {
+int inrange(int min, int x, int max) {
 	assert(min <= max);
 	return (min <= x) && (x <= max);
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#include <unistd.h>`
`6`	`6`	`#include "util.h"`
`7`	`7`
`8`		`-bool inrange(int min, int x, int max) {`
	`8`	`+int inrange(int min, int x, int max) {`
`9`	`9`	`assert(min <= max);`
`10`	`10`	`return (min <= x) && (x <= max);`
`11`	`11`	`}`