From 4b43d18c4a733b1c47ccab481502a7d84fd07691 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 15 Feb 2010 16:18:52 +0000 Subject: fix compiler warning: conversion from "long" to "size_t" may lose sign --- tests/server/getpart.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'tests/server/getpart.c') diff --git a/tests/server/getpart.c b/tests/server/getpart.c index ec4198cec..3ecc20c99 100644 --- a/tests/server/getpart.c +++ b/tests/server/getpart.c @@ -238,7 +238,10 @@ int getpart(char **outbuf, size_t *outlen, char *buffer = NULL; char *ptr; char *end; - size_t length; + union { + ssize_t sig; + size_t uns; + } len; size_t bufsize = 0; size_t outalloc = 256; int in_wanted_part = 0; @@ -286,12 +289,12 @@ int getpart(char **outbuf, size_t *outlen, ptr++; end = ptr; EAT_WORD(end); - if((length = end - ptr) > MAX_TAG_LEN) { + if((len.sig = end - ptr) > MAX_TAG_LEN) { error = GPE_NO_BUFFER_SPACE; break; } - memcpy(ptag, ptr, length); - ptag[length] = '\0'; + memcpy(ptag, ptr, len.uns); + ptag[len.uns] = '\0'; if((STATE_INSUB == state) && !strcmp(csub, ptag)) { /* end of current sub section */ @@ -333,12 +336,12 @@ int getpart(char **outbuf, size_t *outlen, /* get potential tag */ end = ptr; EAT_WORD(end); - if((length = end - ptr) > MAX_TAG_LEN) { + if((len.sig = end - ptr) > MAX_TAG_LEN) { error = GPE_NO_BUFFER_SPACE; break; } - memcpy(ptag, ptr, length); - ptag[length] = '\0'; + memcpy(ptag, ptr, len.uns); + ptag[len.uns] = '\0'; /* ignore comments, doctypes and xml declarations */ if(('!' == ptag[0]) || ('?' == ptag[0])) { @@ -352,12 +355,12 @@ int getpart(char **outbuf, size_t *outlen, end = ptr; while(*end && ('>' != *end)) end++; - if((length = end - ptr) > MAX_TAG_LEN) { + if((len.sig = end - ptr) > MAX_TAG_LEN) { error = GPE_NO_BUFFER_SPACE; break; } - memcpy(patt, ptr, length); - patt[length] = '\0'; + memcpy(patt, ptr, len.uns); + patt[len.uns] = '\0'; if(STATE_OUTSIDE == state) { /* outermost element () */ -- cgit v1.2.3