From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 May 2018 05:04:06 +0000 (+0900)
Subject: Merge branch 'rs/no-null-ptr-arith-in-fast-export'
X-Git-Tag: v2.18.0-rc0~27
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bef896e4ab414312cdca493e0306d66ec7246b01?hp=0abb9628932717f535f27d4652c07455389db5f3

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

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

* rs/no-null-ptr-arith-in-fast-export:
fast-export: avoid NULL pointer arithmetic
---

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 68a762fbea..07d20f446f 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -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)