i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Renamed DescriptorCloser to FileDescriptorCloser as suggested by Ingo.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37995 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-08-09 21:23:05 +00:00
parent f65256c2e7
commit cb7ce9a32f
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/shared/AutoDeleter.h
+6 -6
View File
@@ -11,7 +11,7 @@
ArrayDeleter - deletes an array ArrayDeleter - deletes an array
MemoryDeleter - free()s malloc()ed memory MemoryDeleter - free()s malloc()ed memory
CObjectDeleter - calls an arbitrary specified destructor function 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 { struct FileDescriptorCloser {
inline DescriptorCloser(int descriptor) inline FileDescriptorCloser(int descriptor)
: :
fDescriptor(descriptor) fDescriptor(descriptor)
{ {
} }
inline ~DescriptorCloser() inline ~FileDescriptorCloser()
{ {
if (fDescriptor >= 0) if (fDescriptor >= 0)
close(fDescriptor); close(fDescriptor);
@@ -254,7 +254,7 @@ using BPrivate::ArrayDeleter;
using BPrivate::MemoryDeleter; using BPrivate::MemoryDeleter;
using BPrivate::CObjectDeleter; using BPrivate::CObjectDeleter;
using BPrivate::MethodDeleter; using BPrivate::MethodDeleter;
using BPrivate::DescriptorCloser; using BPrivate::FileDescriptorCloser;
#endif // _AUTO_DELETER_H #endif // _AUTO_DELETER_H
src/kits/network/libnetapi/NetworkInterface.cpp
+3 -3
View File
@@ -21,7 +21,7 @@ do_ifaliasreq(const char* name, int32 option, BNetworkInterfaceAddress& address,
if (socket < 0) if (socket < 0)
return errno; return errno;
DescriptorCloser closer(socket); FileDescriptorCloser closer(socket);
ifaliasreq request; ifaliasreq request;
strlcpy(request.ifra_name, name, IF_NAMESIZE); strlcpy(request.ifra_name, name, IF_NAMESIZE);
@@ -65,7 +65,7 @@ do_request(ifreq& request, const char* name, int option)
if (socket < 0) if (socket < 0)
return errno; return errno;
DescriptorCloser closer(socket); FileDescriptorCloser closer(socket);
strlcpy(request.ifr_name, name, IF_NAMESIZE); strlcpy(request.ifr_name, name, IF_NAMESIZE);
@@ -331,7 +331,7 @@ BNetworkInterface::GetHardwareAddress(BNetworkAddress& address)
if (socket < 0) if (socket < 0)
return errno; return errno;
DescriptorCloser closer(socket); FileDescriptorCloser closer(socket);
ifreq request; ifreq request;
strlcpy(request.ifr_name, Name(), IF_NAMESIZE); strlcpy(request.ifr_name, Name(), IF_NAMESIZE);
src/kits/network/libnetapi/NetworkRoster.cpp
+2 -2
View File
@@ -32,7 +32,7 @@ BNetworkRoster::CountInterfaces() const
if (socket < 0) if (socket < 0)
return 0; return 0;
DescriptorCloser closer(socket); FileDescriptorCloser closer(socket);
ifconf config; ifconf config;
config.ifc_len = sizeof(config.ifc_value); config.ifc_len = sizeof(config.ifc_value);
@@ -58,7 +58,7 @@ BNetworkRoster::GetNextInterface(uint32* cookie,
if (socket < 0) if (socket < 0)
return errno; return errno;
DescriptorCloser closer(socket); FileDescriptorCloser closer(socket);
ifconf config; ifconf config;
config.ifc_len = sizeof(config.ifc_value); config.ifc_len = sizeof(config.ifc_value);