Few clean-ups, few indentations. Nothing really important.
This commit was SVN r15767.
Этот коммит содержится в:
родитель
629bacbb07
Коммит
31dfa5592e
@ -152,7 +152,8 @@ opal_init_util(void)
|
|||||||
opal_output_init();
|
opal_output_init();
|
||||||
|
|
||||||
/* register handler for errnum -> string converstion */
|
/* register handler for errnum -> string converstion */
|
||||||
if (OPAL_SUCCESS != (ret = opal_error_register("OPAL",
|
if (OPAL_SUCCESS !=
|
||||||
|
(ret = opal_error_register("OPAL",
|
||||||
OPAL_ERR_BASE, OPAL_ERR_MAX, opal_err2str))) {
|
OPAL_ERR_BASE, OPAL_ERR_MAX, opal_err2str))) {
|
||||||
error = "opal_error_register";
|
error = "opal_error_register";
|
||||||
goto return_error;
|
goto return_error;
|
||||||
|
@ -35,8 +35,6 @@
|
|||||||
|
|
||||||
int opal_register_params(void)
|
int opal_register_params(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This string is going to be used in opal/util/stacktrace.c
|
* This string is going to be used in opal/util/stacktrace.c
|
||||||
*/
|
*/
|
||||||
|
@ -176,10 +176,6 @@ opal_net_samenetwork(const struct sockaddr *addr1,
|
|||||||
uint32_t prefixlen)
|
uint32_t prefixlen)
|
||||||
{
|
{
|
||||||
if(addr1->sa_family != addr2->sa_family) {
|
if(addr1->sa_family != addr2->sa_family) {
|
||||||
#if 0
|
|
||||||
/* very annoying debug output */
|
|
||||||
opal_output(0, "opal_samenetwork: uncomparable");
|
|
||||||
#endif
|
|
||||||
return false; /* address families must be equal */
|
return false; /* address families must be equal */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -680,22 +680,19 @@ static void output(int output_id, const char *format, va_list arglist)
|
|||||||
|
|
||||||
/* Syslog output */
|
/* Syslog output */
|
||||||
|
|
||||||
if (ldi->ldi_syslog) {
|
|
||||||
|
|
||||||
#if defined(HAVE_SYSLOG)
|
#if defined(HAVE_SYSLOG)
|
||||||
|
if (ldi->ldi_syslog) {
|
||||||
syslog(ldi->ldi_syslog_priority, "%s", str);
|
syslog(ldi->ldi_syslog_priority, "%s", str);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* stdout output */
|
/* stdout output */
|
||||||
|
|
||||||
if (ldi->ldi_stdout) {
|
if (ldi->ldi_stdout) {
|
||||||
write(fileno(stdout), temp_str, (int)strlen(temp_str));
|
write(fileno(stdout), temp_str, (int)strlen(temp_str));
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* stderr output */
|
/* stderr output */
|
||||||
|
|
||||||
if (ldi->ldi_stderr) {
|
if (ldi->ldi_stderr) {
|
||||||
write(fileno(stderr),temp_str, (int)strlen(temp_str));
|
write(fileno(stderr),temp_str, (int)strlen(temp_str));
|
||||||
fflush(stderr);
|
fflush(stderr);
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user