Silence a couple of warnings - strncpy returns a char*, not an int
Этот коммит содержится в:
родитель
348ac507c2
Коммит
4dad5de8ff
@ -4,7 +4,7 @@
|
|||||||
* of Tennessee Research Foundation. All rights
|
* of Tennessee Research Foundation. All rights
|
||||||
* reserved.
|
* reserved.
|
||||||
* Copyright (c) 2013 Inria. All rights reserved.
|
* Copyright (c) 2013 Inria. All rights reserved.
|
||||||
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
|
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
|
||||||
* Copyright (c) 2014-2016 Research Organization for Information Science
|
* Copyright (c) 2014-2016 Research Organization for Information Science
|
||||||
* and Technology (RIST). All rights reserved.
|
* and Technology (RIST). All rights reserved.
|
||||||
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
|
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
|
||||||
@ -156,7 +156,8 @@ static int opal_convert_process_name_to_string_should_never_be_called(char** nam
|
|||||||
|
|
||||||
static int opal_snprintf_jobid_should_never_be_called(char* name_string, size_t size, opal_jobid_t jobid)
|
static int opal_snprintf_jobid_should_never_be_called(char* name_string, size_t size, opal_jobid_t jobid)
|
||||||
{
|
{
|
||||||
return strncpy(name_string, "My JOBID", size);
|
(void)strncpy(name_string, "My JOBID", size);
|
||||||
|
return OPAL_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int opal_convert_string_to_jobid_should_never_be_called(opal_jobid_t *jobid, const char *jobid_string)
|
static int opal_convert_string_to_jobid_should_never_be_called(opal_jobid_t *jobid, const char *jobid_string)
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
|
||||||
* Copyright (c) 2014-2016 Research Organization for Information Science
|
* Copyright (c) 2014-2016 Research Organization for Information Science
|
||||||
* and Technology (RIST). All rights reserved.
|
* and Technology (RIST). All rights reserved.
|
||||||
|
* Copyright (c) 2016 Intel, Inc. All rights reserved.
|
||||||
* $COPYRIGHT$
|
* $COPYRIGHT$
|
||||||
*
|
*
|
||||||
* Additional copyrights may follow
|
* Additional copyrights may follow
|
||||||
@ -291,7 +292,8 @@ int orte_util_snprintf_jobid(char *jobid_string, size_t size, const orte_jobid_t
|
|||||||
|
|
||||||
/* check for wildcard value - handle appropriately */
|
/* check for wildcard value - handle appropriately */
|
||||||
if (ORTE_JOBID_WILDCARD == jobid) {
|
if (ORTE_JOBID_WILDCARD == jobid) {
|
||||||
return strncpy(jobid_string, ORTE_SCHEMA_WILDCARD_STRING, size);
|
(void)strncpy(jobid_string, ORTE_SCHEMA_WILDCARD_STRING, size);
|
||||||
|
return ORTE_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
rc = snprintf(jobid_string, size, "%ld", (long) jobid);
|
rc = snprintf(jobid_string, size, "%ld", (long) jobid);
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user