Move simplified function to setup file-writing backends to pio_interface.c.

src/pio.c

@@ -2,22 +2,10 @@
 #include "config.h"
 #endif
 
-
-#include <ctype.h>
-#include <yaxt.h>
-
-#include "file.h"
 #include "cdi_int.h"
-#include "namespace.h"
-
 #include "pio.h"
-#include "cdi.h"
 #include "cdipio.h"
-#include "pio_comm.h"
 #include "pio_impl.h"
-#include "pio_interface.h"
-#include "pio_rpc.h"
-#include "pio_util.h"
 
 const char *const cdiPioCmdStrTab[] = {
   "IO_Open_file",
@@ -28,45 +16,6 @@ const char *const cdiPioCmdStrTab[] = {
   "IO_Finalize"
 };
 
-/***************************************************************/
-
-void cdiPioFileWritingInit(void)
-{
-  int IOMode = commInqIOMode ();
-
-  xassert ( IOMode != PIO_NONE  || commInqSizeGlob() == 1 );
-
-  switch ( IOMode )
-    {
-    case PIO_NONE:
-      break;
-    case PIO_MPI:
-      initMPINONB();
-      break;
-#ifndef _SX
-    case PIO_ASYNCH:
-#endif
-    case PIO_WRITER:
-      pioSendInitialize();
-      break;
-    case PIO_FPGUARD:
-      initPOSIXFPGUARDSENDRECV();
-      break;
-    }
-}
-
-/***************************************************************/
-
-static void cdiPioFileWritingFinalizeDefault(void)
-{
-  xabort("error: failed to setup file writing finalization function!");
-}
-
-void (*cdiPioFileWritingFinalize)(void) = cdiPioFileWritingFinalizeDefault;
-
-
-/***************************************************************/
-
 /*
  * Local Variables:
  * c-file-style: "Java"

src/pio.h

@@ -9,7 +9,6 @@
 #include <mpi.h>
 
 
-void cdiPioFileWritingInit(void);
 extern void (*cdiPioFileWritingFinalize)(void);
 
 #endif

src/pio_interface.c

@@ -19,6 +19,7 @@
 #include "pio.h"
 #include "pio_client.h"
 #include "pio_id_set.h"
+#include "pio_impl.h"
 #include "pio_serialize.h"
 #include "pio_interface.h"
 #include "pio_comm.h"
@@ -473,6 +474,8 @@ pioInit(MPI_Comm commGlob, int nProcsIO, int IOMode,
                     pioNamespace, partInflate, postCommSetupActions);
 }
 
+static void cdiPioFileWritingInit(void);
+
 MPI_Comm
 cdiPioInit(MPI_Comm commGlob, int IOMode, int clientServerRole,
            int *pioNamespace, float partInflate,
@@ -534,6 +537,39 @@ cdiPioInit(MPI_Comm commGlob, int IOMode, int clientServerRole,
   return commInqCommModel ();
 }
 
+static void
+cdiPioFileWritingInit(void)
+{
+  int IOMode = commInqIOMode ();
+
+  xassert ( IOMode != PIO_NONE  || commInqSizeGlob() == 1 );
+
+  switch ( IOMode )
+    {
+    case PIO_NONE:
+      break;
+    case PIO_MPI:
+      initMPINONB();
+      break;
+#ifndef _SX
+    case PIO_ASYNCH:
+#endif
+    case PIO_WRITER:
+      pioSendInitialize();
+      break;
+    case PIO_FPGUARD:
+      initPOSIXFPGUARDSENDRECV();
+      break;
+    }
+}
+
+static void cdiPioFileWritingFinalizeDefault(void)
+{
+  xabort("error: failed to setup file writing finalization function!");
+}
+
+void (*cdiPioFileWritingFinalize)(void) = cdiPioFileWritingFinalizeDefault;
+
 /*****************************************************************************/
 
 void  pioEndDef ( void )