Merge pull request #2253 from thrasibule/xerbla

martin-frbg · web-flow · commit d65e9a2bbd6c · 2020-01-18T20:39:04.000+01:00
fix error messages
diff --git a/interface/lapack/gesv.c b/interface/lapack/gesv.c
@@ -44,19 +44,19 @@
 
 #ifndef COMPLEX
 #ifdef XDOUBLE
-#define ERROR_NAME "QGESV  "
+#define ERROR_NAME "QGESV"
 #elif defined(DOUBLE)
-#define ERROR_NAME "DGESV  "
+#define ERROR_NAME "DGESV"
 #else
-#define ERROR_NAME "SGESV  "
+#define ERROR_NAME "SGESV"
 #endif
 #else
 #ifdef XDOUBLE
-#define ERROR_NAME "XGESV  "
+#define ERROR_NAME "XGESV"
 #elif defined(DOUBLE)
-#define ERROR_NAME "ZGESV  "
+#define ERROR_NAME "ZGESV"
 #else
-#define ERROR_NAME "CGESV  "
+#define ERROR_NAME "CGESV"
 #endif
 #endif
 
@@ -89,7 +89,7 @@ int NAME(blasint *N, blasint *NRHS, FLOAT *a, blasint *ldA, blasint *ipiv,
   if (args.m   < 0)             info = 1;
 
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }
diff --git a/interface/lapack/getf2.c b/interface/lapack/getf2.c
@@ -74,7 +74,7 @@ int NAME(blasint *M, blasint *N, FLOAT *a, blasint *ldA, blasint *ipiv, blasint
   if (args.n   < 0)             info = 2;
   if (args.m   < 0)             info = 1;
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }
diff --git a/interface/lapack/getrf.c b/interface/lapack/getrf.c
@@ -74,7 +74,7 @@ int NAME(blasint *M, blasint *N, FLOAT *a, blasint *ldA, blasint *ipiv, blasint
   if (args.n   < 0)             info = 2;
   if (args.m   < 0)             info = 1;
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }
diff --git a/interface/lapack/getrs.c b/interface/lapack/getrs.c
@@ -102,7 +102,7 @@ int NAME(char *TRANS, blasint *N, blasint *NRHS, FLOAT *a, blasint *ldA,
   if (trans     < 0) info = 1;
 
   if (info != 0) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     return 0;
   }
 
diff --git a/interface/lapack/lauu2.c b/interface/lapack/lauu2.c
@@ -90,7 +90,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){
   if (args.n   < 0)             info = 2;
   if (uplo     < 0)             info = 1;
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }
diff --git a/interface/lapack/lauum.c b/interface/lapack/lauum.c
@@ -90,7 +90,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){
   if (args.n   < 0)             info = 2;
   if (uplo     < 0)             info = 1;
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }
diff --git a/interface/lapack/potf2.c b/interface/lapack/potf2.c
@@ -90,7 +90,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){
   if (args.n   < 0)             info = 2;
   if (uplo     < 0)             info = 1;
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }
diff --git a/interface/lapack/potrf.c b/interface/lapack/potrf.c
@@ -90,7 +90,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){
   if (args.n   < 0)             info = 2;
   if (uplo     < 0)             info = 1;
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }
diff --git a/interface/lapack/potri.c b/interface/lapack/potri.c
@@ -99,7 +99,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){
   if (uplo < 0)                  info = 1;
 
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }
diff --git a/interface/lapack/trti2.c b/interface/lapack/trti2.c
@@ -96,7 +96,7 @@ int NAME(char *UPLO, char *DIAG, blasint *N, FLOAT *a, blasint *ldA, blasint *In
   if (diag < 0)                  info = 2;
   if (uplo < 0)                  info = 1;
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }
diff --git a/interface/lapack/trtri.c b/interface/lapack/trtri.c
@@ -99,7 +99,7 @@ int NAME(char *UPLO, char *DIAG, blasint *N, FLOAT *a, blasint *ldA, blasint *In
   if (diag < 0)                  info = 2;
   if (uplo < 0)                  info = 1;
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }
diff --git a/interface/lapack/zgetf2.c b/interface/lapack/zgetf2.c
@@ -74,7 +74,7 @@ int NAME(blasint *M, blasint *N, FLOAT *a, blasint *ldA, blasint *ipiv, blasint
   if (args.n   < 0)             info = 2;
   if (args.m   < 0)             info = 1;
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }
diff --git a/interface/lapack/zgetrf.c b/interface/lapack/zgetrf.c
@@ -74,7 +74,7 @@ int NAME(blasint *M, blasint *N, FLOAT *a, blasint *ldA, blasint *ipiv, blasint
   if (args.n   < 0)             info = 2;
   if (args.m   < 0)             info = 1;
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }
diff --git a/interface/lapack/zgetrs.c b/interface/lapack/zgetrs.c
@@ -102,7 +102,7 @@ int NAME(char *TRANS, blasint *N, blasint *NRHS, FLOAT *a, blasint *ldA,
   if (trans     < 0) info = 1;
 
   if (info != 0) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     return 0;
   }
 
diff --git a/interface/lapack/zlauu2.c b/interface/lapack/zlauu2.c
@@ -91,7 +91,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){
   if (args.n   < 0)             info = 2;
   if (uplo     < 0)             info = 1;
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }
diff --git a/interface/lapack/zpotf2.c b/interface/lapack/zpotf2.c
@@ -91,7 +91,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){
   if (args.n   < 0)             info = 2;
   if (uplo     < 0)             info = 1;
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }
diff --git a/interface/lapack/zpotrf.c b/interface/lapack/zpotrf.c
@@ -90,7 +90,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){
   if (args.n   < 0)             info = 2;
   if (uplo     < 0)             info = 1;
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }
diff --git a/interface/lapack/zpotri.c b/interface/lapack/zpotri.c
@@ -99,7 +99,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){
   if (uplo < 0)                  info = 1;
 
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }
diff --git a/interface/lapack/ztrti2.c b/interface/lapack/ztrti2.c
@@ -96,7 +96,7 @@ int NAME(char *UPLO, char *DIAG, blasint *N, FLOAT *a, blasint *ldA, blasint *In
   if (diag < 0)                  info = 2;
   if (uplo < 0)                  info = 1;
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }
diff --git a/interface/lapack/ztrtri.c b/interface/lapack/ztrtri.c
@@ -96,7 +96,7 @@ int NAME(char *UPLO, char *DIAG, blasint *N, FLOAT *a, blasint *ldA, blasint *In
   if (diag < 0)                  info = 2;
   if (uplo < 0)                  info = 1;
   if (info) {
-    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));
+    BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);
     *Info = - info;
     return 0;
   }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ int NAME(blasint M, blasint N, FLOAT a, blasint ldA, blasint *ipiv, blasint`
`74`	`74`	`if (args.n < 0) info = 2;`
`75`	`75`	`if (args.m < 0) info = 1;`
`76`	`76`	`if (info) {`
`77`		`- BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));`
	`77`	`+ BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);`
`78`	`78`	`*Info = - info;`
`79`	`79`	`return 0;`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ int NAME(char TRANS, blasint N, blasint NRHS, FLOAT a, blasint *ldA,`
`102`	`102`	`if (trans < 0) info = 1;`
`103`	`103`
`104`	`104`	`if (info != 0) {`
`105`		`- BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));`
	`105`	`+ BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);`
`106`	`106`	`return 0;`
`107`	`107`	`}`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ int NAME(char UPLO, blasint N, FLOAT a, blasint ldA, blasint *Info){`
`90`	`90`	`if (args.n < 0) info = 2;`
`91`	`91`	`if (uplo < 0) info = 1;`
`92`	`92`	`if (info) {`
`93`		`- BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));`
	`93`	`+ BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);`
`94`	`94`	`*Info = - info;`
`95`	`95`	`return 0;`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ int NAME(char UPLO, blasint N, FLOAT a, blasint ldA, blasint *Info){`
`99`	`99`	`if (uplo < 0) info = 1;`
`100`	`100`
`101`	`101`	`if (info) {`
`102`		`- BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));`
	`102`	`+ BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);`
`103`	`103`	`*Info = - info;`
`104`	`104`	`return 0;`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ int NAME(char UPLO, char DIAG, blasint N, FLOAT a, blasint ldA, blasint In`
`96`	`96`	`if (diag < 0) info = 2;`
`97`	`97`	`if (uplo < 0) info = 1;`
`98`	`98`	`if (info) {`
`99`		`- BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME));`
	`99`	`+ BLASFUNC(xerbla)(ERROR_NAME, &info, sizeof(ERROR_NAME) - 1);`
`100`	`100`	`*Info = - info;`
`101`	`101`	`return 0;`
`102`	`102`	`}`