From 5ba41bb3cb938028e7be978117b39fe0c79adcd8 Mon Sep 17 00:00:00 2001 From: Sears Russell Date: Mon, 29 Dec 2008 20:01:37 +0000 Subject: [PATCH] renamed logWriter.[ch] to safeWrites.[ch] --- src/stasis/CMakeLists.txt | 3 ++- src/stasis/Makefile.am | 3 ++- src/stasis/logger/logger2.c | 2 +- src/stasis/logger/{logWriter.c => safeWrites.c} | 2 +- src/stasis/transactional2.c | 2 +- stasis/logger/{logWriter.h => safeWrites.h} | 6 +++--- test/stasis/check_logWriter.c | 2 +- utilities/logfile_dump.c | 3 ++- 8 files changed, 13 insertions(+), 10 deletions(-) rename src/stasis/logger/{logWriter.c => safeWrites.c} (99%) rename stasis/logger/{logWriter.h => safeWrites.h} (97%) diff --git a/src/stasis/CMakeLists.txt b/src/stasis/CMakeLists.txt index 6eebcdd..3ed420f 100644 --- a/src/stasis/CMakeLists.txt +++ b/src/stasis/CMakeLists.txt @@ -9,7 +9,8 @@ ADD_LIBRARY(stasis crc32.c redblack.c lhtable.c rw.c doubleLinkedList.c allocationPolicy.c lockManager.c iterator.c consumer.c arrayCollection.c ringbuffer.c fifo.c multiplexer.c graph.c logger/logEntry.c - logger/logWriter.c logger/logWriterUtils.c + logger/safeWrites.c logger/logWriterUtils.c + logger/filePool.c logger/inMemoryLog.c logger/logHandle.c logger/logger2.c logger/logMemory.c page/raw.c page/slotted.c diff --git a/src/stasis/Makefile.am b/src/stasis/Makefile.am index 2fcb1f3..e958003 100644 --- a/src/stasis/Makefile.am +++ b/src/stasis/Makefile.am @@ -6,7 +6,8 @@ libstasis_la_SOURCES=crc32.c redblack.c lhtable.c rw.c doubleLinkedList.c common transactional2.c allocationPolicy.c \ lockManager.c iterator.c consumer.c arrayCollection.c ringbuffer.c fifo.c multiplexer.c graph.c\ logger/logEntry.c \ - logger/logWriterUtils.c logger/logWriter.c \ + logger/logWriterUtils.c logger/safeWrites.c \ + logger/filePool.c \ logger/inMemoryLog.c logger/logHandle.c logger/logger2.c \ logger/logMemory.c \ page/raw.c page/slotted.c page/fixed.c compensations.c \ diff --git a/src/stasis/logger/logger2.c b/src/stasis/logger/logger2.c index a40f740..a513294 100644 --- a/src/stasis/logger/logger2.c +++ b/src/stasis/logger/logger2.c @@ -57,7 +57,7 @@ terms specified in this license. #include -#include +#include #include #include diff --git a/src/stasis/logger/logWriter.c b/src/stasis/logger/safeWrites.c similarity index 99% rename from src/stasis/logger/logWriter.c rename to src/stasis/logger/safeWrites.c index d82d0d2..6d379a9 100644 --- a/src/stasis/logger/logWriter.c +++ b/src/stasis/logger/safeWrites.c @@ -57,7 +57,7 @@ terms specified in this license. #include #include -#include +#include #include #include #include diff --git a/src/stasis/transactional2.c b/src/stasis/transactional2.c index dc979ac..8c5897f 100644 --- a/src/stasis/transactional2.c +++ b/src/stasis/transactional2.c @@ -18,7 +18,7 @@ #include -#include +#include #include #include diff --git a/stasis/logger/logWriter.h b/stasis/logger/safeWrites.h similarity index 97% rename from stasis/logger/logWriter.h rename to stasis/logger/safeWrites.h index 2c91cb8..056d122 100644 --- a/stasis/logger/logWriter.h +++ b/stasis/logger/safeWrites.h @@ -1,5 +1,5 @@ -#ifndef __LOGWRITER_H__ -#define __LOGWRITER_H__ +#ifndef __STASIS_LOG_SAFE_WRITES_H +#define __STASIS_LOG_SAFE_WRITES_H /*--- This software is copyrighted by the Regents of the University of @@ -97,4 +97,4 @@ void stasis_log_safe_writes_delete(const char * filename); END_C_DECLS -#endif /* __LLADD_LOGGER_LOGWRITER_H */ +#endif diff --git a/test/stasis/check_logWriter.c b/test/stasis/check_logWriter.c index 8001015..87ac859 100644 --- a/test/stasis/check_logWriter.c +++ b/test/stasis/check_logWriter.c @@ -53,7 +53,7 @@ terms specified in this license. #include #include #include -#include +#include #include #include diff --git a/utilities/logfile_dump.c b/utilities/logfile_dump.c index f49a3b5..6629244 100644 --- a/utilities/logfile_dump.c +++ b/utilities/logfile_dump.c @@ -3,7 +3,8 @@ #include #include -#include +#include +#include static char * logEntryToString(const LogEntry * le) { char * ret = NULL;