good for merge On Fri, 2010-05-14 at 09:49 +1000, Angus Salkeld wrote: > Signed-off-by: Angus Salkeld <[email protected]> > --- > exec/totemsrp.c | 16 ++++++++-------- > 1 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/exec/totemsrp.c b/exec/totemsrp.c > index c8d165e..3d8bd05 100644 > --- a/exec/totemsrp.c > +++ b/exec/totemsrp.c > @@ -3063,6 +3063,7 @@ static void memb_ring_id_create_or_load ( > int fd; > int res; > char filename[256]; > + char error_str[100]; > > snprintf (filename, sizeof(filename), "%s/ringid_%s", > rundir, totemip_print (&instance->my_id.addr[0])); > @@ -3076,18 +3077,17 @@ static void memb_ring_id_create_or_load ( > memb_ring_id->seq = 0; > umask(0); > fd = open (filename, O_CREAT|O_RDWR, 0700); > - if (fd == -1) { > - char error_str[100]; > - strerror_r(errno, error_str, 100); > + if (fd >= 0) { > + res = write (fd, &memb_ring_id->seq, sizeof (unsigned > long long)); > + assert (res == sizeof (unsigned long long)); > + close (fd); > + } else { > + strerror_r (errno, error_str, 100); > log_printf (instance->totemsrp_log_level_warning, > "Couldn't create %s %s\n", filename, error_str); > } > - res = write (fd, &memb_ring_id->seq, sizeof (unsigned long > long)); > - assert (res == sizeof (unsigned long long)); > - close (fd); > } else { > - char error_str[100]; > - strerror_r(errno, error_str, 100); > + strerror_r (errno, error_str, 100); > log_printf (instance->totemsrp_log_level_warning, > "Couldn't open %s %s\n", filename, error_str); > }
_______________________________________________ Openais mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/openais
