Skip to content

Minor compiler warning stomps #5203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsquyres merged 4 commits into from
May 30, 2018
Merged

Minor compiler warning stomps #5203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2dce549
ompi/debuggers: stomp a compiler warning in dlopen_test.c
jsquyres May 30, 2018
25f2d02
fcoll/dynamic_gen2: minor compiler warning stomp
jsquyres May 30, 2018
dec247d
opal/datatype: minor compiler warning stomp
jsquyres May 30, 2018
fb0473a
pmix3x: compiler warning stomp
jsquyres May 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ompi/debuggers/dlopen_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2009-2018 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand All @@ -12,6 +12,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>

#include "opal/runtime/opal.h"
#include "opal/mca/dl/base/base.h"
Expand Down
3 changes: 2 additions & 1 deletion ompi/mca/fcoll/dynamic_gen2/fcoll_dynamic_gen2_file_write_all.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* Copyright (c) 2015-2017 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2017 IBM Corporation. All rights reserved.
* Copyright (c) 2018 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -1162,7 +1163,7 @@ static int shuffle_init ( int index, int cycles, int aggregator, int rank, mca_i
int block_index = -1;
int blocklength_size = INIT_LEN;

ptrdiff_t send_mem_address = NULL;
ptrdiff_t send_mem_address = (ptrdiff_t) NULL;
ompi_datatype_t *newType = MPI_DATATYPE_NULL;
blocklength_proc = (int *) calloc (blocklength_size, sizeof (int));
displs_proc = (ptrdiff_t *) calloc (blocklength_size, sizeof (ptrdiff_t));
Expand Down
3 changes: 2 additions & 1 deletion opal/datatype/opal_datatype_dump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* All rights reserved.
* Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2018 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -46,7 +47,7 @@ int opal_datatype_contain_basic_datatypes( const opal_datatype_t* pData, char* p
if( NULL == pData->ptypes ) {
index += snprintf( ptr + index, length - index, "%s:* ", opal_datatype_basicDatatypes[i]->name );
} else {
index += snprintf( ptr + index, length - index, "%s:%lu ", opal_datatype_basicDatatypes[i]->name,
index += snprintf( ptr + index, length - index, "%s:%" PRIsize_t " ", opal_datatype_basicDatatypes[i]->name,
pData->ptypes[i]);
}
}
Expand Down
3 changes: 2 additions & 1 deletion opal/mca/pmix/pmix3x/pmix/src/util/name_fns.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* Copyright (c) 2014-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2016-2018 Intel, Inc. All rights reserved.
* Copyright (c) 2018 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand All @@ -31,7 +32,7 @@
#include "src/util/name_fns.h"
#include "src/util/printf.h"

#define PMIX_PRINT_NAME_ARGS_MAX_SIZE 50
#define PMIX_PRINT_NAME_ARGS_MAX_SIZE 300
#define PMIX_PRINT_NAME_ARG_NUM_BUFS 16

#define PMIX_SCHEMA_DELIMITER_CHAR '.'
Expand Down