Skip to content

Commit 6723edc

Browse files
authored
Merge pull request libgit2#6179 from boretrk/flags
c99: change single bit flags to unsigned
2 parents e2e3f3e + a979cf3 commit 6723edc

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

src/checkout.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ typedef struct {
8181
const git_index_entry *ours;
8282
const git_index_entry *theirs;
8383

84-
int name_collision:1,
85-
directoryfile:1,
86-
one_to_two:1,
87-
binary:1,
88-
submodule:1;
84+
unsigned int name_collision:1,
85+
directoryfile:1,
86+
one_to_two:1,
87+
binary:1,
88+
submodule:1;
8989
} checkout_conflictdata;
9090

9191
static int checkout_notify(

src/pack-objects.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ typedef struct git_pobject {
4646
size_t delta_size;
4747
size_t z_delta_size;
4848

49-
int written:1,
50-
recursing:1,
51-
tagged:1,
52-
filled:1;
49+
unsigned int written:1,
50+
recursing:1,
51+
tagged:1,
52+
filled:1;
5353
} git_pobject;
5454

5555
struct git_packbuilder {

src/rebase.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ struct git_rebase {
6464
git_rebase_t type;
6565
char *state_path;
6666

67-
int head_detached : 1,
68-
inmemory : 1,
69-
quiet : 1,
70-
started : 1;
67+
unsigned int head_detached:1,
68+
inmemory:1,
69+
quiet:1,
70+
started:1;
7171

7272
git_array_t(git_rebase_operation) operations;
7373
size_t current;

src/transports/smart.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,16 @@ typedef struct {
119119
} git_pkt_unpack;
120120

121121
typedef struct transport_smart_caps {
122-
int common:1,
123-
ofs_delta:1,
124-
multi_ack: 1,
125-
multi_ack_detailed: 1,
126-
side_band:1,
127-
side_band_64k:1,
128-
include_tag:1,
129-
delete_refs:1,
130-
report_status:1,
131-
thin_pack:1;
122+
unsigned int common:1,
123+
ofs_delta:1,
124+
multi_ack:1,
125+
multi_ack_detailed:1,
126+
side_band:1,
127+
side_band_64k:1,
128+
include_tag:1,
129+
delete_refs:1,
130+
report_status:1,
131+
thin_pack:1;
132132
} transport_smart_caps;
133133

134134
typedef int (*packetsize_cb)(size_t received, void *payload);

src/worktree.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ struct git_worktree {
3131
/* Path to the parent's working directory */
3232
char *parent_path;
3333

34-
int locked:1;
34+
unsigned int locked:1;
3535
};
3636

3737
char *git_worktree__read_link(const char *base, const char *file);

0 commit comments

Comments
 (0)