Fixed use of F77_xerbla in CBLAS testing framework

ACSimon33 · ACSimon33 · commit 4f504e0236f5 · 2024-06-19T19:29:01.000+01:00
diff --git a/CBLAS/testing/c_c2chke.c b/CBLAS/testing/c_c2chke.c
@@ -8,14 +8,14 @@ CBLAS_INT link_xerbla=TRUE;
 char *cblas_rout;
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo);
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
 void F77_xerbla(char *srname, void *vinfo
+#endif
 #ifdef BLAS_FORTRAN_STRLEN_END
   , FORTRAN_STRLEN
 #endif
 );
-#endif
 
 void chkxer(void) {
    extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
@@ -48,7 +48,7 @@ void F77_c2chke(char *rout
    if (link_xerbla) /* call these first to link */
    {
       cblas_xerbla(cblas_info,cblas_rout,"");
-      F77_xerbla(cblas_rout,&cblas_info);
+      F77_xerbla(cblas_rout,&cblas_info, 1);
    }
 #endif
 
diff --git a/CBLAS/testing/c_c3chke.c b/CBLAS/testing/c_c3chke.c
@@ -8,14 +8,14 @@ CBLAS_INT link_xerbla=TRUE;
 char *cblas_rout;
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo);
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
 void F77_xerbla(char *srname, void *vinfo
+#endif
 #ifdef BLAS_FORTRAN_STRLEN_END
   , FORTRAN_STRLEN
 #endif
 );
-#endif
 
 void chkxer(void) {
    extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
@@ -51,7 +51,7 @@ void  F77_c3chke(char *  rout
    if (link_xerbla) /* call these first to link */
    {
       cblas_xerbla(cblas_info,cblas_rout,"");
-      F77_xerbla(cblas_rout,&cblas_info);
+      F77_xerbla(cblas_rout,&cblas_info, 1);
    }
 #endif
 
diff --git a/CBLAS/testing/c_d2chke.c b/CBLAS/testing/c_d2chke.c
@@ -8,14 +8,14 @@ CBLAS_INT link_xerbla=TRUE;
 char *cblas_rout;
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo);
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
 void F77_xerbla(char *srname, void *vinfo
+#endif
 #ifdef BLAS_FORTRAN_STRLEN_END
   , FORTRAN_STRLEN
 #endif
 );
-#endif
 
 void chkxer(void) {
    extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
@@ -46,7 +46,7 @@ void F77_d2chke(char *rout
    if (link_xerbla) /* call these first to link */
    {
       cblas_xerbla(cblas_info,cblas_rout,"");
-      F77_xerbla(cblas_rout,&cblas_info);
+      F77_xerbla(cblas_rout,&cblas_info, 1);
    }
 #endif
 
diff --git a/CBLAS/testing/c_d3chke.c b/CBLAS/testing/c_d3chke.c
@@ -8,14 +8,14 @@ CBLAS_INT link_xerbla=TRUE;
 char *cblas_rout;
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo);
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
 void F77_xerbla(char *srname, void *vinfo
+#endif
 #ifdef BLAS_FORTRAN_STRLEN_END
   , FORTRAN_STRLEN
 #endif
 );
-#endif
 
 void chkxer(void) {
    extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
@@ -46,7 +46,7 @@ void F77_d3chke(char *rout
    if (link_xerbla) /* call these first to link */
    {
       cblas_xerbla(cblas_info,cblas_rout,"");
-      F77_xerbla(cblas_rout,&cblas_info);
+      F77_xerbla(cblas_rout,&cblas_info, 1);
    }
 #endif
 
diff --git a/CBLAS/testing/c_s2chke.c b/CBLAS/testing/c_s2chke.c
@@ -8,14 +8,14 @@ CBLAS_INT link_xerbla=TRUE;
 char *cblas_rout;
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo);
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
 void F77_xerbla(char *srname, void *vinfo
+#endif
 #ifdef BLAS_FORTRAN_STRLEN_END
   , FORTRAN_STRLEN
 #endif
 );
-#endif
 
 void chkxer(void) {
    extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
diff --git a/CBLAS/testing/c_s3chke.c b/CBLAS/testing/c_s3chke.c
@@ -8,14 +8,14 @@ CBLAS_INT link_xerbla=TRUE;
 char *cblas_rout;
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo);
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
 void F77_xerbla(char *srname, void *vinfo
+#endif
 #ifdef BLAS_FORTRAN_STRLEN_END
   , FORTRAN_STRLEN
 #endif
 );
-#endif
 
 void chkxer(void) {
    extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
@@ -46,7 +46,7 @@ void F77_s3chke(char *rout
    if (link_xerbla) /* call these first to link */
    {
       cblas_xerbla(cblas_info,cblas_rout,"");
-      F77_xerbla(cblas_rout,&cblas_info);
+      F77_xerbla(cblas_rout,&cblas_info, 1);
    }
 #endif
 
diff --git a/CBLAS/testing/c_xerbla.c b/CBLAS/testing/c_xerbla.c
@@ -85,14 +85,14 @@ void cblas_xerbla(CBLAS_INT info, const char *rout, const char *form, ...)
 }
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo)
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
 void F77_xerbla(char *srname, void *vinfo
+#endif
 #ifdef BLAS_FORTRAN_STRLEN_END
 , FORTRAN_STRLEN
 #endif
 )
-#endif
 {
 #ifdef F77_Char
    char *srname;
diff --git a/CBLAS/testing/c_z2chke.c b/CBLAS/testing/c_z2chke.c
@@ -8,14 +8,14 @@ CBLAS_INT link_xerbla=TRUE;
 char *cblas_rout;
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo);
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
 void F77_xerbla(char *srname, void *vinfo
+#endif
 #ifdef BLAS_FORTRAN_STRLEN_END
   , FORTRAN_STRLEN
 #endif
 );
-#endif
 
 void chkxer(void) {
    extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
@@ -48,7 +48,7 @@ void F77_z2chke(char *rout
    if (link_xerbla) /* call these first to link */
    {
       cblas_xerbla(cblas_info,cblas_rout,"");
-      F77_xerbla(cblas_rout,&cblas_info);
+      F77_xerbla(cblas_rout,&cblas_info, 1);
    }
 #endif
 
diff --git a/CBLAS/testing/c_z3chke.c b/CBLAS/testing/c_z3chke.c
@@ -8,14 +8,14 @@ CBLAS_INT link_xerbla=TRUE;
 char *cblas_rout;
 
 #ifdef F77_Char
-void F77_xerbla(F77_Char F77_srname, void *vinfo);
+void F77_xerbla(F77_Char F77_srname, void *vinfo
 #else
 void F77_xerbla(char *srname, void *vinfo
+#endif
 #ifdef BLAS_FORTRAN_STRLEN_END
   , FORTRAN_STRLEN
 #endif
 );
-#endif
 
 void chkxer(void) {
    extern CBLAS_INT cblas_ok, cblas_lerr, cblas_info;
@@ -51,7 +51,7 @@ void F77_z3chke(char *rout
    if (link_xerbla) /* call these first to link */
    {
       cblas_xerbla(cblas_info,cblas_rout,"");
-      F77_xerbla(cblas_rout,&cblas_info);
+      F77_xerbla(cblas_rout,&cblas_info, 1);
    }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -85,14 +85,14 @@ void cblas_xerbla(CBLAS_INT info, const char rout, const char form, ...)`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`#ifdef F77_Char`
`88`		`-void F77_xerbla(F77_Char F77_srname, void *vinfo)`
	`88`	`+void F77_xerbla(F77_Char F77_srname, void *vinfo`
`89`	`89`	`#else`
`90`	`90`	`void F77_xerbla(char srname, void vinfo`
	`91`	`+#endif`
`91`	`92`	`#ifdef BLAS_FORTRAN_STRLEN_END`
`92`	`93`	`, FORTRAN_STRLEN`
`93`	`94`	`#endif`
`94`	`95`	`)`
`95`		`-#endif`
`96`	`96`	`{`
`97`	`97`	`#ifdef F77_Char`
`98`	`98`	`char *srname;`