Skip to content

Commit

Permalink
Fix -Wmisleading-indentation in a few places
Browse files Browse the repository at this point in the history
Signed-off-by: Ken Raffenetti <raffenet@mcs.anl.gov>
  • Loading branch information
roblatham00 authored and raffenet committed Jan 10, 2017
1 parent 201de92 commit ffed7d2
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 12 deletions.
10 changes: 5 additions & 5 deletions src/mpi/romio/adio/ad_panfs/ad_panfs_open.c
Expand Up @@ -265,17 +265,17 @@ void ADIOI_PANFS_Open(ADIO_File fd, int *error_code)
if (fd->access_mode & ADIO_EXCL)
amode = amode | O_EXCL;

value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
ADIOI_Info_get(fd->info, "panfs_concurrent_write", MPI_MAX_INFO_VAL,
value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
ADIOI_Info_get(fd->info, "panfs_concurrent_write", MPI_MAX_INFO_VAL,
value, &flag);
if (flag) {
if (flag) {
unsigned long int concurrent_write = strtoul(value,NULL,10);
if(concurrent_write == 1)
{
amode = amode | O_CONCURRENT_WRITE;
}
}
ADIOI_Free(value);
}
ADIOI_Free(value);

fd->fd_sys = open(fd->filename, amode, perm);
fd->fd_direct = -1;
Expand Down
21 changes: 14 additions & 7 deletions src/mpid/ch3/src/mpidi_pg.c
Expand Up @@ -506,7 +506,8 @@ int MPIDI_PG_Create_from_string(const char * str, MPIDI_PG_t ** pg_pptr,

/* Get the size from the string */
p = str;
while (*p) p++; p++;
while (*p) p++;
p++;
vct_sz = atoi(p);

mpi_errno = MPIDI_PG_Create(vct_sz, (void *)str, pg_pptr);
Expand Down Expand Up @@ -983,11 +984,13 @@ static int connFromString( const char *buf, MPIDI_PG_t *pg )
/* printf( "Starting with buf = %s\n", buf );fflush(stdout); */

/* Skip the pg id */
while (*buf) buf++; buf++;
while (*buf) buf++;
buf++;

/* Determine the size of the pg */
pg->size = atoi( buf );
while (*buf) buf++; buf++;
while (*buf) buf++;
buf++;

conninfo = (MPIDI_ConnInfo *)MPL_malloc( sizeof(MPIDI_ConnInfo) );
conninfo->connStrings = (char **)MPL_malloc( pg->size * sizeof(char *));
Expand Down Expand Up @@ -1034,11 +1037,13 @@ int MPIDI_PrintConnStr( const char *file, int line,
MPL_dbg_outevent( file, line, MPIDI_CH3_DBG_CONNECT, 0, "%s", str );

/* Skip the pg id */
while (*str) str++; str++;
while (*str) str++;
str++;

/* Determine the size of the pg */
pg_size = atoi( str );
while (*str) str++; str++;
while (*str) str++;
str++;

for (i=0; i<pg_size; i++) {
MPL_dbg_outevent( file, line, MPIDI_CH3_DBG_CONNECT, 0, "%s", str );
Expand All @@ -1055,12 +1060,14 @@ int MPIDI_PrintConnStrToFile( FILE *fd, const char *file, int line,
fprintf( fd, "ConnStr from %s(%d); %s\n\t%s\n", file, line, label, str );

/* Skip the pg id */
while (*str) str++; str++;
while (*str) str++;
str++;

fprintf( fd, "\t%s\n", str );
/* Determine the size of the pg */
pg_size = atoi( str );
while (*str) str++; str++;
while (*str) str++;
str++;

for (i=0; i<pg_size; i++) {
fprintf( fd, "\t%s\n", str );
Expand Down

0 comments on commit ffed7d2

Please sign in to comment.