[PATCH v3 15/25] commit_lock_file(): inline temporary variable
flat view
STALE3766d
From: Michael Haggerty <hidden>
Date: 2016-06-15 23:00:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v3 of 6 in this series.
Revisions (6)
Signed-off-by: Michael Haggerty <redacted> --- lockfile.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lockfile.c b/lockfile.c
index 477bf4b..664b0c3 100644
--- a/lockfile.c
+++ b/lockfile.c@@ -288,12 +288,14 @@ int close_lock_file(struct lock_file *lk) int commit_lock_file(struct lock_file *lk) { char result_file[PATH_MAX]; - size_t i; + if (lk->fd >= 0 && close_lock_file(lk)) return -1; + strcpy(result_file, lk->filename); - i = strlen(result_file) - LOCK_SUFFIX_LEN; /* .lock */ - result_file[i] = 0; + /* remove ".lock": */ + result_file[strlen(result_file) - LOCK_SUFFIX_LEN] = 0; + if (rename(lk->filename, result_file)) return -1; lk->filename[0] = 0;
--
1.9.1