From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [Patch v3 2/7] common/vsprintf: Refactor pointer() out of vsnprintf() Date: Tue, 5 Nov 2013 14:38:39 +0000 Message-ID: <1383662324-3397-3-git-send-email-andrew.cooper3@citrix.com> References: <1383662324-3397-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1383662324-3397-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Andrew Cooper , Keir Fraser , Jan Beulich List-Id: xen-devel@lists.xenproject.org No functional change Signed-off-by: Andrew Cooper CC: Keir Fraser CC: Jan Beulich --- Changes in v3: * Pass void* rather than unsigned long * Consolidate return --- xen/common/vsprintf.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index 1bcbd79..8f8d2f6 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -261,6 +261,20 @@ static char *string(char *str, char *end, const char *s, return str; } +static char *pointer(char *str, char *end, + const void *arg, int field_width, int precision, + int flags) +{ + if ( field_width == -1 ) + { + field_width = 2 * sizeof(void *); + flags |= ZEROPAD; + } + + return number(str, end, (unsigned long)arg, + 16, field_width, precision, flags); +} + /** * vsnprintf - Format a string and place it in a buffer * @buf: The buffer to place the result into @@ -399,13 +413,8 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) continue; case 'p': - if (field_width == -1) { - field_width = 2*sizeof(void *); - flags |= ZEROPAD; - } - str = number(str, end, - (unsigned long) va_arg(args, void *), - 16, field_width, precision, flags); + str = pointer(str, end, va_arg(args, void *), + field_width, precision, flags); continue; -- 1.7.10.4