undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move index-related variables into a structure.

Browse Source 
This defines a index_state structure and moves index-related
global variables into it.  Currently there is one instance of
it, the_index, and everybody accesses it, so there is no code
change.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2007-04-01 18:14:06 -07:00
parent 4280cde95f
commit 228e94f935
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cache.h
View File

@ -143,9 +143,22 @@ static inline unsigned int ce_mode_from_stat(struct cache_entry *ce, unsigned in
#define cache_entry_size(len) ((offsetof(struct cache_entry,name) + (len) + 8) & ~7) #define cache_entry_size(len) ((offsetof(struct cache_entry,name) + (len) + 8) & ~7)
extern struct cache_entry **active_cache; struct index_state {
extern unsigned int active_nr, active_alloc, active_cache_changed; struct cache_entry **cache;
extern struct cache_tree *active_cache_tree; unsigned int cache_nr, cache_alloc, cache_changed;
struct cache_tree *cache_tree;
time_t timestamp;
void *mmap;
size_t mmap_size;
};
extern struct index_state the_index;
#define active_cache (the_index.cache)
#define active_nr (the_index.cache_nr)
#define active_alloc (the_index.cache_alloc)
#define active_cache_changed (the_index.cache_changed)
#define active_cache_tree (the_index.cache_tree)
enum object_type { enum object_type {
OBJ_BAD = -1, OBJ_BAD = -1,

12
read-cache.c
View File

@ -19,14 +19,10 @@
#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) ) #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
#define CACHE_EXT_TREE 0x54524545 /* "TREE" */ #define CACHE_EXT_TREE 0x54524545 /* "TREE" */
struct cache_entry **active_cache; struct index_state the_index;
static time_t index_file_timestamp; #define index_file_timestamp (the_index.timestamp)
unsigned int active_nr, active_alloc, active_cache_changed; #define cache_mmap (the_index.mmap)
#define cache_mmap_size (the_index.mmap_size)
struct cache_tree *active_cache_tree;
static void *cache_mmap;
static size_t cache_mmap_size;
/* /*
* This only updates the "non-critical" parts of the directory * This only updates the "non-critical" parts of the directory