Commit 452b7f8f by Sven Strickroth

Don't use enum for flags

Using an `enum` causes trouble when used with C++ as bitwise operations are not possible w/o casting (e.g., `opts.flags &= ~GIT_BLOB_FILTER_CHECK_FOR_BINARY;` is invalid as there is no `&=` operator for `enum`).

Signed-off-by: Sven Strickroth <email@cs-ware.de>
parent 9cd5240e
...@@ -122,8 +122,8 @@ typedef enum { ...@@ -122,8 +122,8 @@ typedef enum {
typedef struct { typedef struct {
int version; int version;
/** Flags to control the filtering process */ /** Flags to control the filtering process, see `git_blob_filter_flag_t` above */
git_blob_filter_flag_t flags; uint32_t flags;
} git_blob_filter_options; } git_blob_filter_options;
#define GIT_BLOB_FILTER_OPTIONS_VERSION 1 #define GIT_BLOB_FILTER_OPTIONS_VERSION 1
......
...@@ -1378,7 +1378,8 @@ typedef enum { ...@@ -1378,7 +1378,8 @@ typedef enum {
typedef struct { typedef struct {
unsigned int version; unsigned int version;
git_diff_format_email_flags_t flags; /** see `git_diff_format_email_flags_t` above */
uint32_t flags;
/** This patch number */ /** This patch number */
size_t patch_no; size_t patch_no;
...@@ -1435,7 +1436,7 @@ GIT_EXTERN(int) git_diff_commit_as_email( ...@@ -1435,7 +1436,7 @@ GIT_EXTERN(int) git_diff_commit_as_email(
git_commit *commit, git_commit *commit,
size_t patch_no, size_t patch_no,
size_t total_patches, size_t total_patches,
git_diff_format_email_flags_t flags, uint32_t flags,
const git_diff_options *diff_opts); const git_diff_options *diff_opts);
/** /**
......
...@@ -192,7 +192,7 @@ typedef struct { ...@@ -192,7 +192,7 @@ typedef struct {
git_merge_file_favor_t favor; git_merge_file_favor_t favor;
/** see `git_merge_file_flag_t` above */ /** see `git_merge_file_flag_t` above */
git_merge_file_flag_t flags; uint32_t flags;
/** The size of conflict markers (eg, "<<<<<<<"). Default is /** The size of conflict markers (eg, "<<<<<<<"). Default is
* GIT_MERGE_CONFLICT_MARKER_SIZE. */ * GIT_MERGE_CONFLICT_MARKER_SIZE. */
...@@ -247,7 +247,7 @@ typedef struct { ...@@ -247,7 +247,7 @@ typedef struct {
unsigned int version; unsigned int version;
/** See `git_merge_flag_t` above */ /** See `git_merge_flag_t` above */
git_merge_flag_t flags; uint32_t flags;
/** /**
* Similarity to consider a file renamed (default 50). If * Similarity to consider a file renamed (default 50). If
...@@ -291,7 +291,7 @@ typedef struct { ...@@ -291,7 +291,7 @@ typedef struct {
git_merge_file_favor_t file_favor; git_merge_file_favor_t file_favor;
/** see `git_merge_file_flag_t` above */ /** see `git_merge_file_flag_t` above */
git_merge_file_flag_t file_flags; uint32_t file_flags;
} git_merge_options; } git_merge_options;
#define GIT_MERGE_OPTIONS_VERSION 1 #define GIT_MERGE_OPTIONS_VERSION 1
......
...@@ -127,7 +127,7 @@ typedef struct git_stash_apply_options { ...@@ -127,7 +127,7 @@ typedef struct git_stash_apply_options {
unsigned int version; unsigned int version;
/** See `git_stash_apply_flags_t`, above. */ /** See `git_stash_apply_flags_t`, above. */
git_stash_apply_flags flags; uint32_t flags;
/** Options to use when writing files to the working directory. */ /** Options to use when writing files to the working directory. */
git_checkout_options checkout_options; git_checkout_options checkout_options;
......
...@@ -323,7 +323,7 @@ int git_diff_commit_as_email( ...@@ -323,7 +323,7 @@ int git_diff_commit_as_email(
git_commit *commit, git_commit *commit,
size_t patch_no, size_t patch_no,
size_t total_patches, size_t total_patches,
git_diff_format_email_flags_t flags, uint32_t flags,
const git_diff_options *diff_opts) const git_diff_options *diff_opts)
{ {
git_diff *diff = NULL; git_diff *diff = NULL;
......
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