Unverified Commit 6723edc7 by Edward Thomson Committed by GitHub

Merge pull request #6179 from boretrk/flags

c99: change single bit flags to unsigned
parents e2e3f3e4 a979cf3d
...@@ -81,11 +81,11 @@ typedef struct { ...@@ -81,11 +81,11 @@ typedef struct {
const git_index_entry *ours; const git_index_entry *ours;
const git_index_entry *theirs; const git_index_entry *theirs;
int name_collision:1, unsigned int name_collision:1,
directoryfile:1, directoryfile:1,
one_to_two:1, one_to_two:1,
binary:1, binary:1,
submodule:1; submodule:1;
} checkout_conflictdata; } checkout_conflictdata;
static int checkout_notify( static int checkout_notify(
......
...@@ -46,10 +46,10 @@ typedef struct git_pobject { ...@@ -46,10 +46,10 @@ typedef struct git_pobject {
size_t delta_size; size_t delta_size;
size_t z_delta_size; size_t z_delta_size;
int written:1, unsigned int written:1,
recursing:1, recursing:1,
tagged:1, tagged:1,
filled:1; filled:1;
} git_pobject; } git_pobject;
struct git_packbuilder { struct git_packbuilder {
......
...@@ -64,10 +64,10 @@ struct git_rebase { ...@@ -64,10 +64,10 @@ struct git_rebase {
git_rebase_t type; git_rebase_t type;
char *state_path; char *state_path;
int head_detached : 1, unsigned int head_detached:1,
inmemory : 1, inmemory:1,
quiet : 1, quiet:1,
started : 1; started:1;
git_array_t(git_rebase_operation) operations; git_array_t(git_rebase_operation) operations;
size_t current; size_t current;
......
...@@ -119,16 +119,16 @@ typedef struct { ...@@ -119,16 +119,16 @@ typedef struct {
} git_pkt_unpack; } git_pkt_unpack;
typedef struct transport_smart_caps { typedef struct transport_smart_caps {
int common:1, unsigned int common:1,
ofs_delta:1, ofs_delta:1,
multi_ack: 1, multi_ack:1,
multi_ack_detailed: 1, multi_ack_detailed:1,
side_band:1, side_band:1,
side_band_64k:1, side_band_64k:1,
include_tag:1, include_tag:1,
delete_refs:1, delete_refs:1,
report_status:1, report_status:1,
thin_pack:1; thin_pack:1;
} transport_smart_caps; } transport_smart_caps;
typedef int (*packetsize_cb)(size_t received, void *payload); typedef int (*packetsize_cb)(size_t received, void *payload);
......
...@@ -31,7 +31,7 @@ struct git_worktree { ...@@ -31,7 +31,7 @@ struct git_worktree {
/* Path to the parent's working directory */ /* Path to the parent's working directory */
char *parent_path; char *parent_path;
int locked:1; unsigned int locked:1;
}; };
char *git_worktree__read_link(const char *base, const char *file); char *git_worktree__read_link(const char *base, const char *file);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment