[haiku-commits] r37995 - in haiku/trunk: headers/private/shared src/kits/network/libnetapi
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 9 Aug 2010 23:23:06 +0200 (CEST)
Author: axeld
Date: 2010-08-09 23:23:05 +0200 (Mon, 09 Aug 2010)
New Revision: 37995
Changeset: http://dev.haiku-os.org/changeset/37995
Modified:
haiku/trunk/headers/private/shared/AutoDeleter.h
haiku/trunk/src/kits/network/libnetapi/NetworkInterface.cpp
haiku/trunk/src/kits/network/libnetapi/NetworkRoster.cpp
Log:
* Renamed DescriptorCloser to FileDescriptorCloser as suggested by Ingo.
Modified: haiku/trunk/headers/private/shared/AutoDeleter.h
===================================================================
--- haiku/trunk/headers/private/shared/AutoDeleter.h 2010-08-09 19:12:51 UTC
(rev 37994)
+++ haiku/trunk/headers/private/shared/AutoDeleter.h 2010-08-09 21:23:05 UTC
(rev 37995)
@@ -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 @@
};
-// 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::MemoryDeleter;
using BPrivate::CObjectDeleter;
using BPrivate::MethodDeleter;
-using BPrivate::DescriptorCloser;
+using BPrivate::FileDescriptorCloser;
#endif // _AUTO_DELETER_H
Modified: haiku/trunk/src/kits/network/libnetapi/NetworkInterface.cpp
===================================================================
--- haiku/trunk/src/kits/network/libnetapi/NetworkInterface.cpp 2010-08-09
19:12:51 UTC (rev 37994)
+++ haiku/trunk/src/kits/network/libnetapi/NetworkInterface.cpp 2010-08-09
21:23:05 UTC (rev 37995)
@@ -21,7 +21,7 @@
if (socket < 0)
return errno;
- DescriptorCloser closer(socket);
+ FileDescriptorCloser closer(socket);
ifaliasreq request;
strlcpy(request.ifra_name, name, IF_NAMESIZE);
@@ -65,7 +65,7 @@
if (socket < 0)
return errno;
- DescriptorCloser closer(socket);
+ FileDescriptorCloser closer(socket);
strlcpy(request.ifr_name, name, IF_NAMESIZE);
@@ -331,7 +331,7 @@
if (socket < 0)
return errno;
- DescriptorCloser closer(socket);
+ FileDescriptorCloser closer(socket);
ifreq request;
strlcpy(request.ifr_name, Name(), IF_NAMESIZE);
Modified: haiku/trunk/src/kits/network/libnetapi/NetworkRoster.cpp
===================================================================
--- haiku/trunk/src/kits/network/libnetapi/NetworkRoster.cpp 2010-08-09
19:12:51 UTC (rev 37994)
+++ haiku/trunk/src/kits/network/libnetapi/NetworkRoster.cpp 2010-08-09
21:23:05 UTC (rev 37995)
@@ -32,7 +32,7 @@
if (socket < 0)
return 0;
- DescriptorCloser closer(socket);
+ FileDescriptorCloser closer(socket);
ifconf config;
config.ifc_len = sizeof(config.ifc_value);
@@ -58,7 +58,7 @@
if (socket < 0)
return errno;
- DescriptorCloser closer(socket);
+ FileDescriptorCloser closer(socket);
ifconf config;
config.ifc_len = sizeof(config.ifc_value);
Other related posts:
- » [haiku-commits] r37995 - in haiku/trunk: headers/private/shared src/kits/network/libnetapi - axeld
