threads / patch / 10913

patchFix warning about bitfield in struct ref

Subject: [PATCH] Fix warning about bitfield in struct ref

## tl;dr

4 messages between Nov 18, 2007 and Nov 21, 2007. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Shawn O. Pearce· Nov 18, 2007, 09:31 UTC · lore

cache.h:503: warning: type of bit-field 'force' is a GCC extension cache.h:504: warning: type of bit-field 'merge' is a GCC extension cache.h:505: warning: type of bit-field 'nonfastforward' is a GCC extension cache.h:506: warning: type of bit-field 'deletion' is a GCC extension

So we change it to an 'unsigned int' which is not a GCC extension.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 cache.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Show changes to cache.h +4 −4
diff --git a/cache.h b/cache.h
index ba9178f..65e019e 100644
--- a/cache.h
+++ b/cache.h
@@ -500,10 +500,10 @@ struct ref {
 	struct ref *next;
 	unsigned char old_sha1[20];
 	unsigned char new_sha1[20];
-	unsigned char force : 1;
-	unsigned char merge : 1;
-	unsigned char nonfastforward : 1;
-	unsigned char deletion : 1;
+	unsigned int force:1,
+		merge:1,
+		nonfastforward:1,
+		deletion:1;
 	enum {
 		REF_STATUS_NONE = 0,
 		REF_STATUS_OK,

-- 
1.5.3.5.1794.g083e
Shawn O. Pearce· Nov 21, 2007, 06:51 UTC · re: Johannes Schindelin · lore

Re: [PATCH] Fix warning about bitfield in struct ref

Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
Show 5 quoted lines
> On Sun, 18 Nov 2007, Shawn O. Pearce wrote:
> 
> > +	unsigned int force:1,
> 
> Isn't this "unsigned force:1" everywhere else in git's source?

That may be true but Junio already applied it as "unsigned int" as I wrote it. Anyway "unsigned int" and "unsigned" will give the same result here; I just typed 4 characters more than I needed to.

-- 
Shawn.
Johannes Schindelin· Nov 21, 2007, 11:59 UTC · re: Shawn O. Pearce · lore

Re: [PATCH] Fix warning about bitfield in struct ref

Hi,
On Wed, 21 Nov 2007, Shawn O. Pearce wrote:
Show 9 quoted lines
> Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > On Sun, 18 Nov 2007, Shawn O. Pearce wrote:
> > 
> > > +	unsigned int force:1,
> > 
> > Isn't this "unsigned force:1" everywhere else in git's source?
> 
> That may be true but Junio already applied it as "unsigned int"
> as I wrote it.
Yes, I saw that _after_ I wrote this mail.
> Anyway "unsigned int" and "unsigned" will give the same result here; I 
> just typed 4 characters more than I needed to.
No big problem.

Ciao, Dscho

← back to recent threads