From b4d7d47ea42feb3e14253f7864f931ae6c14adc1 Mon Sep 17 00:00:00 2001 From: julie Date: Fri, 9 Dec 2011 03:28:39 +0000 Subject: [PATCH] This time, I believe I catch them all... --- lapacke/src/lapacke_dsfrk.c | 5 +++-- lapacke/src/lapacke_ssfrk.c | 5 +++-- lapacke/src/lapacke_zbbcsd.c | 2 +- lapacke/src/lapacke_zlarft_work.c | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lapacke/src/lapacke_dsfrk.c b/lapacke/src/lapacke_dsfrk.c index 71f71cc..8ff9160 100644 --- a/lapacke/src/lapacke_dsfrk.c +++ b/lapacke/src/lapacke_dsfrk.c @@ -39,14 +39,15 @@ lapack_int LAPACKE_dsfrk( int matrix_order, char transr, char uplo, char trans, const double* a, lapack_int lda, double beta, double* c ) { + lapack_int ka, na; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_dsfrk", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int ka = LAPACKE_lsame( trans, 'n' ) ? k : n; - lapack_int na = LAPACKE_lsame( trans, 'n' ) ? n : k; + ka = LAPACKE_lsame( trans, 'n' ) ? k : n; + na = LAPACKE_lsame( trans, 'n' ) ? n : k; if( LAPACKE_dge_nancheck( matrix_order, na, ka, a, lda ) ) { return -8; } diff --git a/lapacke/src/lapacke_ssfrk.c b/lapacke/src/lapacke_ssfrk.c index 736b471..0a84a24 100644 --- a/lapacke/src/lapacke_ssfrk.c +++ b/lapacke/src/lapacke_ssfrk.c @@ -38,14 +38,15 @@ lapack_int LAPACKE_ssfrk( int matrix_order, char transr, char uplo, char trans, lapack_int n, lapack_int k, float alpha, const float* a, lapack_int lda, float beta, float* c ) { + lapack_int ka, na; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_ssfrk", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int ka = LAPACKE_lsame( trans, 'n' ) ? k : n; - lapack_int na = LAPACKE_lsame( trans, 'n' ) ? n : k; + ka = LAPACKE_lsame( trans, 'n' ) ? k : n; + na = LAPACKE_lsame( trans, 'n' ) ? n : k; if( LAPACKE_sge_nancheck( matrix_order, na, ka, a, lda ) ) { return -8; } diff --git a/lapacke/src/lapacke_zbbcsd.c b/lapacke/src/lapacke_zbbcsd.c index f93e569..fe39d97 100644 --- a/lapacke/src/lapacke_zbbcsd.c +++ b/lapacke/src/lapacke_zbbcsd.c @@ -49,7 +49,7 @@ lapack_int LAPACKE_zbbcsd( int matrix_order, char jobu1, char jobu2, lapack_int lrwork = -1; double* rwork = NULL; double rwork_query; - lapack_int nrows_u1, nrows_u2, nrows_v1t, nrows_v2t + lapack_int nrows_u1, nrows_u2, nrows_v1t, nrows_v2t; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_zbbcsd", -1 ); return -1; diff --git a/lapacke/src/lapacke_zlarft_work.c b/lapacke/src/lapacke_zlarft_work.c index 1000736..fef9e94 100644 --- a/lapacke/src/lapacke_zlarft_work.c +++ b/lapacke/src/lapacke_zlarft_work.c @@ -55,8 +55,8 @@ lapack_int LAPACKE_zlarft_work( int matrix_order, char direct, char storev, ( LAPACKE_lsame( storev, 'r' ) ? k : 1); ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : ( LAPACKE_lsame( storev, 'r' ) ? n : 1); - lapack_int ldt_t = MAX(1,k); - lapack_int ldv_t = MAX(1,nrows_v); + ldt_t = MAX(1,k); + ldv_t = MAX(1,nrows_v); /* Check leading dimension(s) */ if( ldt < k ) { info = -10; -- 2.7.4