mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

revert 'protect long long with ISC_PLATFORM_HAVELONGLONG' change

Browse Source
This commit is contained in:
Andreas Gustafsson
2001-02-22 18:01:48 +00:00
parent 25c3ab1a5f
commit 4115f9d34b
2 changed files with 16 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/isc/include/isc/print.h
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: print.h,v 1.15 2001/02/21 06:13:33 marka Exp $ */ /* $Id: print.h,v 1.16 2001/02/22 18:01:48 gson Exp $ */
#ifndef ISC_PRINT_H #ifndef ISC_PRINT_H
#define ISC_PRINT_H 1 #define ISC_PRINT_H 1
@@ -41,15 +41,11 @@
/*** /***
*** Macros *** Macros
***/ ***/
#ifdef ISC_PLATFORM_HAVELONGLONG
#ifdef ISC_PLATFORM_LONGLONGEQUALLONG #ifdef ISC_PLATFORM_LONGLONGEQUALLONG
#define ISC_PRINT_QUADFORMAT "l" #define ISC_PRINT_QUADFORMAT "l"
#else #else
#define ISC_PRINT_QUADFORMAT "ll" #define ISC_PRINT_QUADFORMAT "ll"
#endif #endif
#else
#define ISC_PRINT_QUADFORMAT "l"
#endif
/*** /***
*** Functions *** Functions

66
lib/isc/print.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: print.c,v 1.18 2001/02/21 06:13:32 marka Exp $ */ /* $Id: print.c,v 1.19 2001/02/22 18:01:47 gson Exp $ */
#include <config.h> #include <config.h>
@@ -34,6 +34,7 @@
/* /*
* Return length of string that would have been written if not truncated. * Return length of string that would have been written if not truncated.
*/ */
int int
isc_print_snprintf(char *str, size_t size, const char *format, ...) { isc_print_snprintf(char *str, size_t size, const char *format, ...) {
va_list ap; va_list ap;
@@ -61,13 +62,8 @@ isc_print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
int plus; int plus;
int space; int space;
int neg; int neg;
#ifdef ISC_PLATFORM_HAVELONGLONG
long long tmpi; long long tmpi;
unsigned long long tmpui; isc_uint64_t tmpui;
#else
long tmpi;
unsigned long tmpui;
#endif
unsigned long width; unsigned long width;
unsigned long precision; unsigned long precision;
unsigned int length; unsigned int length;
@@ -174,14 +170,7 @@ isc_print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
count++; count++;
break; break;
case 'q': case 'q':
#ifdef ISC_PLATFORM_HAVELONGLONG
q = 1; q = 1;
#else
INSIST(isc_msgcat_get(isc_msgcat, ISC_MSGSET_PRINT,
ISC_MSG_NOQUAD,
"quads are not supported")
== NULL);
#endif
format++; format++;
goto doint; goto doint;
case 'h': case 'h':
@@ -192,13 +181,7 @@ isc_print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
l = 1; l = 1;
format++; format++;
if (*format == 'l') if (*format == 'l')
#ifdef ISC_PLATFORM_HAVELONGLONG
q = 1; q = 1;
INSIST(isc_msgcat_get(isc_msgcat, ISC_MSGSET_PRINT,
ISC_MSG_NOLL,
"long longs are not supported")
== NULL);
#endif
goto doint; goto doint;
case 'n': case 'n':
case 'i': case 'i':
@@ -231,12 +214,9 @@ isc_print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
break; break;
case 'i': case 'i':
case 'd': case 'd':
#ifdef ISC_PLATFORM_HAVELONGLONG
if (q) if (q)
tmpi = va_arg(ap, long long int); tmpi = va_arg(ap, isc_int64_t);
else else if (l)
#endif
if (l)
tmpi = va_arg(ap, long int); tmpi = va_arg(ap, long int);
else else
tmpi = va_arg(ap, int); tmpi = va_arg(ap, int);
@@ -256,29 +236,21 @@ isc_print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
tmpui); tmpui);
goto printint; goto printint;
case 'o': case 'o':
#ifdef ISC_PLATFORM_HAVELONGLONG
if (q) if (q)
tmpui = va_arg(ap, tmpui = va_arg(ap, isc_uint64_t);
unsigned long long int); else if (l)
tmpui = va_arg(ap, long int);
else else
#endif tmpui = va_arg(ap, int);
if (l)
tmpui = va_arg(ap, unsigned long int);
else
tmpui = va_arg(ap, unsigned int);
sprintf(buf, sprintf(buf,
alt ? "%#" ISC_PRINT_QUADFORMAT "o" alt ? "%#" ISC_PRINT_QUADFORMAT "o"
: "%" ISC_PRINT_QUADFORMAT "o", : "%" ISC_PRINT_QUADFORMAT "o",
tmpui); tmpui);
goto printint; goto printint;
case 'u': case 'u':
#ifdef ISC_PLATFORM_HAVELONGLONG
if (q) if (q)
tmpui = va_arg(ap, tmpui = va_arg(ap, isc_uint64_t);
unsigned long long int); else if (l)
else
#endif
if (l)
tmpui = va_arg(ap, unsigned long int); tmpui = va_arg(ap, unsigned long int);
else else
tmpui = va_arg(ap, unsigned int); tmpui = va_arg(ap, unsigned int);
@@ -286,13 +258,9 @@ isc_print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
tmpui); tmpui);
goto printint; goto printint;
case 'x': case 'x':
#ifdef ISC_PLATFORM_HAVELONGLONG
if (q) if (q)
tmpui = va_arg(ap, tmpui = va_arg(ap, isc_uint64_t);
unsigned long long int); else if (l)
else
#endif
if (l)
tmpui = va_arg(ap, unsigned long int); tmpui = va_arg(ap, unsigned long int);
else else
tmpui = va_arg(ap, unsigned int); tmpui = va_arg(ap, unsigned int);
@@ -305,13 +273,9 @@ isc_print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
tmpui); tmpui);
goto printint; goto printint;
case 'X': case 'X':
#ifdef ISC_PLATFORM_HAVELONGLONG
if (q) if (q)
tmpui = va_arg(ap, tmpui = va_arg(ap, isc_uint64_t);
unsigned long long int); else if (l)
else
#endif
if (l)
tmpui = va_arg(ap, unsigned long int); tmpui = va_arg(ap, unsigned long int);
else else
tmpui = va_arg(ap, unsigned int); tmpui = va_arg(ap, unsigned int);