Skip to content

Commit c0d4464

Browse files
dalcinldalcinl
committed
Use NULL as the return value of MPI_XXX_f2c routines
1 parent 50f666f commit c0d4464

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

‎mpi.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,8 +1173,6 @@ MPI_Fint MPI_Comm_c2f(MPI_Comm comm);
11731173
MPI_Comm MPI_Comm_f2c(MPI_Fint comm);
11741174
MPI_Fint MPI_Errhandler_c2f(MPI_Errhandler errhandler);
11751175
MPI_Errhandler MPI_Errhandler_f2c(MPI_Fint errhandler);
1176-
MPI_Fint MPI_Type_c2f(MPI_Datatype datatype);
1177-
MPI_Datatype MPI_Type_f2c(MPI_Fint datatype);
11781176
MPI_Fint MPI_File_c2f(MPI_File file);
11791177
MPI_File MPI_File_f2c(MPI_Fint file);
11801178
MPI_Fint MPI_Group_c2f(MPI_Group group);
@@ -1189,6 +1187,8 @@ MPI_Fint MPI_Request_c2f(MPI_Request request);
11891187
MPI_Request MPI_Request_f2c(MPI_Fint request);
11901188
MPI_Fint MPI_Session_c2f(MPI_Session session);
11911189
MPI_Session MPI_Session_f2c(MPI_Fint session);
1190+
MPI_Fint MPI_Type_c2f(MPI_Datatype datatype);
1191+
MPI_Datatype MPI_Type_f2c(MPI_Fint datatype);
11921192
MPI_Fint MPI_Win_c2f(MPI_Win win);
11931193
MPI_Win MPI_Win_f2c(MPI_Fint win);
11941194

@@ -1843,8 +1843,6 @@ MPI_Fint PMPI_Comm_c2f(MPI_Comm comm);
18431843
MPI_Comm PMPI_Comm_f2c(MPI_Fint comm);
18441844
MPI_Fint PMPI_Errhandler_c2f(MPI_Errhandler errhandler);
18451845
MPI_Errhandler PMPI_Errhandler_f2c(MPI_Fint errhandler);
1846-
MPI_Fint PMPI_Type_c2f(MPI_Datatype datatype);
1847-
MPI_Datatype PMPI_Type_f2c(MPI_Fint datatype);
18481846
MPI_Fint PMPI_File_c2f(MPI_File file);
18491847
MPI_File PMPI_File_f2c(MPI_Fint file);
18501848
MPI_Fint PMPI_Group_c2f(MPI_Group group);
@@ -1859,6 +1857,8 @@ MPI_Fint PMPI_Request_c2f(MPI_Request request);
18591857
MPI_Request PMPI_Request_f2c(MPI_Fint request);
18601858
MPI_Fint PMPI_Session_c2f(MPI_Session session);
18611859
MPI_Session PMPI_Session_f2c(MPI_Fint session);
1860+
MPI_Fint PMPI_Type_c2f(MPI_Datatype datatype);
1861+
MPI_Datatype PMPI_Type_f2c(MPI_Fint datatype);
18621862
MPI_Fint PMPI_Win_c2f(MPI_Win win);
18631863
MPI_Win PMPI_Win_f2c(MPI_Fint win);
18641864

‎mpistubs.c

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -596,27 +596,27 @@ int MPI_Status_f082c(const MPI_F08_status *f08_status, MPI_Status *c_status) { a
596596
int MPI_Status_f2f08(const MPI_Fint *f_status, MPI_F08_status *f08_status) { abort(); return 0; }
597597
int MPI_Status_f082f(const MPI_F08_status *f08_status, MPI_Fint *f_status) { abort(); return 0; }
598598
MPI_Fint MPI_Comm_c2f(MPI_Comm comm) { abort(); return 0; }
599-
MPI_Comm MPI_Comm_f2c(MPI_Fint comm) { abort(); return 0; }
599+
MPI_Comm MPI_Comm_f2c(MPI_Fint comm) { abort(); return NULL; }
600600
MPI_Fint MPI_Errhandler_c2f(MPI_Errhandler errhandler) { abort(); return 0; }
601-
MPI_Errhandler MPI_Errhandler_f2c(MPI_Fint errhandler) { abort(); return 0; }
602-
MPI_Fint MPI_Type_c2f(MPI_Datatype datatype) { abort(); return 0; }
603-
MPI_Datatype MPI_Type_f2c(MPI_Fint datatype) { abort(); return 0; }
601+
MPI_Errhandler MPI_Errhandler_f2c(MPI_Fint errhandler) { abort(); return NULL; }
604602
MPI_Fint MPI_File_c2f(MPI_File file) { abort(); return 0; }
605-
MPI_File MPI_File_f2c(MPI_Fint file) { abort(); return 0; }
603+
MPI_File MPI_File_f2c(MPI_Fint file) { abort(); return NULL; }
606604
MPI_Fint MPI_Group_c2f(MPI_Group group) { abort(); return 0; }
607-
MPI_Group MPI_Group_f2c(MPI_Fint group) { abort(); return 0; }
605+
MPI_Group MPI_Group_f2c(MPI_Fint group) { abort(); return NULL; }
608606
MPI_Fint MPI_Info_c2f(MPI_Info info) { abort(); return 0; }
609-
MPI_Info MPI_Info_f2c(MPI_Fint info) { abort(); return 0; }
607+
MPI_Info MPI_Info_f2c(MPI_Fint info) { abort(); return NULL; }
610608
MPI_Fint MPI_Message_c2f(MPI_Message message) { abort(); return 0; }
611-
MPI_Message MPI_Message_f2c(MPI_Fint message) { abort(); return 0; }
609+
MPI_Message MPI_Message_f2c(MPI_Fint message) { abort(); return NULL; }
612610
MPI_Fint MPI_Op_c2f(MPI_Op op) { abort(); return 0; }
613-
MPI_Op MPI_Op_f2c(MPI_Fint op) { abort(); return 0; }
611+
MPI_Op MPI_Op_f2c(MPI_Fint op) { abort(); return NULL; }
614612
MPI_Fint MPI_Request_c2f(MPI_Request request) { abort(); return 0; }
615-
MPI_Request MPI_Request_f2c(MPI_Fint request) { abort(); return 0; }
613+
MPI_Request MPI_Request_f2c(MPI_Fint request) { abort(); return NULL; }
616614
MPI_Fint MPI_Session_c2f(MPI_Session session) { abort(); return 0; }
617-
MPI_Session MPI_Session_f2c(MPI_Fint session) { abort(); return 0; }
615+
MPI_Session MPI_Session_f2c(MPI_Fint session) { abort(); return NULL; }
616+
MPI_Fint MPI_Type_c2f(MPI_Datatype datatype) { abort(); return 0; }
617+
MPI_Datatype MPI_Type_f2c(MPI_Fint datatype) { abort(); return NULL; }
618618
MPI_Fint MPI_Win_c2f(MPI_Win win) { abort(); return 0; }
619-
MPI_Win MPI_Win_f2c(MPI_Fint win) { abort(); return 0; }
619+
MPI_Win MPI_Win_f2c(MPI_Fint win) { abort(); return NULL; }
620620

621621
/* MPI_T functions */
622622
int MPI_T_category_changed(int *update_number) { abort(); return 0; }
@@ -1266,27 +1266,27 @@ int PMPI_Status_f082c(const MPI_F08_status *f08_status, MPI_Status *c_status) {
12661266
int PMPI_Status_f2f08(const MPI_Fint *f_status, MPI_F08_status *f08_status) { abort(); return 0; }
12671267
int PMPI_Status_f082f(const MPI_F08_status *f08_status, MPI_Fint *f_status) { abort(); return 0; }
12681268
MPI_Fint PMPI_Comm_c2f(MPI_Comm comm) { abort(); return 0; }
1269-
MPI_Comm PMPI_Comm_f2c(MPI_Fint comm) { abort(); return 0; }
1269+
MPI_Comm PMPI_Comm_f2c(MPI_Fint comm) { abort(); return NULL; }
12701270
MPI_Fint PMPI_Errhandler_c2f(MPI_Errhandler errhandler) { abort(); return 0; }
1271-
MPI_Errhandler PMPI_Errhandler_f2c(MPI_Fint errhandler) { abort(); return 0; }
1272-
MPI_Fint PMPI_Type_c2f(MPI_Datatype datatype) { abort(); return 0; }
1273-
MPI_Datatype PMPI_Type_f2c(MPI_Fint datatype) { abort(); return 0; }
1271+
MPI_Errhandler PMPI_Errhandler_f2c(MPI_Fint errhandler) { abort(); return NULL; }
12741272
MPI_Fint PMPI_File_c2f(MPI_File file) { abort(); return 0; }
1275-
MPI_File PMPI_File_f2c(MPI_Fint file) { abort(); return 0; }
1273+
MPI_File PMPI_File_f2c(MPI_Fint file) { abort(); return NULL; }
12761274
MPI_Fint PMPI_Group_c2f(MPI_Group group) { abort(); return 0; }
1277-
MPI_Group PMPI_Group_f2c(MPI_Fint group) { abort(); return 0; }
1275+
MPI_Group PMPI_Group_f2c(MPI_Fint group) { abort(); return NULL; }
12781276
MPI_Fint PMPI_Info_c2f(MPI_Info info) { abort(); return 0; }
1279-
MPI_Info PMPI_Info_f2c(MPI_Fint info) { abort(); return 0; }
1277+
MPI_Info PMPI_Info_f2c(MPI_Fint info) { abort(); return NULL; }
12801278
MPI_Fint PMPI_Message_c2f(MPI_Message message) { abort(); return 0; }
1281-
MPI_Message PMPI_Message_f2c(MPI_Fint message) { abort(); return 0; }
1279+
MPI_Message PMPI_Message_f2c(MPI_Fint message) { abort(); return NULL; }
12821280
MPI_Fint PMPI_Op_c2f(MPI_Op op) { abort(); return 0; }
1283-
MPI_Op PMPI_Op_f2c(MPI_Fint op) { abort(); return 0; }
1281+
MPI_Op PMPI_Op_f2c(MPI_Fint op) { abort(); return NULL; }
12841282
MPI_Fint PMPI_Request_c2f(MPI_Request request) { abort(); return 0; }
1285-
MPI_Request PMPI_Request_f2c(MPI_Fint request) { abort(); return 0; }
1283+
MPI_Request PMPI_Request_f2c(MPI_Fint request) { abort(); return NULL; }
12861284
MPI_Fint PMPI_Session_c2f(MPI_Session session) { abort(); return 0; }
1287-
MPI_Session PMPI_Session_f2c(MPI_Fint session) { abort(); return 0; }
1285+
MPI_Session PMPI_Session_f2c(MPI_Fint session) { abort(); return NULL; }
1286+
MPI_Fint PMPI_Type_c2f(MPI_Datatype datatype) { abort(); return 0; }
1287+
MPI_Datatype PMPI_Type_f2c(MPI_Fint datatype) { abort(); return NULL; }
12881288
MPI_Fint PMPI_Win_c2f(MPI_Win win) { abort(); return 0; }
1289-
MPI_Win PMPI_Win_f2c(MPI_Fint win) { abort(); return 0; }
1289+
MPI_Win PMPI_Win_f2c(MPI_Fint win) { abort(); return NULL; }
12901290

12911291
/* PMPI_T functions */
12921292
int PMPI_T_category_changed(int *update_number) { abort(); return 0; }

0 commit comments

Comments
 (0)