Socket: BUGFIX: Move incorrect v-function call out of FileBody destructor

[senf.git] / Socket / FileHandle.cc

diff --git a/Socket/FileHandle.cc b/Socket/FileHandle.cc
index 2872469..4ce3835 100644 (file)
--- a/Socket/FileHandle.cc
+++ b/Socket/FileHandle.cc
@@ -38,6 +38,36 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+///////////////////////////////////////////////////////////////////////////
+// senf::FileBody
+
+prefix_ void senf::FileBody::close()
+{
+    if (!valid())
+        throwErrno(EBADF);
+    v_close();
+    fd_ = -1;
+}
+
+prefix_ void senf::FileBody::terminate()
+{
+    if (valid()) {
+        v_terminate();
+        fd_ = -1;
+    }
+}
+
+prefix_ void senf::FileBody::destroyClose()
+{
+    if (valid())
+        try {
+            close();
+        }
+        catch (...) {
+            terminate();
+        }
+}
+
 prefix_ void senf::FileBody::v_close()
 {
     if (::close(fd_) != 0)