2009-10-23 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Renamed Util.{cc,h} as util.{cc,h}
	* src/Util.cc
	* src/Util.h
	* src/util.cc
	* src/util.h

ChangeLog

@@ -1,3 +1,11 @@
+2009-10-23  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Renamed Util.{cc,h} as util.{cc,h}
+	* src/Util.cc
+	* src/Util.h
+	* src/util.cc
+	* src/util.h
+
 2009-10-22  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Moved static functions in Util class to namespace util.

src/AbstractCommand.cc

@@ -61,7 +61,7 @@
 #include "ServerStat.h"
 #include "RequestGroupMan.h"
 #include "A2STR.h"
-#include "Util.h"
+#include "util.h"
 #include "LogFactory.h"
 #include "DownloadContext.h"
 

src/AbstractDiskWriter.cc

@@ -45,7 +45,7 @@
 #endif // __MINGW32__
 
 #include "File.h"
-#include "Util.h"
+#include "util.h"
 #include "message.h"
 #include "LogFactory.h"
 #include "Logger.h"

src/AnnounceList.cc

@@ -39,7 +39,7 @@
 #include "A2STR.h"
 #include "SimpleRandomizer.h"
 #include "bencode.h"
-#include "Util.h"
+#include "util.h"
 
 namespace aria2 {
 

src/AsyncNameResolver.cc

@@ -33,7 +33,7 @@
  */
 /* copyright --> */
 #include "AsyncNameResolver.h"
-#include "Util.h"
+#include "util.h"
 #include "A2STR.h"
 #include <cstring>
 

src/AuthConfigFactory.cc

@@ -43,7 +43,7 @@
 #include "NetrcAuthResolver.h"
 #include "prefs.h"
 #include "Request.h"
-#include "Util.h"
+#include "util.h"
 
 namespace aria2 {
 

src/BitfieldMan.cc

@@ -38,7 +38,7 @@
 #include <cstring>
 
 #include "Randomizer.h"
-#include "Util.h"
+#include "util.h"
 #include "array_fun.h"
 #include "bitfield.h"
 

src/BtBitfieldMessage.cc

@@ -37,7 +37,7 @@
 #include <cstring>
 
 #include "bittorrent_helper.h"
-#include "Util.h"
+#include "util.h"
 #include "DlAbortEx.h"
 #include "message.h"
 #include "Peer.h"

src/BtDependency.cc

@@ -41,7 +41,7 @@
 #include "RecoverableException.h"
 #include "message.h"
 #include "prefs.h"
-#include "Util.h"
+#include "util.h"
 #include "PieceStorage.h"
 #include "DiskAdaptor.h"
 #include "File.h"

src/BtExtendedMessage.cc

@@ -43,7 +43,7 @@
 #include "Peer.h"
 #include "DlAbortEx.h"
 #include "message.h"
-#include "Util.h"
+#include "util.h"
 #include "StringFormat.h"
 #include "a2functional.h"
 

src/BtHandshakeMessage.cc

@@ -36,7 +36,7 @@
 
 #include <cstring>
 
-#include "Util.h"
+#include "util.h"
 #include "BtConstants.h"
 #include "a2functional.h"
 

src/BtHandshakeMessageValidator.h

@@ -40,7 +40,7 @@
 #include <cstring>
 
 #include "BtHandshakeMessage.h"
-#include "Util.h"
+#include "util.h"
 #include "StringFormat.h"
 
 namespace aria2 {

src/BtPieceMessage.cc

@@ -39,7 +39,7 @@
 #include <cassert>
 
 #include "bittorrent_helper.h"
-#include "Util.h"
+#include "util.h"
 #include "message.h"
 #include "DlAbortEx.h"
 #include "MessageDigestHelper.h"

src/BtPortMessage.cc

@@ -35,7 +35,7 @@
 #include "BtPortMessage.h"
 #include "bittorrent_helper.h"
 #include "DlAbortEx.h"
-#include "Util.h"
+#include "util.h"
 #include "message.h"
 #include "Logger.h"
 #include "Peer.h"

src/BtPostDownloadHandler.cc

@@ -41,7 +41,7 @@
 #include "File.h"
 #include "PieceStorage.h"
 #include "DiskAdaptor.h"
-#include "Util.h"
+#include "util.h"
 #include "ContentTypeRequestGroupCriteria.h"
 #include "Exception.h"
 #include "DownloadContext.h"

src/BtSetup.cc

@@ -49,7 +49,7 @@
 #include "prefs.h"
 #include "LogFactory.h"
 #include "Logger.h"
-#include "Util.h"
+#include "util.h"
 #include "IntSequence.h"
 #include "DHTGetPeersCommand.h"
 #include "DHTPeerAnnounceStorage.h"

src/ByteArrayDiskWriter.cc

@@ -33,7 +33,7 @@
  */
 /* copyright --> */
 #include "ByteArrayDiskWriter.h"
-#include "Util.h"
+#include "util.h"
 #include "A2STR.h"
 
 namespace aria2 {

src/ChunkedDecoder.cc

@@ -33,7 +33,7 @@
  */
 /* copyright --> */
 #include "ChunkedDecoder.h"
-#include "Util.h"
+#include "util.h"
 #include "message.h"
 #include "DlAbortEx.h"
 #include "StringFormat.h"

src/ConsoleStatCalc.cc

@@ -56,7 +56,7 @@
 #include "FileAllocationEntry.h"
 #include "CheckIntegrityMan.h"
 #include "CheckIntegrityEntry.h"
-#include "Util.h"
+#include "util.h"
 #include "DownloadContext.h"
 #ifdef ENABLE_BITTORRENT
 # include "bittorrent_helper.h"

src/ContentTypeRequestGroupCriteria.cc

@@ -37,7 +37,7 @@
 #include <algorithm>
 
 #include "RequestGroup.h"
-#include "Util.h"
+#include "util.h"
 #include "FileEntry.h"
 #include "DownloadContext.h"
 

src/Cookie.cc

@@ -37,7 +37,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include "Util.h"
+#include "util.h"
 #include "A2STR.h"
 #include "TimeA2.h"
 #include "a2functional.h"

src/CookieParser.cc

@@ -41,7 +41,7 @@
 #include <map>
 #include <vector>
 
-#include "Util.h"
+#include "util.h"
 #include "A2STR.h"
 #include "TimeA2.h"
 

src/CookieStorage.cc

@@ -38,7 +38,7 @@
 #include <algorithm>
 #include <fstream>
 
-#include "Util.h"
+#include "util.h"
 #include "LogFactory.h"
 #include "Logger.h"
 #include "DlAbortEx.h"

src/DHTAbstractNodeLookupTask.cc

@@ -43,7 +43,7 @@
 #include "DHTBucket.h"
 #include "LogFactory.h"
 #include "Logger.h"
-#include "Util.h"
+#include "util.h"
 #include "DHTIDCloser.h"
 #include <cstring>
 #include <algorithm>

src/DHTAbstractTask.cc

@@ -42,7 +42,7 @@
 #include "DHTBucket.h"
 #include "DHTTaskQueue.h"
 #include "LogFactory.h"
-#include "Util.h"
+#include "util.h"
 
 namespace aria2 {
 

src/DHTAnnouncePeerMessage.cc

@@ -41,7 +41,7 @@
 #include "DHTMessageFactory.h"
 #include "DHTMessageDispatcher.h"
 #include "DHTMessageCallback.h"
-#include "Util.h"
+#include "util.h"
 #include "DHTPeerAnnounceStorage.h"
 #include "DHTTokenTracker.h"
 #include "DlAbortEx.h"

src/DHTAutoSaveCommand.cc

@@ -44,7 +44,7 @@
 #include "DHTRoutingTableSerializer.h"
 #include "RecoverableException.h"
 #include "DownloadEngine.h"
-#include "Util.h"
+#include "util.h"
 #include "DHTBucket.h"
 #include "RequestGroupMan.h"
 #include "prefs.h"

src/DHTBucket.cc

@@ -41,7 +41,7 @@
 #include "DHTNode.h"
 #include "LogFactory.h"
 #include "Logger.h"
-#include "Util.h"
+#include "util.h"
 #include "DHTConstants.h"
 #include "a2functional.h"
 #include "bittorrent_helper.h"

src/DHTBucketRefreshTask.cc

@@ -39,7 +39,7 @@
 #include "DHTTaskQueue.h"
 #include "DHTNode.h"
 #include "DHTNodeLookupEntry.h"
-#include "Util.h"
+#include "util.h"
 #include "Logger.h"
 
 namespace aria2 {

src/DHTConnectionImpl.cc

@@ -41,7 +41,7 @@
 #include "LogFactory.h"
 #include "Logger.h"
 #include "RecoverableException.h"
-#include "Util.h"
+#include "util.h"
 #include "Socket.h"
 #include "SimpleRandomizer.h"
 

src/DHTEntryPointNameResolveCommand.cc

@@ -41,7 +41,7 @@
 #include "DlAbortEx.h"
 #include "prefs.h"
 #include "message.h"
-#include "Util.h"
+#include "util.h"
 #include "Option.h"
 #include "DHTNode.h"
 #include "DHTTaskQueue.h"

src/DHTFindNodeMessage.cc

@@ -41,7 +41,7 @@
 #include "DHTMessageFactory.h"
 #include "DHTMessageDispatcher.h"
 #include "DHTMessageCallback.h"
-#include "Util.h"
+#include "util.h"
 #include "bencode.h"
 
 namespace aria2 {

src/DHTFindNodeReplyMessage.cc

@@ -43,7 +43,7 @@
 #include "DHTMessageDispatcher.h"
 #include "DHTMessageCallback.h"
 #include "bittorrent_helper.h"
-#include "Util.h"
+#include "util.h"
 #include "bencode.h"
 
 namespace aria2 {

src/DHTGetPeersMessage.cc

@@ -44,7 +44,7 @@
 #include "DHTPeerAnnounceStorage.h"
 #include "Peer.h"
 #include "DHTTokenTracker.h"
-#include "Util.h"
+#include "util.h"
 #include "bencode.h"
 
 namespace aria2 {

src/DHTGetPeersReplyMessage.cc

@@ -44,7 +44,7 @@
 #include "DHTMessageCallback.h"
 #include "bittorrent_helper.h"
 #include "Peer.h"
-#include "Util.h"
+#include "util.h"
 #include "bencode.h"
 #include "a2functional.h"
 

src/DHTMessage.cc

@@ -34,7 +34,7 @@
 /* copyright --> */
 #include "DHTMessage.h"
 #include "DHTNode.h"
-#include "Util.h"
+#include "util.h"
 
 namespace aria2 {
 

src/DHTMessageFactoryImpl.cc

@@ -57,7 +57,7 @@
 #include "DHTMessageCallback.h"
 #include "bittorrent_helper.h"
 #include "BtRuntime.h"
-#include "Util.h"
+#include "util.h"
 #include "Peer.h"
 #include "Logger.h"
 #include "StringFormat.h"

src/DHTMessageReceiver.cc

@@ -49,7 +49,7 @@
 #include "DlAbortEx.h"
 #include "LogFactory.h"
 #include "Logger.h"
-#include "Util.h"
+#include "util.h"
 #include "bencode.h"
 
 namespace aria2 {

src/DHTMessageTracker.cc

@@ -42,7 +42,7 @@
 #include "DHTNode.h"
 #include "DHTRoutingTable.h"
 #include "DHTMessageFactory.h"
-#include "Util.h"
+#include "util.h"
 #include "LogFactory.h"
 #include "Logger.h"
 #include "DlAbortEx.h"

src/DHTMessageTrackerEntry.cc

@@ -37,7 +37,7 @@
 #include "DHTMessage.h"
 #include "DHTMessageCallback.h"
 #include "DHTConstants.h"
-#include "Util.h"
+#include "util.h"
 
 namespace aria2 {
 

src/DHTNode.cc

@@ -36,7 +36,7 @@
 
 #include <cstring>
 
-#include "Util.h"
+#include "util.h"
 #include "a2functional.h"
 #include "bittorrent_helper.h"
 

src/DHTNodeLookupTask.cc

@@ -38,7 +38,7 @@
 #include "DHTNode.h"
 #include "DHTNodeLookupEntry.h"
 #include "LogFactory.h"
-#include "Util.h"
+#include "util.h"
 #include <cassert>
 
 namespace aria2 {

src/DHTPeerAnnounceStorage.cc

@@ -46,7 +46,7 @@
 #include "DHTTask.h"
 #include "LogFactory.h"
 #include "Logger.h"
-#include "Util.h"
+#include "util.h"
 #include "a2functional.h"
 
 namespace aria2 {

src/DHTPeerLookupTask.cc

@@ -43,7 +43,7 @@
 #include "DHTMessageCallback.h"
 #include "PeerStorage.h"
 #include "BtRuntime.h"
-#include "Util.h"
+#include "util.h"
 #include "DHTBucket.h"
 #include "bittorrent_helper.h"
 

src/DHTQueryMessage.cc

@@ -34,7 +34,7 @@
 /* copyright --> */
 #include "DHTQueryMessage.h"
 #include "DHTNode.h"
-#include "Util.h"
+#include "util.h"
 #include "bencode.h"
 #include "a2functional.h"
 

src/DHTResponseMessage.cc

@@ -34,7 +34,7 @@
 /* copyright --> */
 #include "DHTResponseMessage.h"
 #include "DHTNode.h"
-#include "Util.h"
+#include "util.h"
 #include "bencode.h"
 #include "a2functional.h"
 

src/DHTRoutingTable.cc

@@ -42,7 +42,7 @@
 #include "DHTTaskQueue.h"
 #include "DHTTaskFactory.h"
 #include "DHTTask.h"
-#include "Util.h"
+#include "util.h"
 #include "LogFactory.h"
 #include "Logger.h"
 

src/DHTRoutingTableDeserializer.cc

@@ -47,7 +47,7 @@
 #include "Logger.h"
 #include "a2netcompat.h"
 #include "StringFormat.h"
-#include "Util.h"
+#include "util.h"
 #include "array_fun.h"
 
 namespace aria2 {

src/DHTRoutingTableSerializer.cc

@@ -45,7 +45,7 @@
 #include "Logger.h"
 #include "a2netcompat.h"
 #include "StringFormat.h"
-#include "Util.h"
+#include "util.h"
 
 namespace aria2 {
 

src/DHTSetup.cc

@@ -39,7 +39,7 @@
 
 #include "LogFactory.h"
 #include "Logger.h"
-#include "Util.h"
+#include "util.h"
 #include "File.h"
 #include "DHTNode.h"
 #include "DHTConnectionImpl.h"

src/DHTTokenTracker.cc

@@ -36,7 +36,7 @@
 
 #include <cstring>
 
-#include "Util.h"
+#include "util.h"
 #include "bittorrent_helper.h"
 #include "DlAbortEx.h"
 #include "DHTConstants.h"

src/DHTUnknownMessage.cc

@@ -38,7 +38,7 @@
 #include <cstdlib>
 
 #include "DHTNode.h"
-#include "Util.h"
+#include "util.h"
 #include "a2functional.h"
 
 namespace aria2 {

src/DefaultBtAnnounce.cc

@@ -36,7 +36,7 @@
 #include "LogFactory.h"
 #include "Logger.h"
 #include "PeerListProcessor.h"
-#include "Util.h"
+#include "util.h"
 #include "prefs.h"
 #include "DlAbortEx.h"
 #include "message.h"

src/DefaultBtInteractive.cc

@@ -39,7 +39,7 @@
 #include "prefs.h"
 #include "message.h"
 #include "BtHandshakeMessage.h"
-#include "Util.h"
+#include "util.h"
 #include "BtKeepAliveMessage.h"
 #include "BtChokeMessage.h"
 #include "BtUnchokeMessage.h"

src/DefaultBtProgressInfoFile.cc

@@ -49,7 +49,7 @@
 #include "DlAbortEx.h"
 #include "message.h"
 #include "File.h"
-#include "Util.h"
+#include "util.h"
 #include "a2io.h"
 #include "DownloadFailureException.h"
 #include "StringFormat.h"

src/DefaultPieceStorage.cc

@@ -52,7 +52,7 @@
 #include "DefaultDiskWriterFactory.h"
 #include "FileEntry.h"
 #include "DlAbortEx.h"
-#include "Util.h"
+#include "util.h"
 #include "a2functional.h"
 #include "Option.h"
 #include "StringFormat.h"

src/DownloadCommand.cc

@@ -51,7 +51,7 @@
 #include "DiskAdaptor.h"
 #include "DownloadContext.h"
 #include "Option.h"
-#include "Util.h"
+#include "util.h"
 #include "Socket.h"
 #include "message.h"
 #include "prefs.h"

src/DownloadEngine.cc

@@ -51,7 +51,7 @@
 #include "TimeA2.h"
 #include "a2time.h"
 #include "Socket.h"
-#include "Util.h"
+#include "util.h"
 #include "a2functional.h"
 #include "DlAbortEx.h"
 #include "ServerStatMan.h"

src/ExpatMetalinkProcessor.cc

@@ -37,7 +37,7 @@
 #include "MetalinkParserStateMachine.h"
 #include "Metalinker.h"
 #include "MetalinkEntry.h"
-#include "Util.h"
+#include "util.h"
 #include "message.h"
 #include "DlAbortEx.h"
 

src/ExpatXmlRpcRequestProcessor.cc

@@ -39,7 +39,7 @@
 #include <expat.h>
 
 #include "XmlRpcRequestParserStateMachine.h"
-#include "Util.h"
+#include "util.h"
 #include "DlAbortEx.h"
 #include "message.h"
 

src/FeatureConfig.cc

@@ -37,7 +37,7 @@
 #include <numeric>
 
 #include "array_fun.h"
-#include "Util.h"
+#include "util.h"
 #include "Request.h"
 
 namespace aria2 {

src/File.cc

@@ -43,7 +43,7 @@
 #include <cstring>
 #include <cstdio>
 
-#include "Util.h"
+#include "util.h"
 #include "A2STR.h"
 #include "array_fun.h"
 

src/FileAllocationCommand.cc

@@ -40,7 +40,7 @@
 #include "Logger.h"
 #include "message.h"
 #include "prefs.h"
-#include "Util.h"
+#include "util.h"
 #include "DownloadEngine.h"
 #include "DownloadContext.h"
 

src/FileEntry.cc

@@ -37,7 +37,7 @@
 #include <cassert>
 #include <algorithm>
 
-#include "Util.h"
+#include "util.h"
 #include "URISelector.h"
 #include "LogFactory.h"
 

src/FixedWidthNumberDecorator.h

@@ -36,7 +36,7 @@
 #define _D_FIXED_WIDTH_NUMBER_DECORATOR_H_
 
 #include "NumberDecorator.h"
-#include "Util.h"
+#include "util.h"
 
 namespace aria2 {
 

src/FtpConnection.cc

@@ -41,7 +41,7 @@
 #include "Request.h"
 #include "Segment.h"
 #include "Option.h"
-#include "Util.h"
+#include "util.h"
 #include "message.h"
 #include "prefs.h"
 #include "LogFactory.h"

src/FtpNegotiationCommand.cc

@@ -49,7 +49,7 @@
 #include "DlAbortEx.h"
 #include "message.h"
 #include "prefs.h"
-#include "Util.h"
+#include "util.h"
 #include "Option.h"
 #include "Logger.h"
 #include "Segment.h"

src/HandshakeExtensionMessage.cc

@@ -34,7 +34,7 @@
 /* copyright --> */
 #include "HandshakeExtensionMessage.h"
 #include "Peer.h"
-#include "Util.h"
+#include "util.h"
 #include "DlAbortEx.h"
 #include "LogFactory.h"
 #include "Logger.h"

src/HttpConnection.cc

@@ -36,7 +36,7 @@
 
 #include <sstream>
 
-#include "Util.h"
+#include "util.h"
 #include "message.h"
 #include "prefs.h"
 #include "LogFactory.h"

src/HttpHeader.cc

@@ -37,7 +37,7 @@
 #include <istream>
 
 #include "Range.h"
-#include "Util.h"
+#include "util.h"
 #include "A2STR.h"
 
 namespace aria2 {

src/HttpHeaderProcessor.cc

@@ -39,7 +39,7 @@
 
 #include "HttpHeader.h"
 #include "message.h"
-#include "Util.h"
+#include "util.h"
 #include "DlRetryEx.h"
 #include "DlAbortEx.h"
 #include "A2STR.h"

src/HttpRequest.cc

@@ -42,7 +42,7 @@
 #include "Range.h"
 #include "CookieStorage.h"
 #include "Option.h"
-#include "Util.h"
+#include "util.h"
 #include "Base64.h"
 #include "prefs.h"
 #include "AuthConfigFactory.h"

src/HttpRequestCommand.cc

@@ -48,7 +48,7 @@
 #include "Socket.h"
 #include "prefs.h"
 #include "a2functional.h"
-#include "Util.h"
+#include "util.h"
 #include "CookieStorage.h"
 #include "AuthConfigFactory.h"
 #include "AuthConfig.h"

src/HttpResponse.cc

@@ -43,7 +43,7 @@
 #include "Range.h"
 #include "LogFactory.h"
 #include "Logger.h"
-#include "Util.h"
+#include "util.h"
 #include "message.h"
 #include "DlAbortEx.h"
 #include "DlRetryEx.h"

src/HttpResponseCommand.cc

@@ -50,7 +50,7 @@
 #include "DefaultBtProgressInfoFile.h"
 #include "DownloadFailureException.h"
 #include "DlAbortEx.h"
-#include "Util.h"
+#include "util.h"
 #include "File.h"
 #include "Option.h"
 #include "Logger.h"

src/HttpServer.cc

@@ -41,7 +41,7 @@
 #include "HttpHeaderProcessor.h"
 #include "DlAbortEx.h"
 #include "message.h"
-#include "Util.h"
+#include "util.h"
 #include "LogFactory.h"
 #include "Logger.h"
 #include "Base64.h"

src/HttpServerCommand.cc

@@ -45,7 +45,7 @@
 #include "RecoverableException.h"
 #include "prefs.h"
 #include "Option.h"
-#include "Util.h"
+#include "util.h"
 #include "DownloadContext.h"
 
 namespace aria2 {

src/HttpSkipResponseCommand.cc

@@ -44,7 +44,7 @@
 #include "Logger.h"
 #include "HttpRequest.h"
 #include "Segment.h"
-#include "Util.h"
+#include "util.h"
 #include "StringFormat.h"
 #include "DlAbortEx.h"
 #include "HttpHeader.h"

src/IndexBtMessage.cc

@@ -33,7 +33,7 @@
  */
 /* copyright --> */
 #include "IndexBtMessage.h"
-#include "Util.h"
+#include "util.h"
 #include "a2functional.h"
 #include "bittorrent_helper.h"
 

src/IteratableChecksumValidator.cc

@@ -36,7 +36,7 @@
 
 #include <cstdlib>
 
-#include "Util.h"
+#include "util.h"
 #include "message.h"
 #include "PieceStorage.h"
 #include "messageDigest.h"

src/IteratableChunkChecksumValidator.cc

@@ -38,7 +38,7 @@
 #include <cstring>
 #include <cstdlib>
 
-#include "Util.h"
+#include "util.h"
 #include "message.h"
 #include "MessageDigestHelper.h"
 #include "DiskAdaptor.h"

src/MSEHandshake.cc

@@ -49,7 +49,7 @@
 #include "ARC4Decryptor.h"
 #include "MessageDigestHelper.h"
 #include "SimpleRandomizer.h"
-#include "Util.h"
+#include "util.h"
 #include "DownloadContext.h"
 #include "prefs.h"
 #include "Option.h"

src/Makefile.am

@@ -30,7 +30,7 @@ SRCS =  Socket.h\
 	GrowSegment.cc GrowSegment.h\
 	PiecedSegment.cc PiecedSegment.h\
 	SegmentMan.cc SegmentMan.h\
-	Util.cc Util.h\
+	util.cc util.h\
 	Request.cc Request.h\
 	common.h\
 	message.h\

src/Makefile.in

@@ -312,7 +312,7 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	FtpTunnelResponseCommand.h SleepCommand.cc SleepCommand.h \
 	DownloadEngine.cc DownloadEngine.h Segment.h GrowSegment.cc \
 	GrowSegment.h PiecedSegment.cc PiecedSegment.h SegmentMan.cc \
-	SegmentMan.h Util.cc Util.h Request.cc Request.h common.h \
+	SegmentMan.h util.cc util.h Request.cc Request.h common.h \
 	message.h Exception.cc Exception.h FatalException.h \
 	RecoverableException.h DlAbortEx.h DlRetryEx.h \
 	DownloadFailureException.h Logger.cc Logger.h SimpleLogger.cc \
@@ -739,7 +739,7 @@ am__objects_27 = SocketCore.$(OBJEXT) Command.$(OBJEXT) \
 	FtpTunnelRequestCommand.$(OBJEXT) \
 	FtpTunnelResponseCommand.$(OBJEXT) SleepCommand.$(OBJEXT) \
 	DownloadEngine.$(OBJEXT) GrowSegment.$(OBJEXT) \
-	PiecedSegment.$(OBJEXT) SegmentMan.$(OBJEXT) Util.$(OBJEXT) \
+	PiecedSegment.$(OBJEXT) SegmentMan.$(OBJEXT) util.$(OBJEXT) \
 	Request.$(OBJEXT) Exception.$(OBJEXT) Logger.$(OBJEXT) \
 	SimpleLogger.$(OBJEXT) AbstractDiskWriter.$(OBJEXT) \
 	DefaultDiskWriter.$(OBJEXT) DefaultDiskWriterFactory.$(OBJEXT) \
@@ -1038,7 +1038,7 @@ SRCS = Socket.h SocketCore.cc SocketCore.h BinaryStream.h Command.cc \
 	FtpTunnelResponseCommand.h SleepCommand.cc SleepCommand.h \
 	DownloadEngine.cc DownloadEngine.h Segment.h GrowSegment.cc \
 	GrowSegment.h PiecedSegment.cc PiecedSegment.h SegmentMan.cc \
-	SegmentMan.h Util.cc Util.h Request.cc Request.h common.h \
+	SegmentMan.h util.cc util.h Request.cc Request.h common.h \
 	message.h Exception.cc Exception.h FatalException.h \
 	RecoverableException.h DlAbortEx.h DlRetryEx.h \
 	DownloadFailureException.h Logger.cc Logger.h SimpleLogger.cc \
@@ -1514,7 +1514,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UTPexExtensionMessage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnknownLengthPieceStorage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UriListParser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Util.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XML2SAXMetalinkProcessor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Xml2XmlRpcRequestProcessor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XmlRpcElements.Po@am__quote@
@@ -1544,6 +1543,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strptime.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timegm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version_usage.Po@am__quote@
 
 .c.o:

src/MessageDigestHelper.cc

@@ -37,7 +37,7 @@
 #include "DlAbortEx.h"
 #include "message.h"
 #include "DefaultDiskWriter.h"
-#include "Util.h"
+#include "util.h"
 #include "StringFormat.h"
 #include <cerrno>
 #include <cstring>

src/Metalink2RequestGroup.cc

@@ -41,7 +41,7 @@
 #include "LogFactory.h"
 #include "Logger.h"
 #include "prefs.h"
-#include "Util.h"
+#include "util.h"
 #include "message.h"
 #include "DownloadContext.h"
 #include "MetalinkHelper.h"

src/MetalinkEntry.cc

@@ -38,7 +38,7 @@
 
 #include "MetalinkResource.h"
 #include "FileEntry.h"
-#include "Util.h"
+#include "util.h"
 #include "a2functional.h"
 #ifdef ENABLE_MESSAGE_DIGEST
 # include "Checksum.h"

src/MetalinkParserController.cc

@@ -49,7 +49,7 @@
 # include "messageDigest.h"
 #endif // ENABLE_MESSAGE_DIGEST
 #include "Signature.h"
-#include "Util.h"
+#include "util.h"
 
 namespace aria2 {
 

src/MetalinkParserStateImpl.cc

@@ -35,7 +35,7 @@
 #include "MetalinkParserStateImpl.h"
 #include "MetalinkParserStateMachine.h"
 #include "RecoverableException.h"
-#include "Util.h"
+#include "util.h"
 
 namespace aria2 {
 

src/MultiDiskAdaptor.cc

@@ -40,7 +40,7 @@
 
 #include "DefaultDiskWriter.h"
 #include "message.h"
-#include "Util.h"
+#include "util.h"
 #include "FileEntry.h"
 #include "MultiFileAllocationIterator.h"
 #include "DefaultDiskWriterFactory.h"

src/MultiUrlRequestInfo.cc

@@ -47,7 +47,7 @@
 #include "DownloadEngineFactory.h"
 #include "RecoverableException.h"
 #include "message.h"
-#include "Util.h"
+#include "util.h"
 #include "Option.h"
 #include "StatCalc.h"
 #include "CookieStorage.h"

src/NameMatchOptionHandler.h

@@ -44,7 +44,7 @@
 #include <iterator>
 
 #include "A2STR.h"
-#include "Util.h"
+#include "util.h"
 #include "OptionHandlerException.h"
 
 #define NO_DESCRIPTION A2STR::NIL

src/NameResolver.cc

@@ -36,7 +36,7 @@
 #include "DlAbortEx.h"
 #include "message.h"
 #include "StringFormat.h"
-#include "Util.h"
+#include "util.h"
 #include <cstring>
 
 namespace aria2 {

src/Netrc.cc

@@ -41,7 +41,7 @@
 #include "DlAbortEx.h"
 #include "StringFormat.h"
 #include "A2STR.h"
-#include "Util.h"
+#include "util.h"
 
 namespace aria2 {
 

src/NsCookieParser.cc

@@ -37,7 +37,7 @@
 #include <fstream>
 #include <vector>
 
-#include "Util.h"
+#include "util.h"
 #include "A2STR.h"
 #include "DlAbortEx.h"
 #include "StringFormat.h"

src/OptionHandlerFactory.cc

@@ -38,7 +38,7 @@
 #include "array_fun.h"
 #include "usage_text.h"
 #include "A2STR.h"
-#include "Util.h"
+#include "util.h"
 #include "help_tags.h"
 #include "StringFormat.h"
 #include "File.h"

src/OptionHandlerImpl.h

@@ -45,7 +45,7 @@
 #include <iterator>
 
 #include "NameMatchOptionHandler.h"
-#include "Util.h"
+#include "util.h"
 #include "DlAbortEx.h"
 #include "prefs.h"
 #include "Option.h"

src/OptionParser.cc

@@ -41,7 +41,7 @@
 #include <istream>
 #include <utility>
 
-#include "Util.h"
+#include "util.h"
 #include "OptionHandlerImpl.h"
 #include "Option.h"
 #include "A2STR.h"

src/ParameterizedStringParser.cc

@@ -37,7 +37,7 @@
 #include <utility>
 
 #include "DlAbortEx.h"
-#include "Util.h"
+#include "util.h"
 #include "PStringSegment.h"
 #include "PStringSelect.h"
 #include "PStringNumLoop.h"

src/Peer.cc

@@ -37,7 +37,7 @@
 #include <cstring>
 #include <cassert>
 
-#include "Util.h"
+#include "util.h"
 #include "a2functional.h"
 #include "PeerSessionResource.h"
 #ifdef ENABLE_MESSAGE_DIGEST