From cb7ce9a32f228cd69fd910424a7f2b405e2e22e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Mon, 9 Aug 2010 21:23:05 +0000
Subject: [PATCH] * Renamed DescriptorCloser to FileDescriptorCloser as
 suggested by Ingo.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37995 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/private/shared/AutoDeleter.h            | 12 ++++++------
 src/kits/network/libnetapi/NetworkInterface.cpp |  6 +++---
 src/kits/network/libnetapi/NetworkRoster.cpp    |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/headers/private/shared/AutoDeleter.h b/headers/private/shared/AutoDeleter.h
index fecdd54a02..339ba43a62 100644
--- a/headers/private/shared/AutoDeleter.h
+++ b/headers/private/shared/AutoDeleter.h
@@ -11,7 +11,7 @@
 	ArrayDeleter   - deletes an array
 	MemoryDeleter  - free()s malloc()ed memory
 	CObjectDeleter - calls an arbitrary specified destructor function
-	DescriptorCloser - closes a file descriptor
+	FileDescriptorCloser - closes a file descriptor
 */
 
 
@@ -221,16 +221,16 @@ struct MethodDeleter
 };
 
 
-// DescriptorCloser
+// FileDescriptorCloser
 
-struct DescriptorCloser {
-	inline DescriptorCloser(int descriptor)
+struct FileDescriptorCloser {
+	inline FileDescriptorCloser(int descriptor)
 		:
 		fDescriptor(descriptor)
 	{
 	}
 
-	inline ~DescriptorCloser()
+	inline ~FileDescriptorCloser()
 	{
 		if (fDescriptor >= 0)
 			close(fDescriptor);
@@ -254,7 +254,7 @@ using BPrivate::ArrayDeleter;
 using BPrivate::MemoryDeleter;
 using BPrivate::CObjectDeleter;
 using BPrivate::MethodDeleter;
-using BPrivate::DescriptorCloser;
+using BPrivate::FileDescriptorCloser;
 
 
 #endif	// _AUTO_DELETER_H
diff --git a/src/kits/network/libnetapi/NetworkInterface.cpp b/src/kits/network/libnetapi/NetworkInterface.cpp
index 95cc26db3f..52010bfe0a 100644
--- a/src/kits/network/libnetapi/NetworkInterface.cpp
+++ b/src/kits/network/libnetapi/NetworkInterface.cpp
@@ -21,7 +21,7 @@ do_ifaliasreq(const char* name, int32 option, BNetworkInterfaceAddress& address,
 	if (socket < 0)
 		return errno;
 
-	DescriptorCloser closer(socket);
+	FileDescriptorCloser closer(socket);
 
 	ifaliasreq request;
 	strlcpy(request.ifra_name, name, IF_NAMESIZE);
@@ -65,7 +65,7 @@ do_request(ifreq& request, const char* name, int option)
 	if (socket < 0)
 		return errno;
 
-	DescriptorCloser closer(socket);
+	FileDescriptorCloser closer(socket);
 
 	strlcpy(request.ifr_name, name, IF_NAMESIZE);
 
@@ -331,7 +331,7 @@ BNetworkInterface::GetHardwareAddress(BNetworkAddress& address)
 	if (socket < 0)
 		return errno;
 
-	DescriptorCloser closer(socket);
+	FileDescriptorCloser closer(socket);
 
 	ifreq request;
 	strlcpy(request.ifr_name, Name(), IF_NAMESIZE);
diff --git a/src/kits/network/libnetapi/NetworkRoster.cpp b/src/kits/network/libnetapi/NetworkRoster.cpp
index d3c0ae2e85..a10ba3e223 100644
--- a/src/kits/network/libnetapi/NetworkRoster.cpp
+++ b/src/kits/network/libnetapi/NetworkRoster.cpp
@@ -32,7 +32,7 @@ BNetworkRoster::CountInterfaces() const
 	if (socket < 0)
 		return 0;
 
-	DescriptorCloser closer(socket);
+	FileDescriptorCloser closer(socket);
 
 	ifconf config;
 	config.ifc_len = sizeof(config.ifc_value);
@@ -58,7 +58,7 @@ BNetworkRoster::GetNextInterface(uint32* cookie,
 	if (socket < 0)
 		return errno;
 
-	DescriptorCloser closer(socket);
+	FileDescriptorCloser closer(socket);
 
 	ifconf config;
 	config.ifc_len = sizeof(config.ifc_value);