mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use 'unsigned short' for mode, like diff_filespec does

Browse Source 
struct diff_filespec defines mode to be an 'unsigned short'.  Several
other places in the API which we'd like to interact with using a
diff_filespec used a plain unsigned (or unsigned int).  This caused
problems when taking addresses, so switch to unsigned short.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2019-04-05 08:00:12 -07:00
committed by Junio C Hamano
parent 041f5ea1cf
commit 5ec1e72823
15 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
merge-recursive.c
View File

@ -214,7 +214,7 @@ struct rename_conflict_info {
*/
struct stage_data {
struct {
unsigned mode;
unsigned short mode;
struct object_id oid;
} stages[4];
struct rename_conflict_info *rename_conflict_info;
@ -482,7 +482,7 @@ static void get_files_dirs(struct merge_options *o, struct tree *tree)
static int get_tree_entry_if_blob(const struct object_id *tree,
const char *path,
struct object_id *hashy,
unsigned int *mode_o)
unsigned short *mode_o)
{
int ret;
@ -1935,7 +1935,7 @@ static struct diff_queue_struct *get_diffpairs(struct merge_options *o,
static int tree_has_path(struct tree *tree, const char *path)
{
struct object_id hashy;
unsigned int mode_o;
unsigned short mode_o;
return !get_tree_entry(&tree->object.oid, path,
&hashy, &mode_o);