development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rs/no-null-ptr-arith-in-fast-export'

Browse source 
Code clean-up to avoid non-standard-conformant pointer arithmetic.

* rs/no-null-ptr-arith-in-fast-export:
  fast-export: avoid NULL pointer arithmetic
This commit is contained in:
Junio C Hamano 2018-05-30 14:04:06 +09:00
parent 0abb962893 c112084af9
commit bef896e4ab
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
builtin/fast-export.c
View file

@ -156,15 +156,14 @@ static void anonymize_path(struct strbuf *out, const char *path,
}
}
/* Since intptr_t is C99, we do not use it here */
static inline uint32_t *mark_to_ptr(uint32_t mark)
static inline void *mark_to_ptr(uint32_t mark)
{
return ((uint32_t *)NULL) + mark;
return (void *)(uintptr_t)mark;
}
static inline uint32_t ptr_to_mark(void * mark)
{
return (uint32_t *)mark - (uint32_t *)NULL;
return (uint32_t)(uintptr_t)mark;
}
static inline void mark_object(struct object *object, uint32_t mark)