--- IO-AIO/AIO.xs	2009/06/30 07:33:58	1.149
+++ IO-AIO/AIO.xs	2009/07/14 00:32:27	1.152
@@ -6,6 +6,8 @@
 #include "perl.h"
 #include "XSUB.h"
 
+#include "schmorp.h"
+
 #include <stddef.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -533,19 +535,8 @@
 static SV *
 get_cb (SV *cb_sv)
 {
-  HV *st;
-  GV *gvp;
-  CV *cv;
-
-  if (!SvOK (cb_sv))
-    return 0;
-
-  cv = sv_2cv (cb_sv, &st, &gvp, 0);
-
-  if (!cv)
-    croak ("IO::AIO callback must be undef or a CODE reference");
-
-  return (SV *)cv;
+  SvGETMAGIC (cb_sv);
+  return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
 }
 
 #define dREQ							\
@@ -571,17 +562,6 @@
   if (GIMME_V != G_VOID)					\
     XPUSHs (req_sv (req, AIO_REQ_KLASS));
 
-static int
-extract_fd (SV *fh, int wr)
-{
-  int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
-
-  if (fd < 0)
-    croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
-
-  return fd;
-}
-
 MODULE = IO::AIO                PACKAGE = IO::AIO
 
 PROTOTYPES: ENABLE
@@ -704,7 +684,7 @@
            aio_fdatasync = EIO_FDATASYNC
 	PPCODE:
 {
-  	int fd = extract_fd (fh, 0);
+  	int fd = s_fileno_croak (fh, 0);
         dREQ;
 
         req->type = ix;
@@ -719,7 +699,7 @@
 	PROTOTYPE: $$$$;$
 	PPCODE:
 {
-  	int fd = extract_fd (fh, 0);
+  	int fd = s_fileno_croak (fh, 0);
         dREQ;
 
         req->type = EIO_SYNC_FILE_RANGE;
@@ -738,7 +718,7 @@
 	PPCODE:
 {
         static int close_pipe = -1; /* dummy fd to close fds via dup2 */
-  	int fd = extract_fd (fh, 0);
+  	int fd = s_fileno_croak (fh, 0);
         dREQ;
 
         if (close_pipe < 0)
@@ -770,7 +750,7 @@
         PPCODE:
 {
         STRLEN svlen;
-        int fd = extract_fd (fh, ix == EIO_WRITE);
+        int fd = s_fileno_croak (fh, ix == EIO_WRITE);
         char *svptr = SvPVbyte (data, svlen);
         UV len = SvUV (length);
 
@@ -835,8 +815,8 @@
 	PROTOTYPE: $$$$;$
         PPCODE:
 {
-  	int ifd = extract_fd (in_fh , 0);
-  	int ofd = extract_fd (out_fh, 0);
+  	int ifd = s_fileno_croak (in_fh , 0);
+  	int ofd = s_fileno_croak (out_fh, 1);
 	dREQ;
 
         req->type = EIO_SENDFILE;
@@ -855,7 +835,7 @@
 	PROTOTYPE: $$$;$
         PPCODE:
 {
-  	int fd = extract_fd (fh, 0);
+  	int fd = s_fileno_croak (fh, 0);
 	dREQ;
 
         req->type = EIO_READAHEAD;
@@ -1195,13 +1175,11 @@
 fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
         PROTOTYPE: $$$$
         CODE:
-{
-	#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
+#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
         RETVAL = posix_fadvise (fh, offset, length, advice);
-	#else
+#else
         RETVAL = errno = ENOSYS;
-	#endif
-}
+#endif
 	OUTPUT:
         RETVAL
 
@@ -1234,7 +1212,7 @@
 
         if (items > 1)
           {
-            SV *cb_cv = get_cb (callback);
+            SV *cb_cv =get_cb (callback);
 
             SvREFCNT_dec (req->callback);
             req->callback = SvREFCNT_inc (cb_cv);