read-cache: use fixed width integer types

Use the fixed width integer types uint16_t and uint32_t for on-disk
structures; unsigned short and unsigned int do not have a guaranteed
size.

Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index 85b544f38d934fe68d1e155c86337f1400eea14d..0632cfe8aaabb72ce428c59bc1ba6ad86f0f4a78 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -101,9 +101,9 @@ unsigned long git_deflate_bound(git_zstream *, unsigned long);
 
 #define CACHE_SIGNATURE 0x44495243     /* "DIRC" */
 struct cache_header {
 
 #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
 };
 
 #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 {
  * 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 {
 };
 
 struct stat_data {

diff --git a/read-cache.c b/read-cache.c
index c3d5e3543fae75c81a7a0a00c48bb0076675a2f1..44145c223435f4617e9b3f2730fb79599db66bbf 100644 (file)
--- 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;
 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 char sha1[20];

-       unsigned short flags;
+       uint16_t flags;

        char name[FLEX_ARRAY]; /* more */
 };
 
        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;
 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 char sha1[20];

-       unsigned short flags;
-       unsigned short flags2;
+       uint16_t flags;
+       uint16_t flags2;

        char name[FLEX_ARRAY]; /* more */
 };
 
        char name[FLEX_ARRAY]; /* more */
 };