summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/sync-alarm.c2
-rw-r--r--src/sync-ftfw.c2
-rw-r--r--src/sync-mode.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/sync-alarm.c b/src/sync-alarm.c
index 3d20867..1dcfacd 100644
--- a/src/sync-alarm.c
+++ b/src/sync-alarm.c
@@ -106,7 +106,7 @@ static int alarm_recv(const struct nethdr *net)
return 0;
}
-struct sync_mode alarm = {
+struct sync_mode sync_alarm = {
.internal_cache_flags = LIFETIME,
.external_cache_flags = TIMER | LIFETIME,
.internal_cache_extra = &cache_alarm_extra,
diff --git a/src/sync-ftfw.c b/src/sync-ftfw.c
index 125e82e..23095c4 100644
--- a/src/sync-ftfw.c
+++ b/src/sync-ftfw.c
@@ -355,7 +355,7 @@ static void ftfw_run()
mod_alarm(&alive_alarm, 1, 0);
}
-struct sync_mode ftfw = {
+struct sync_mode sync_ftfw = {
.internal_cache_flags = LIFETIME,
.external_cache_flags = LIFETIME,
.internal_cache_extra = &cache_ftfw_extra,
diff --git a/src/sync-mode.c b/src/sync-mode.c
index 16642c2..d38d91f 100644
--- a/src/sync-mode.c
+++ b/src/sync-mode.c
@@ -126,14 +126,14 @@ static int init_sync(void)
memset(state.sync, 0, sizeof(struct ct_sync_state));
if (CONFIG(flags) & CTD_SYNC_FTFW)
- STATE_SYNC(sync) = &ftfw;
+ STATE_SYNC(sync) = &sync_ftfw;
else if (CONFIG(flags) & CTD_SYNC_ALARM)
- STATE_SYNC(sync) = &alarm;
+ STATE_SYNC(sync) = &sync_alarm;
else {
fprintf(stderr, "WARNING: No synchronization mode specified. "
"Defaulting to FT-FW mode.\n");
CONFIG(flags) |= CTD_SYNC_FTFW;
- STATE_SYNC(sync) = &ftfw;
+ STATE_SYNC(sync) = &sync_ftfw;
}
if (STATE_SYNC(sync)->init)