diff options
| -rw-r--r-- | cache.h | 10 | ||||
| -rw-r--r-- | read-cache.c | 30 | 
2 files changed, 20 insertions, 20 deletions
| @@ -101,9 +101,9 @@ unsigned long git_deflate_bound(git_zstream *, unsigned long);  #define CACHE_SIGNATURE 0x44495243	/* "DIRC" */  struct cache_header { -	unsigned int hdr_signature; -	unsigned int hdr_version; -	unsigned int hdr_entries; +	uint32_t hdr_signature; +	uint32_t hdr_version; +	uint32_t hdr_entries;  };  #define INDEX_FORMAT_LB 2 @@ -115,8 +115,8 @@ struct cache_header {   * check it for equality in the 32 bits we save.   */  struct cache_time { -	unsigned int sec; -	unsigned int nsec; +	uint32_t sec; +	uint32_t nsec;  };  struct stat_data { diff --git a/read-cache.c b/read-cache.c index c3d5e3543f..44145c2234 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1229,14 +1229,14 @@ static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int reall  struct ondisk_cache_entry {  	struct cache_time ctime;  	struct cache_time mtime; -	unsigned int dev; -	unsigned int ino; -	unsigned int mode; -	unsigned int uid; -	unsigned int gid; -	unsigned int size; +	uint32_t dev; +	uint32_t ino; +	uint32_t mode; +	uint32_t uid; +	uint32_t gid; +	uint32_t size;  	unsigned char sha1[20]; -	unsigned short flags; +	uint16_t flags;  	char name[FLEX_ARRAY]; /* more */  }; @@ -1248,15 +1248,15 @@ struct ondisk_cache_entry {  struct ondisk_cache_entry_extended {  	struct cache_time ctime;  	struct cache_time mtime; -	unsigned int dev; -	unsigned int ino; -	unsigned int mode; -	unsigned int uid; -	unsigned int gid; -	unsigned int size; +	uint32_t dev; +	uint32_t ino; +	uint32_t mode; +	uint32_t uid; +	uint32_t gid; +	uint32_t size;  	unsigned char sha1[20]; -	unsigned short flags; -	unsigned short flags2; +	uint16_t flags; +	uint16_t flags2;  	char name[FLEX_ARRAY]; /* more */  }; | 
