From 70f7079ccc1c463c2a156e8ebe606266fc70ef77 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Tue, 13 Feb 2018 17:28:02 +0100
Subject: [PATCH] Rename two more files in msg/app-bittorrent/.

---
 teshsuite/msg/CMakeLists.txt                                  | 4 ++--
 .../msg/app-bittorrent/{messages.c => bittorrent-messages.c}  | 2 +-
 .../msg/app-bittorrent/{messages.h => bittorrent-messages.h}  | 0
 teshsuite/msg/app-bittorrent/bittorrent-peer.c                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename teshsuite/msg/app-bittorrent/{messages.c => bittorrent-messages.c} (99%)
 rename teshsuite/msg/app-bittorrent/{messages.h => bittorrent-messages.h} (100%)

diff --git a/teshsuite/msg/CMakeLists.txt b/teshsuite/msg/CMakeLists.txt
index be85523587..a4d898c223 100644
--- a/teshsuite/msg/CMakeLists.txt
+++ b/teshsuite/msg/CMakeLists.txt
@@ -28,10 +28,10 @@ foreach(x task_destroy_cancel task_listen_from task_progress)
   set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.cpp)
 endforeach()
 
-add_executable       (bittorrent app-bittorrent/bittorrent.c app-bittorrent/messages.c app-bittorrent/bittorrent-peer.c app-bittorrent/tracker.c app-bittorrent/connection.c)
+add_executable       (bittorrent app-bittorrent/bittorrent.c app-bittorrent/bittorrent-messages.c app-bittorrent/bittorrent-peer.c app-bittorrent/tracker.c app-bittorrent/connection.c)
 target_link_libraries(bittorrent simgrid)
 set_target_properties(bittorrent PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/app-bittorrent)
-foreach (file bittorrent connection messages bittorrent-peer tracker)
+foreach (file bittorrent connection bittorrent-messages bittorrent-peer tracker)
   set(teshsuite_src  ${teshsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/${file}.c  ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/${file}.h)
 endforeach()
 
diff --git a/teshsuite/msg/app-bittorrent/messages.c b/teshsuite/msg/app-bittorrent/bittorrent-messages.c
similarity index 99%
rename from teshsuite/msg/app-bittorrent/messages.c
rename to teshsuite/msg/app-bittorrent/bittorrent-messages.c
index 671c289215..b735c7069a 100644
--- a/teshsuite/msg/app-bittorrent/messages.c
+++ b/teshsuite/msg/app-bittorrent/bittorrent-messages.c
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "messages.h"
+#include "bittorrent-messages.h"
 #include "bittorrent.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_messages, "Messages specific for the message factory");
diff --git a/teshsuite/msg/app-bittorrent/messages.h b/teshsuite/msg/app-bittorrent/bittorrent-messages.h
similarity index 100%
rename from teshsuite/msg/app-bittorrent/messages.h
rename to teshsuite/msg/app-bittorrent/bittorrent-messages.h
diff --git a/teshsuite/msg/app-bittorrent/bittorrent-peer.c b/teshsuite/msg/app-bittorrent/bittorrent-peer.c
index eb85a49112..3a6e22fcb4 100644
--- a/teshsuite/msg/app-bittorrent/bittorrent-peer.c
+++ b/teshsuite/msg/app-bittorrent/bittorrent-peer.c
@@ -4,8 +4,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "bittorrent-peer.h"
+#include "bittorrent-messages.h"
 #include "connection.h"
-#include "messages.h"
 #include "tracker.h"
 #include <limits.h>
 #include <simgrid/msg.h>
-- 
2.20.1