From a979cf3d5cc05166de4787ed84ab57fc231046e9 Mon Sep 17 00:00:00 2001 From: Peter Pettersson Date: Wed, 17 Nov 2021 22:19:47 +0100 Subject: c99: change single bit flags to unsigned --- src/checkout.c | 10 +++++----- src/pack-objects.h | 8 ++++---- src/rebase.c | 8 ++++---- src/transports/smart.h | 20 ++++++++++---------- src/worktree.h | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/checkout.c b/src/checkout.c index 11be2e84f..8c2f70652 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -81,11 +81,11 @@ typedef struct { const git_index_entry *ours; const git_index_entry *theirs; - int name_collision:1, - directoryfile:1, - one_to_two:1, - binary:1, - submodule:1; + unsigned int name_collision:1, + directoryfile:1, + one_to_two:1, + binary:1, + submodule:1; } checkout_conflictdata; static int checkout_notify( diff --git a/src/pack-objects.h b/src/pack-objects.h index db2038b0a..cefee40ef 100644 --- a/src/pack-objects.h +++ b/src/pack-objects.h @@ -46,10 +46,10 @@ typedef struct git_pobject { size_t delta_size; size_t z_delta_size; - int written:1, - recursing:1, - tagged:1, - filled:1; + unsigned int written:1, + recursing:1, + tagged:1, + filled:1; } git_pobject; struct git_packbuilder { diff --git a/src/rebase.c b/src/rebase.c index 4ad37643b..6f01d3990 100644 --- a/src/rebase.c +++ b/src/rebase.c @@ -64,10 +64,10 @@ struct git_rebase { git_rebase_t type; char *state_path; - int head_detached : 1, - inmemory : 1, - quiet : 1, - started : 1; + unsigned int head_detached:1, + inmemory:1, + quiet:1, + started:1; git_array_t(git_rebase_operation) operations; size_t current; diff --git a/src/transports/smart.h b/src/transports/smart.h index a9cab31ac..c003052c8 100644 --- a/src/transports/smart.h +++ b/src/transports/smart.h @@ -119,16 +119,16 @@ typedef struct { } git_pkt_unpack; typedef struct transport_smart_caps { - int common:1, - ofs_delta:1, - multi_ack: 1, - multi_ack_detailed: 1, - side_band:1, - side_band_64k:1, - include_tag:1, - delete_refs:1, - report_status:1, - thin_pack:1; + unsigned int common:1, + ofs_delta:1, + multi_ack:1, + multi_ack_detailed:1, + side_band:1, + side_band_64k:1, + include_tag:1, + delete_refs:1, + report_status:1, + thin_pack:1; } transport_smart_caps; typedef int (*packetsize_cb)(size_t received, void *payload); diff --git a/src/worktree.h b/src/worktree.h index 1d40c3a5d..587189f81 100644 --- a/src/worktree.h +++ b/src/worktree.h @@ -31,7 +31,7 @@ struct git_worktree { /* Path to the parent's working directory */ char *parent_path; - int locked:1; + unsigned int locked:1; }; char *git_worktree__read_link(const char *base, const char *file); -- cgit v1.2.1