From c8842e6a275c7db033b14197d7dcb7de2b8d23b5 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Sun, 31 Aug 2014 10:27:36 +0200 Subject: [PATCH] vasnprintf: Avoid signed/unsigned comparison warning. * lib/vasnprintf.c (VASNPRINTF): To calculate padding, compare end addr of generated string w/ maximum end addr. --- ChangeLog | 6 ++++++ lib/vasnprintf.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c48ca83054..c466e87c8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-08-31 Thien-Thi Nguyen (tiny change) + + vasnprintf: Avoid signed/unsigned comparison warning. + * lib/vasnprintf.c (VASNPRINTF): To calculate padding, + compare end addr of generated string w/ maximum end addr. + 2013-08-30 Mats Erik Andersson (tiny change) parse-datetime: Avoid pointer difference. diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index f2ccc1c9cc..6ca47ebd0a 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -3356,7 +3356,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, } /* The generated string now extends from tmp to p, with the zero padding insertion point being at pad_ptr. */ - if (has_width && p - tmp < width) + if (has_width && p < tmp + width) { size_t pad = width - (p - tmp); DCHAR_T *end = p + pad; -- 2.39.5