Moving close() from Socket to Handle

parrot · Nov 30, 2010 · 0428783 · 0428783
1 parent e844c4c
commit 0428783
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 24 deletions.
diff --git a/src/io/api.c b/src/io/api.c
@@ -198,8 +198,7 @@ Parrot_io_fdopen(PARROT_INTERP, ARGIN_NULLOK(PMC *pmc), PIOHANDLE fd,
 
 =item C<INTVAL Parrot_io_close(PARROT_INTERP, PMC *pmc)>
 
-Closes the filehandle object. Calls the C<close> method on the filehandle
-PMC object.
+Closes the handle object.
 
 =cut
 
@@ -219,6 +218,16 @@ Parrot_io_close(PARROT_INTERP, ARGMOD_NULLOK(PMC *pmc))
         result = Parrot_io_close_filehandle(interp, pmc);
         SETATTR_FileHandle_flags(interp, pmc, 0);
     }
+    else if (pmc->vtable->base_type == enum_class_Socket) {
+        result = -1;
+        if (PARROT_SOCKET(SELF)) {
+            Parrot_Socket_attributes *data_struct = PARROT_SOCKET(SELF);
+
+            if (data_struct->os_handle != PIO_INVALID_HANDLE)
+                result = Parrot_io_close_piohandle(INTERP, data_struct->os_handle);
+            data_struct->os_handle = PIO_INVALID_HANDLE;
+        }
+    }
     else
         Parrot_pcc_invoke_method_from_c_args(interp, pmc, CONST_STRING(interp, "close"), "->I", &result);
 

diff --git a/src/pmc/socket.pmc b/src/pmc/socket.pmc
@@ -198,28 +198,6 @@ connected socket object.]
 
 /*
 
-=item C<close()>
-
-Close a socket.
-
-=cut
-
-*/
-
-    METHOD close() {
-        INTVAL result = -1;
-        if (PARROT_SOCKET(SELF)) {
-            Parrot_Socket_attributes *data_struct = PARROT_SOCKET(SELF);
-
-            if (data_struct->os_handle != PIO_INVALID_HANDLE)
-                result = Parrot_io_close_piohandle(INTERP, data_struct->os_handle);
-            data_struct->os_handle = PIO_INVALID_HANDLE;
-        }
-        RETURN(INTVAL result);
-    }
-
-/*
-
 =item C<recv()>
 
 Receives a message from a connected socket object. It returns