Commit 6723edc7bca3a7cab2d98711b14bc3d0261e323c
2022-01-17T19:36:53
Merge pull request #6179 from boretrk/flags c99: change single bit flags to unsigned
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103
diff --git a/src/checkout.c b/src/checkout.c
index 11be2e8..8c2f706 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 db2038b..cefee40 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 4ad3764..6f01d39 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 a9cab31..c003052 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 1d40c3a..587189f 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);