Re: [PATCH v5 05/35] rollback_lock_file(): set fd to -1
On 09/16/2014 10:39 PM, Jonathan Nieder wrote: > Jonathan Nieder wrote: >> Michael Haggerty wrote: > >>> --- a/lockfile.c >>> +++ b/lockfile.c >>> @@ -276,7 +276,7 @@ void rollback_lock_file(struct lock_file *lk) >>> return; >>> >>> if (lk->fd >= 0) >>> - close(lk->fd); >>> + close_lock_file(lk); >> >> Doesn't need to be guarded by the 'if'. > > Err, yes it does. > > Why doesn't close_lock_file bail out early when fd < 0? OK, I will change close_lock_file() to exit (with no error) when fd < 0. Then this "if" can also go away. Thanks, Michael -- Michael Haggerty mhag...@alum.mit.edu -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v5 05/35] rollback_lock_file(): set fd to -1
Jonathan Nieder wrote: > Michael Haggerty wrote: >> --- a/lockfile.c >> +++ b/lockfile.c >> @@ -276,7 +276,7 @@ void rollback_lock_file(struct lock_file *lk) >> return; >> >> if (lk->fd >= 0) >> -close(lk->fd); >> +close_lock_file(lk); > > Doesn't need to be guarded by the 'if'. Err, yes it does. Why doesn't close_lock_file bail out early when fd < 0? In any case, Reviewed-by: Jonathan Nieder -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v5 05/35] rollback_lock_file(): set fd to -1
Michael Haggerty wrote: > --- a/lockfile.c > +++ b/lockfile.c > @@ -276,7 +276,7 @@ void rollback_lock_file(struct lock_file *lk) > return; > > if (lk->fd >= 0) > - close(lk->fd); > + close_lock_file(lk); Doesn't need to be guarded by the 'if'. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v5 05/35] rollback_lock_file(): set fd to -1
When rolling back the lockfile, call close_lock_file() so that the lock_file's fd field gets set back to -1. This keeps the lock_file object in a valid state, which is important because these objects are allowed to be reused. Signed-off-by: Michael Haggerty Reviewed-by: Ronnie Sahlberg --- lockfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lockfile.c b/lockfile.c index 49179d8..b1c4ba0 100644 --- a/lockfile.c +++ b/lockfile.c @@ -276,7 +276,7 @@ void rollback_lock_file(struct lock_file *lk) return; if (lk->fd >= 0) - close(lk->fd); + close_lock_file(lk); unlink_or_warn(lk->filename); lk->filename[0] = 0; } -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
