Merge branch 'code-cleanup' into develop

* code-cleanup:
  Declare used loop variables in a single line
  Simplify interface of get_*_info, ... functions
  Replace calloc with regular c array
  Remove unecessary comments and todos

Author: cniethammer

compile_info.h

@@ -8,96 +8,96 @@
 
 #define MAX_INFO_STRING_LENGTH 1024
 
-int get_compiler_info( char **info_str ) {
+int get_compiler_info( char *info_str ) {
 	/* For compiler predfined macros used for identification see
 	 * http://predef.sourceforge.net/precomp.html
 	 */
 
 	/* Cray compiler */
 #if defined(_CRAYC)
-	sprintf( *info_str, "Cray %d.%d", _RELEASE, _RELEASE_MINOR );
+	sprintf( info_str, "Cray %d.%d", _RELEASE, _RELEASE_MINOR );
 #endif
 
 	/* GNU compiler */
 #if defined(__GNUC__)
 # if defined(__GNUC_PATCHLEVEL__)
-	sprintf( *info_str, "GNU %d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__ );
+	sprintf( info_str, "GNU %d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__ );
 # else
-	sprintf( *info_str, "GNU %d.%d", __GNUC__, __GNUC_MINOR__ );
+	sprintf( info_str, "GNU %d.%d", __GNUC__, __GNUC_MINOR__ );
 # endif
 
 	/* Intel compiler */
 #elif defined(__INTEL_COMPILER)
 	int version =  (int) __INTEL_COMPILER / 100;
 	int revision = ((int)__INTEL_COMPILER % 100) / 10;
 	int patch = (int) __INTEL_COMPILER % 10;
-	sprintf( *info_str, "Intel %d.%d.%d", version, revision, patch );
+	sprintf( info_str, "Intel %d.%d.%d", version, revision, patch );
 
 	/* PGI compiler */ 
 #elif defined(__PGI)
-	sprintf( *info_str, "PGI" );
+	sprintf( info_str, "PGI" );
 
 	/* Sun compiler */
 #elif defined(__SUNPRO_C)
 	int version = (__SUNPRO_C >> 12) & 0xf;
 	int revision_digit1 = (__SUNPRO_C >> 8) & 0xf;
 	int revision_digit2 = (__SUNPRO_C >> 4) & 0xf;
 	int patch = (__SUNPRO_C >> 0 ) & 0xf;
-	sprintf( *info_str, "Sun %d.%d%d.%d", version, revision_digit1, revision_digit2, patch );
+	sprintf( info_str, "Sun %d.%d%d.%d", version, revision_digit1, revision_digit2, patch );
 
 	/* unknown */
 #else
-	sprintf( *info_str, "unknown" );
+	sprintf( info_str, "unknown" );
 #endif
 
 	return 0;
 }
 
 #if defined(MPI_VERSION)
 
-int get_mpi_info(char **info_str) {
+int get_mpi_info(char *info_str) {
 #if defined(MVAPICH2)
-  sprintf(*info_str, "MVAPICH2");
+  sprintf( info_str, "MVAPICH2");
 #elif defined(OPEN_MPI)
-  sprintf(*info_str, "Open MPI");
+  sprintf( info_str, "Open MPI");
 #elif defined(I_MPI_VERSION)
-  sprintf(*info_str, "Intel MPI");
+  sprintf( info_str, "Intel MPI");
 #elif defined(CRAY_MPI)
-  sprintf(*info_str, "Cray MPI");
+  sprintf( info_str, "Cray MPI");
 #elif defined(MPICH)
-  sprintf(*info_str, "MPICH");
+  sprintf( info_str, "MPICH");
 #else
-  sprintf(*info_str, "unknown");
+  sprintf( info_str, "unknown");
 #endif
   return 0;
 }
 
 #endif
 
 
-int get_compile_time( char **info_str ) {
-	sprintf( *info_str, "%s %s", __DATE__, __TIME__ );
+int get_compile_time( char *info_str ) {
+	sprintf( info_str, "%s %s", __DATE__, __TIME__ );
 	return 0;
 }
 
 
-int get_timestamp ( char **info_str ) {
+int get_timestamp ( char *info_str ) {
 	time_t t;
 	struct tm *ts;
 	t = time(NULL);
 	ts = localtime(&t);
-	sprintf( *info_str, "D%d-%d-%d T%d:%d:%d", 
+	sprintf( info_str, "D%d-%d-%d T%d:%d:%d",
 			ts->tm_mday, ts->tm_mon + 1, ts->tm_year + 1900,
 			ts->tm_hour, ts->tm_min, ts->tm_sec );
 	return 0;
 }
 
 
-int get_host( char **info_str ) {
+int get_host( char *info_str ) {
 	char hostname[1024];
 	hostname[1023] = '\0';
 	gethostname(hostname, 1023 );
-	sprintf( *info_str, "%s", hostname );
+	sprintf( info_str, "%s", hostname );
 	return 0;
 }
 

mpi_test_suite.c

@@ -1,5 +1,3 @@
-/** \todo CN Maybe redesign the logfile implementation? */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -57,9 +55,6 @@ static int tst_tag_ub = 32767;
 /**                                                                        **/
 /****************************************************************************/
 
-/*
- * Global functions, which don't fit into another category.
- */
 int tst_hash_value (const struct tst_env * env)
 {
   return (env->comm * 65521 + /* Smallest prime smaller than 2^16 */
@@ -100,10 +95,7 @@ int main (int argc, char * argv[])
   }
 
 
-  int i;
-  int j;
-  int k;
-  int l;
+  int i, j, k, l;
   int flag;
 
   int num_comms = 0;
@@ -152,14 +144,14 @@ int main (int argc, char * argv[])
 
   tst_output_init (DEBUG_LOG, TST_OUTPUT_RANK_SELF, TST_REPORT_MAX, TST_OUTPUT_TYPE_LOGFILE, "tst.log");
 
-  char *info_str = (char *) calloc(MAX_INFO_STRING_LENGTH, sizeof(char));
-  get_compiler_info(&info_str);
+  char info_str[MAX_INFO_STRING_LENGTH];
+  get_compiler_info(info_str);
   tst_output_printf(DEBUG_LOG, TST_REPORT_RUN, "Compiler used was %s\n", info_str);
-  get_mpi_info(&info_str);
+  get_mpi_info(info_str);
   tst_output_printf(DEBUG_LOG, TST_REPORT_FULL, "MPI version used was %s\n", info_str);
-  get_compile_time(&info_str);
+  get_compile_time(info_str);
   tst_output_printf(DEBUG_LOG, TST_REPORT_FULL, "Compiled at %s\n", info_str);
-  get_timestamp(&info_str);
+  get_timestamp(info_str);
   tst_output_printf(DEBUG_LOG, TST_REPORT_FULL, "Started at %s\n", info_str);
 #ifndef HAVE_MPI2_THREADS
   tst_output_printf(DEBUG_LOG, TST_REPORT_FULL, "Testsuite was compiled without MPI2_THREADS");