summaryrefslogtreecommitdiffstats
path: root/contrib/bind9/lib/lwres/print.c
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/bind9/lib/lwres/print.c')
-rw-r--r--contrib/bind9/lib/lwres/print.c79
1 files changed, 40 insertions, 39 deletions
diff --git a/contrib/bind9/lib/lwres/print.c b/contrib/bind9/lib/lwres/print.c
index 13d273d..e8dd37a 100644
--- a/contrib/bind9/lib/lwres/print.c
+++ b/contrib/bind9/lib/lwres/print.c
@@ -15,12 +15,13 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: print.c,v 1.2.4.1 2004/08/28 06:25:25 marka Exp $ */
+/* $Id: print.c,v 1.2.4.3 2004/09/16 07:01:13 marka Exp $ */
#include <config.h>
#include <ctype.h>
#include <stdio.h> /* for sprintf */
+#include <string.h>
#define LWRES__PRINT_SOURCE /* Used to get the lwres_print_* prototypes. */
@@ -96,7 +97,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
while (*format != '\0') {
if (*format != '%') {
- if (size > 1) {
+ if (size > 1U) {
*str++ = *format;
size--;
}
@@ -170,7 +171,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
case '\0':
continue;
case '%':
- if (size > 1) {
+ if (size > 1U) {
*str++ = *format;
size--;
}
@@ -200,7 +201,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
case 'x':
case 'X':
doint:
- if (precision != 0)
+ if (precision != 0U)
zero = 0;
switch (*format) {
case 'n':
@@ -275,7 +276,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
tmpui = va_arg(ap, unsigned int);
if (alt) {
head = "0x";
- if (precision > 2)
+ if (precision > 2U)
precision -= 2;
}
sprintf(buf, "%llx", tmpui);
@@ -290,19 +291,19 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
tmpui = va_arg(ap, unsigned int);
if (alt) {
head = "0X";
- if (precision > 2)
+ if (precision > 2U)
precision -= 2;
}
sprintf(buf, "%llX", tmpui);
goto printint;
printint:
- if (precision != 0 || width != 0) {
+ if (precision != 0U || width != 0U) {
length = strlen(buf);
if (length < precision)
zeropad = precision - length;
else if (length < width && zero)
zeropad = width - length;
- if (width != 0) {
+ if (width != 0U) {
pad = width - length -
zeropad - strlen(head);
if (pad < 0)
@@ -312,28 +313,28 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
count += strlen(head) + strlen(buf) + pad +
zeropad;
if (!left) {
- while (pad > 0 && size > 1) {
+ while (pad > 0 && size > 1U) {
*str++ = ' ';
size--;
pad--;
}
}
cp = head;
- while (*cp != '\0' && size > 1) {
+ while (*cp != '\0' && size > 1U) {
*str++ = *cp++;
size--;
}
- while (zeropad > 0 && size > 1) {
+ while (zeropad > 0 && size > 1U) {
*str++ = '0';
size--;
zeropad--;
}
cp = buf;
- while (*cp != '\0' && size > 1) {
+ while (*cp != '\0' && size > 1U) {
*str++ = *cp++;
size--;
}
- while (pad > 0 && size > 1) {
+ while (pad > 0 && size > 1U) {
*str++ = ' ';
size--;
pad--;
@@ -347,7 +348,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
cp = va_arg(ap, char *);
REQUIRE(cp != NULL);
- if (precision != 0) {
+ if (precision != 0U) {
/*
* cp need not be NULL terminated.
*/
@@ -356,37 +357,37 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
n = precision;
tp = cp;
- while (n != 0 && *tp != '\0')
+ while (n != 0U && *tp != '\0')
n--, tp++;
length = precision - n;
} else {
length = strlen(cp);
}
- if (width != 0) {
+ if (width != 0U) {
pad = width - length;
if (pad < 0)
pad = 0;
}
count += pad + length;
if (!left)
- while (pad > 0 && size > 1) {
+ while (pad > 0 && size > 1U) {
*str++ = ' ';
size--;
pad--;
}
- if (precision != 0)
- while (precision > 0 && *cp != '\0' &&
- size > 1) {
+ if (precision != 0U)
+ while (precision > 0U && *cp != '\0' &&
+ size > 1U) {
*str++ = *cp++;
size--;
precision--;
}
else
- while (*cp != '\0' && size > 1) {
+ while (*cp != '\0' && size > 1U) {
*str++ = *cp++;
size--;
}
- while (pad > 0 && size > 1) {
+ while (pad > 0 && size > 1U) {
*str++ = ' ';
size--;
pad--;
@@ -394,24 +395,24 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
break;
case 'c':
c = va_arg(ap, int);
- if (width > 0) {
+ if (width > 0U) {
count += width;
width--;
if (left) {
*str++ = c;
size--;
}
- while (width-- > 0 && size > 1) {
+ while (width-- > 0U && size > 1U) {
*str++ = ' ';
size--;
}
- if (!left && size > 1) {
+ if (!left && size > 1U) {
*str++ = c;
size--;
}
} else {
count++;
- if (size > 1) {
+ if (size > 1U) {
*str++ = c;
size--;
}
@@ -423,14 +424,14 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
length = strlen(buf);
if (precision > length)
zeropad = precision - length;
- if (width > 0) {
+ if (width > 0U) {
pad = width - length - zeropad;
if (pad < 0)
pad = 0;
}
count += length + pad + zeropad;
if (!left)
- while (pad > 0 && size > 1) {
+ while (pad > 0 && size > 1U) {
*str++ = ' ';
size--;
pad--;
@@ -438,25 +439,25 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
cp = buf;
if (zeropad > 0 && buf[0] == '0' &&
(buf[1] == 'x' || buf[1] == 'X')) {
- if (size > 1) {
+ if (size > 1U) {
*str++ = *cp++;
size--;
}
- if (size > 1) {
+ if (size > 1U) {
*str++ = *cp++;
size--;
}
- while (zeropad > 0 && size > 1) {
+ while (zeropad > 0 && size > 1U) {
*str++ = '0';
size--;
zeropad--;
}
}
- while (*cp != '\0' && size > 1) {
+ while (*cp != '\0' && size > 1U) {
*str++ = *cp++;
size--;
}
- while (pad > 0 && size > 1) {
+ while (pad > 0 && size > 1U) {
*str++ = ' ';
size--;
pad--;
@@ -493,7 +494,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
* if we cap the precision at 512 we will not
* overflow buf.
*/
- if (precision > 512)
+ if (precision > 512U)
precision = 512;
sprintf(fmt, "%%%s%s.%lu%s%c", alt ? "#" : "",
plus ? "+" : space ? " " : "",
@@ -515,24 +516,24 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
sprintf(buf, fmt, dbl);
}
length = strlen(buf);
- if (width > 0) {
+ if (width > 0U) {
pad = width - length;
if (pad < 0)
pad = 0;
}
count += length + pad;
if (!left)
- while (pad > 0 && size > 1) {
+ while (pad > 0 && size > 1U) {
*str++ = ' ';
size--;
pad--;
}
cp = buf;
- while (*cp != ' ' && size > 1) {
+ while (*cp != ' ' && size > 1U) {
*str++ = *cp++;
size--;
}
- while (pad > 0 && size > 1) {
+ while (pad > 0 && size > 1U) {
*str++ = ' ';
size--;
pad--;
@@ -547,7 +548,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
}
format++;
}
- if (size > 0)
+ if (size > 0U)
*str = '\0';
return (count);
}
OpenPOWER on IntegriCloud