From: Junio C Hamano <gitster@pobox•com>
To: Thomas Gummerer <t.gummerer@gmail•com>
Cc: git@vger•kernel.org, trast@inf•ethz.ch, mhagger@alum•mit.edu,
pclouds@gmail•com, robin.rosenberg@dewire•com,
sunshine@sunshineco•com, ramsay@ramsay1•demon.co.uk
Subject: Re: [PATCH v3 02/24] read-cache: use fixed width integer types
Date: Tue, 20 Aug 2013 12:30:59 -0700 [thread overview]
Message-ID: <xmqqr4do5fd8.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1376854933-31241-3-git-send-email-t.gummerer@gmail.com> (Thomas Gummerer's message of "Sun, 18 Aug 2013 21:41:51 +0200")
Thomas Gummerer <t.gummerer@gmail•com> writes:
> Use the fixed width integer types uint16_t and uint32_t for ondisk
> structures, because unsigned short and unsigned int do not hae a
> guaranteed size.
This sounds like an independent fix to me. I'd queue this early
independent from the rest of the series.
Thanks.
>
> Signed-off-by: Thomas Gummerer <t.gummerer@gmail•com>
> ---
> cache.h | 10 +++++-----
> read-cache.c | 30 +++++++++++++++---------------
> 2 files changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/cache.h b/cache.h
> index bd6fb9f..9ef778a 100644
> --- 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 {
> - 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 ceaf207..0df5b31 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -1230,14 +1230,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 */
> };
>
> @@ -1249,15 +1249,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 */
> };
next prev parent reply other threads:[~2013-08-20 19:31 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-18 19:41 [PATCH v3 00/24] Index-v5 Thomas Gummerer
2013-08-18 19:41 ` [PATCH v3 01/24] t2104: Don't fail for index versions other than [23] Thomas Gummerer
2013-08-18 19:41 ` [PATCH v3 02/24] read-cache: use fixed width integer types Thomas Gummerer
2013-08-18 20:21 ` Eric Sunshine
2013-08-20 19:30 ` Junio C Hamano [this message]
2013-08-21 3:05 ` Thomas Gummerer
2013-08-18 19:41 ` [PATCH v3 03/24] read-cache: split index file version specific functionality Thomas Gummerer
2013-08-18 19:41 ` [PATCH v3 04/24] read-cache: clear version in discard_index() Thomas Gummerer
2013-08-20 19:34 ` Junio C Hamano
2013-08-21 3:06 ` Thomas Gummerer
2013-08-18 19:41 ` [PATCH v3 05/24] read-cache: move index v2 specific functions to their own file Thomas Gummerer
2013-08-18 19:41 ` [PATCH v3 06/24] read-cache: Don't compare uid, gid and ino on cygwin Thomas Gummerer
2013-08-18 22:34 ` Ramsay Jones
2013-08-20 8:36 ` Thomas Gummerer
2013-08-18 19:41 ` [PATCH v3 07/24] read-cache: Re-read index if index file changed Thomas Gummerer
2013-08-18 19:41 ` [PATCH v3 08/24] add documentation for the index api Thomas Gummerer
2013-08-18 20:50 ` Eric Sunshine
2013-08-18 19:41 ` [PATCH v3 09/24] read-cache: add index reading api Thomas Gummerer
2013-08-18 19:41 ` [PATCH v3 10/24] make sure partially read index is not changed Thomas Gummerer
2013-08-18 21:06 ` Eric Sunshine
2013-08-20 8:46 ` Thomas Gummerer
2013-08-18 19:42 ` [PATCH v3 11/24] grep.c: use index api Thomas Gummerer
2013-08-18 19:42 ` [PATCH v3 12/24] ls-files.c: " Thomas Gummerer
2013-08-18 19:42 ` [PATCH v3 13/24] documentation: add documentation of the index-v5 file format Thomas Gummerer
2013-08-18 19:42 ` [PATCH v3 14/24] read-cache: make in-memory format aware of stat_crc Thomas Gummerer
2013-08-18 19:42 ` [PATCH v3 15/24] read-cache: read index-v5 Thomas Gummerer
2013-08-19 1:57 ` Eric Sunshine
2013-08-20 14:01 ` Duy Nguyen
2013-08-20 20:59 ` Thomas Gummerer
2013-08-21 0:44 ` Duy Nguyen
2013-08-20 14:16 ` Duy Nguyen
2013-08-20 21:13 ` Thomas Gummerer
2013-08-23 23:52 ` Duy Nguyen
2013-08-18 19:42 ` [PATCH v3 16/24] read-cache: read resolve-undo data Thomas Gummerer
2013-08-19 1:59 ` Eric Sunshine
2013-08-18 19:42 ` [PATCH v3 17/24] read-cache: read cache-tree in index-v5 Thomas Gummerer
2013-08-24 0:09 ` Duy Nguyen
2013-11-25 15:41 ` Thomas Gummerer
2013-08-18 19:42 ` [PATCH v3 18/24] read-cache: write index-v5 Thomas Gummerer
2013-08-24 3:58 ` Duy Nguyen
2013-11-25 15:37 ` Thomas Gummerer
2013-08-24 4:07 ` Duy Nguyen
2013-08-24 9:56 ` Duy Nguyen
2013-08-18 19:42 ` [PATCH v3 19/24] read-cache: write index-v5 cache-tree data Thomas Gummerer
2013-08-18 19:42 ` [PATCH v3 20/24] read-cache: write resolve-undo data for index-v5 Thomas Gummerer
2013-08-18 19:42 ` [PATCH v3 21/24] update-index.c: rewrite index when index-version is given Thomas Gummerer
2013-08-18 19:42 ` [PATCH v3 22/24] p0003-index.sh: add perf test for the index formats Thomas Gummerer
2013-08-18 19:42 ` [PATCH v3 23/24] introduce GIT_INDEX_VERSION environment variable Thomas Gummerer
2013-08-21 0:57 ` Duy Nguyen
2013-08-21 4:01 ` Thomas Gummerer
2013-08-18 19:42 ` [PATCH v3 24/24] test-lib: allow setting the index format version Thomas Gummerer
2013-08-24 4:16 ` [PATCH v3 00/24] Index-v5 Duy Nguyen
2013-08-25 3:07 ` Junio C Hamano
2013-08-25 4:40 ` Duy Nguyen
2013-08-31 5:23 ` Thomas Gummerer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqr4do5fd8.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=mhagger@alum$(echo .)mit.edu \
--cc=pclouds@gmail$(echo .)com \
--cc=ramsay@ramsay1$(echo .)demon.co.uk \
--cc=robin.rosenberg@dewire$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
--cc=t.gummerer@gmail$(echo .)com \
--cc=trast@inf$(echo .)ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox