mirror of
https://github.com/postgres/postgres.git
synced 2025-06-03 01:21:48 +03:00
Fix for snprintf with long long's, define problem.
This commit is contained in:
parent
c29d0f31b4
commit
6b7cf13200
@ -49,7 +49,7 @@
|
|||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
|
|
||||||
/* IRIX doesn't do 'long long' in va_arg(), so use a typedef */
|
/* IRIX doesn't do 'long long' in va_arg(), so use a typedef */
|
||||||
#ifdef HAVE_LONG_INT_64
|
#ifdef HAVE_LONG_LONG_INT_64
|
||||||
typedef long long long_long;
|
typedef long long long_long;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -75,7 +75,7 @@ typedef long long long_long;
|
|||||||
* causing nast effects.
|
* causing nast effects.
|
||||||
**************************************************************/
|
**************************************************************/
|
||||||
|
|
||||||
/*static char _id[] = "$Id: snprintf.c,v 1.11 1998/12/12 21:30:57 momjian Exp $";*/
|
/*static char _id[] = "$Id: snprintf.c,v 1.12 1998/12/18 06:59:39 momjian Exp $";*/
|
||||||
static char *end;
|
static char *end;
|
||||||
static int SnprfOverflow;
|
static int SnprfOverflow;
|
||||||
|
|
||||||
@ -122,7 +122,7 @@ vsnprintf(char *str, size_t count, const char *fmt,...)
|
|||||||
|
|
||||||
static void fmtstr __P((char *value, int ljust, int len, int zpad, int maxwidth));
|
static void fmtstr __P((char *value, int ljust, int len, int zpad, int maxwidth));
|
||||||
|
|
||||||
#ifndef HAVE_LONG_INT_64
|
#ifndef HAVE_LONG_LONG_INT_64
|
||||||
static void fmtnum __P((long value, int base, int dosign, int ljust, int len, int zpad));
|
static void fmtnum __P((long value, int base, int dosign, int ljust, int len, int zpad));
|
||||||
#else
|
#else
|
||||||
static void fmtnum __P((long_long value, int base, int dosign, int ljust, int len, int zpad));
|
static void fmtnum __P((long_long value, int base, int dosign, int ljust, int len, int zpad));
|
||||||
@ -136,7 +136,7 @@ static void
|
|||||||
dopr(char *buffer, const char *format,...)
|
dopr(char *buffer, const char *format,...)
|
||||||
{
|
{
|
||||||
int ch;
|
int ch;
|
||||||
#ifdef HAVE_LONG_INT_64
|
#ifdef HAVE_LONG_LONG_INT_64
|
||||||
long_long value;
|
long_long value;
|
||||||
#else
|
#else
|
||||||
long value;
|
long value;
|
||||||
@ -215,7 +215,7 @@ dopr(char *buffer, const char *format,...)
|
|||||||
/* fmtnum(value,base,dosign,ljust,len,zpad) */
|
/* fmtnum(value,base,dosign,ljust,len,zpad) */
|
||||||
if (longflag)
|
if (longflag)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_LONG_INT_64
|
#ifdef HAVE_LONG_LONG_INT_64
|
||||||
if (longlongflag)
|
if (longlongflag)
|
||||||
value = va_arg(args, long_long);
|
value = va_arg(args, long_long);
|
||||||
else
|
else
|
||||||
@ -231,7 +231,7 @@ dopr(char *buffer, const char *format,...)
|
|||||||
/* fmtnum(value,base,dosign,ljust,len,zpad) */
|
/* fmtnum(value,base,dosign,ljust,len,zpad) */
|
||||||
if (longflag)
|
if (longflag)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_LONG_INT_64
|
#ifdef HAVE_LONG_LONG_INT_64
|
||||||
if (longlongflag)
|
if (longlongflag)
|
||||||
value = va_arg(args, long_long);
|
value = va_arg(args, long_long);
|
||||||
else
|
else
|
||||||
@ -246,7 +246,7 @@ dopr(char *buffer, const char *format,...)
|
|||||||
case 'D':
|
case 'D':
|
||||||
if (longflag)
|
if (longflag)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_LONG_INT_64
|
#ifdef HAVE_LONG_LONG_INT_64
|
||||||
if (longlongflag)
|
if (longlongflag)
|
||||||
value = va_arg(args, long_long);
|
value = va_arg(args, long_long);
|
||||||
else
|
else
|
||||||
@ -260,7 +260,7 @@ dopr(char *buffer, const char *format,...)
|
|||||||
case 'x':
|
case 'x':
|
||||||
if (longflag)
|
if (longflag)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_LONG_INT_64
|
#ifdef HAVE_LONG_LONG_INT_64
|
||||||
if (longlongflag)
|
if (longlongflag)
|
||||||
value = va_arg(args, long_long);
|
value = va_arg(args, long_long);
|
||||||
else
|
else
|
||||||
@ -274,7 +274,7 @@ dopr(char *buffer, const char *format,...)
|
|||||||
case 'X':
|
case 'X':
|
||||||
if (longflag)
|
if (longflag)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_LONG_INT_64
|
#ifdef HAVE_LONG_LONG_INT_64
|
||||||
if (longlongflag)
|
if (longlongflag)
|
||||||
value = va_arg(args, long_long);
|
value = va_arg(args, long_long);
|
||||||
else
|
else
|
||||||
@ -350,7 +350,7 @@ int ljust,
|
|||||||
|
|
||||||
static void
|
static void
|
||||||
fmtnum(value, base, dosign, ljust, len, zpad)
|
fmtnum(value, base, dosign, ljust, len, zpad)
|
||||||
#ifdef HAVE_LONG_INT_64
|
#ifdef HAVE_LONG_LONG_INT_64
|
||||||
long_long value;
|
long_long value;
|
||||||
#else
|
#else
|
||||||
long value;
|
long value;
|
||||||
@ -362,8 +362,8 @@ int base,
|
|||||||
zpad;
|
zpad;
|
||||||
{
|
{
|
||||||
int signvalue = 0;
|
int signvalue = 0;
|
||||||
#ifdef HAVE_LONG_INT_64
|
#ifdef HAVE_LONG_LONG_INT_64
|
||||||
unsigned long long uvalue;
|
unsigned long_long uvalue;
|
||||||
#else
|
#else
|
||||||
unsigned long uvalue;
|
unsigned long uvalue;
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user