From b982f908e850c4194b3fe977ffe9976fdfb9478f Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Tue, 31 Aug 2010 14:51:19 +0000 Subject: [PATCH] Fixed some newly-induced warnings This commit was SVN r23694. --- orte/mca/errmgr/base/errmgr_base_fns.c | 2 +- orte/mca/errmgr/base/errmgr_private.h | 2 +- orte/mca/errmgr/errmgr.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/orte/mca/errmgr/base/errmgr_base_fns.c b/orte/mca/errmgr/base/errmgr_base_fns.c index 470f1dc5f8..bd85d0acd4 100644 --- a/orte/mca/errmgr/base/errmgr_base_fns.c +++ b/orte/mca/errmgr/base/errmgr_base_fns.c @@ -189,7 +189,7 @@ void orte_errmgr_base_log(int error_code, char *filename, int line) ORTE_ERROR_NAME(error_code), filename, line); } -int orte_errmgr_base_abort(int error_code, char *fmt, ...) +void orte_errmgr_base_abort(int error_code, char *fmt, ...) { va_list arglist; diff --git a/orte/mca/errmgr/base/errmgr_private.h b/orte/mca/errmgr/base/errmgr_private.h index 00fd16e67f..45dd3d1bc5 100644 --- a/orte/mca/errmgr/base/errmgr_private.h +++ b/orte/mca/errmgr/base/errmgr_private.h @@ -60,7 +60,7 @@ typedef uint8_t orte_errmgr_cmd_flag_t; */ ORTE_DECLSPEC void orte_errmgr_base_log(int error_code, char *filename, int line); -ORTE_DECLSPEC int orte_errmgr_base_abort(int error_code, char *fmt, ...) +ORTE_DECLSPEC void orte_errmgr_base_abort(int error_code, char *fmt, ...) __opal_attribute_format__(__printf__, 2, 3) __opal_attribute_noreturn__; diff --git a/orte/mca/errmgr/errmgr.h b/orte/mca/errmgr/errmgr.h index f599f6d0c5..3b8c29396d 100644 --- a/orte/mca/errmgr/errmgr.h +++ b/orte/mca/errmgr/errmgr.h @@ -169,7 +169,7 @@ typedef void (*orte_errmgr_base_module_log_fn_t)(int error_code, char *filename, * itself, and then exit - it takes no other actions. The intent here is to provide * a last-ditch exit procedure that attempts to clean up a little. */ -typedef int (*orte_errmgr_base_module_abort_fn_t)(int error_code, char *fmt, ...) +typedef void (*orte_errmgr_base_module_abort_fn_t)(int error_code, char *fmt, ...) __opal_attribute_format_funcptr__(__printf__, 2, 3); /**