This makes space for other bits, which will arrive soon.
Signed-off-by: Michael Haggerty <mhagger@xxxxxxxxxxxx>
---
cache.h | 2 +-
lockfile.c | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/cache.h b/cache.h
index 3a873a4..59ce5cd 100644
--- a/cache.h
+++ b/cache.h
@@ -537,7 +537,7 @@ struct lock_file {
struct lock_file *next;
int fd;
pid_t owner;
- char on_list;
+ unsigned char flags;
char filename[PATH_MAX];
};
#define LOCK_DIE_ON_ERROR 1
diff --git a/lockfile.c b/lockfile.c
index 120a6d6..0486c58 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -4,6 +4,11 @@
#include "cache.h"
#include "sigchain.h"
+/* Values for lock_file::flags: */
+
+/* This lock_file instance is in the lock_file_list */
+#define LOCK_FLAGS_ON_LIST 0x01
+
static struct lock_file *lock_file_list;
static const char *alternate_index_output;
@@ -136,11 +141,11 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
atexit(remove_lock_file);
}
- if (!lk->on_list) {
+ if (!(lk->flags & LOCK_FLAGS_ON_LIST)) {
/* Initialize *lk and add it to lock_file_list: */
lk->fd = -1;
lk->owner = 0;
- lk->on_list = 1;
+ lk->flags |= LOCK_FLAGS_ON_LIST;
lk->filename[0] = 0;
lk->next = lock_file_list;
lock_file_list = lk;
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html