From: Michael Haggerty Date: Sun, 06 Apr 2014 23:33:52 GMT Subject: [PATCH v2 10/25] lockfile: define a constant LOCK_SUFFIX_LEN Message-ID: <1396827247-28465-11-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1396827247-28465-1-git-send-email-mhagger@alum.mit.edu> Signed-off-by: Michael Haggerty --- lockfile.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lockfile.c b/lockfile.c index 2438430..1bd0ae1 100644 --- a/lockfile.c +++ b/lockfile.c @@ -178,14 +178,17 @@ static char *resolve_symlink(char *p, size_t s) return p; } +/* We append ".lock" to the filename to derive the lockfile name: */ +#define LOCK_SUFFIX_LEN 5 static int lock_file(struct lock_file *lk, const char *path, int flags) { /* - * subtract 5 from size to make sure there's room for adding - * ".lock" for the lock file name + * subtract LOCK_SUFFIX_LEN from size to make sure there's + * room for adding ".lock" for the lock file name: */ - static const size_t max_path_len = sizeof(lk->filename) - 5; + static const size_t max_path_len = sizeof(lk->filename) - + LOCK_SUFFIX_LEN; if (!lock_file_list) { /* One-time initialization */ @@ -302,7 +305,7 @@ int commit_lock_file(struct lock_file *lk) if (lk->fd >= 0 && close_lock_file(lk)) return -1; strcpy(result_file, lk->filename); - i = strlen(result_file) - 5; /* .lock */ + i = strlen(result_file) - LOCK_SUFFIX_LEN; /* .lock */ result_file[i] = 0; if (rename(lk->filename, result_file)) return -1; -- 1.9.1