update based on code review suggestions

Author: guozhong.zhuang

LAPACKE/src/Makefile

@@ -1182,6 +1182,7 @@ lapacke_dtrttp.o \
 lapacke_dtrttp_work.o \
 lapacke_dtzrzf.o \
 lapacke_dtzrzf_work.o \
+lapacke_nancheck.o \
 lapacke_sbbcsd.o \
 lapacke_sbbcsd_work.o \
 lapacke_sbdsdc.o \
@@ -1734,7 +1735,6 @@ lapacke_strttp.o \
 lapacke_strttp_work.o \
 lapacke_stzrzf.o \
 lapacke_stzrzf_work.o \
-lapacke_nancheck.o \
 lapacke_zbbcsd.o \
 lapacke_zbbcsd_work.o \
 lapacke_zbdsqr.o \

LAPACKE/src/lapacke_cuncsd2by1.c

@@ -57,16 +57,15 @@ lapack_int LAPACKE_cuncsd2by1( int matrix_layout, char jobu1, char jobu2,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        nrows_x11 =  p ;
-        nrows_x21 =  m-p ;
+        nrows_x11 = p;
+        nrows_x21 = m-p;
         if( LAPACKE_cge_nancheck( matrix_layout, nrows_x11, q, x11, ldx11 ) ) {
             return -8;
         }
-    
+
         if( LAPACKE_cge_nancheck( matrix_layout, nrows_x21, q, x21, ldx21 ) ) {
             return -9;
         }
-    
     }
 #endif
     /* Allocate memory for working array(s) */

LAPACKE/src/lapacke_dorcsd2by1.c

@@ -52,16 +52,15 @@ lapack_int LAPACKE_dorcsd2by1( int matrix_layout, char jobu1, char jobu2,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        nrows_x11 =  p ;
-        nrows_x21 =  m-p ;
+        nrows_x11 = p;
+        nrows_x21 = m-p;
         if( LAPACKE_dge_nancheck( matrix_layout, nrows_x11, q, x11, ldx11 ) ) {
             return -8;
         }
-    
+ 
         if( LAPACKE_dge_nancheck( matrix_layout, nrows_x21, q, x21, ldx21 ) ) {
             return -9;
         }
-    
     }
 #endif
     /* Allocate memory for working array(s) */

LAPACKE/src/lapacke_nancheck.c

@@ -26,36 +26,35 @@
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
   THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************
-* Contents: Native high-level C interface to LAPACK function set/get nancheck  
-*           flag
+* Contents: Native C interface to control NaN checking
 * Author: Intel Corporation
-* Generated June, 2017
+* Generated July, 2017
 *****************************************************************************/
 
 #include "lapacke_utils.h"
 
 static int nancheck_flag = -1;
 
-
-void LAPACKE_set_nancheck( int flag ) 
+void LAPACKE_set_nancheck( int flag )
 {
-    nancheck_flag = ( flag ) ? 1 : 0; 
+    nancheck_flag = ( flag ) ? 1 : 0;
 }
 
-
-int LAPACKE_get_nancheck( ) 
+int LAPACKE_get_nancheck( )
 {
-    if ( nancheck_flag != -1 ) 
-	return nancheck_flag;
+    char* env;
+    if ( nancheck_flag != -1 ) {
+        return nancheck_flag;
+    }
 
-    /* Check environment variable, once and only once */ 
-    char* env = getenv("LAPACKE_NANCHECK");
+    /* Check environment variable, once and only once */
+    env = getenv( "LAPACKE_NANCHECK" );
     if ( !env ) {
-	nancheck_flag = 1;
+        /* By default, NaN checking is enabled */
+        nancheck_flag = 1;
     } else {
-        int envval = (int)atoi(env);
-	nancheck_flag = ( envval ) ? 1 : 0; 
-    } 
+        nancheck_flag = atoi( env ) ? 1 : 0;
+    }
 
     return nancheck_flag;
 }

LAPACKE/src/lapacke_sorcsd2by1.c

@@ -52,16 +52,15 @@ lapack_int LAPACKE_sorcsd2by1( int matrix_layout, char jobu1, char jobu2,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        nrows_x11 =  p ;
-        nrows_x21 =  m-p ;
+        nrows_x11 = p;
+        nrows_x21 = m-p;
         if( LAPACKE_sge_nancheck( matrix_layout, nrows_x11, q, x11, ldx11 ) ) {
             return -8;
         }
-    
+ 
         if( LAPACKE_sge_nancheck( matrix_layout, nrows_x21, q, x21, ldx21 ) ) {
             return -9;
         }
-    
     }
 #endif
     /* Allocate memory for working array(s) */

LAPACKE/src/lapacke_zuncsd2by1.c

@@ -57,16 +57,15 @@ lapack_int LAPACKE_zuncsd2by1( int matrix_layout, char jobu1, char jobu2,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        nrows_x11 =  p ;
-        nrows_x21 =  m-p ;
+        nrows_x11 = p;
+        nrows_x21 = m-p;
         if( LAPACKE_zge_nancheck( matrix_layout, nrows_x11, q, x11, ldx11 ) ) {
             return -8;
         }
-    
+ 
         if( LAPACKE_zge_nancheck( matrix_layout, nrows_x21, q, x21, ldx21 ) ) {
             return -9;
         }
-    
     }
 #endif
     /* Allocate memory for working array(s) */