NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit03b8efa

committed

Make snprintf() use already-defined int64/uint64 typedefs rather than

defining its own.

1 parent5edb76d commit03b8efaCopy full SHA for 03b8efa

File tree

1 file changed

+11

-30

lines changed

src/port
- snprintf.c

1 file changed

+11

-30

lines changed

`‎src/port/snprintf.c‎`

Lines changed: 11 additions & 30 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,30 +35,11 @@`
`35`	`35`	`/* might be in either frontend or backend */`
`36`	`36`	`#include"postgres_fe.h"`
`37`	`37`
`38`		`-#ifdefENABLE_THREAD_SAFETY`
`39`		`-#errorThe replacement snprintf() is not thread-safe.\`
`40`		`-Your platform must have a thread-safe snprintf() to compile with threads.`
`41`		`-#endif`
`42`		`-`
`43`	`38`	`#ifndefWIN32`
`44`	`39`	`#include<sys/ioctl.h>`
`45`	`40`	`#endif`
`46`	`41`	`#include<sys/param.h>`
`47`	`42`
`48`		`-`
`49`		`-/*`
`50`		`- * We do all internal arithmetic in the widest available integer type,`
`51`		`- * here called long_long (or ulong_long for unsigned).`
`52`		`- */`
`53`		`-#ifdefHAVE_LONG_LONG_INT_64`
`54`		`-typedeflong longlong_long;`
`55`		`-typedefunsigned long longulong_long;`
`56`		`-`
`57`		`-#else`
`58`		`-typedeflonglong_long;`
`59`		`-typedefunsigned longulong_long;`
`60`		`-#endif`
`61`		`-`
`62`	`43`	`#ifndefNL_ARGMAX`
`63`	`44`	`#defineNL_ARGMAX 4096`
`64`	`45`	`#endif`
`@@ -85,7 +66,7 @@ typedef unsigned long ulong_long;`
`85`	`66`	`* causing nasty effects.`
`86`	`67`	`**************************************************************/`
`87`	`68`
`88`		`-/static char _id[] = "$PostgreSQL: pgsql/src/port/snprintf.c,v 1.8 2005/03/0100:38:11 momjian Exp $";/`
	`69`	`+/static char _id[] = "$PostgreSQL: pgsql/src/port/snprintf.c,v 1.9 2005/03/0105:47:28 momjian Exp $";/`
`89`	`70`
`90`	`71`	`intsnprintf(charstr,size_tcount,constcharfmt,...);`
`91`	`72`	`intvsnprintf(charstr,size_tcount,constcharfmt,va_listargs);`
`@@ -139,7 +120,7 @@ vsnprintf(char str, size_t count, const char fmt, va_list args)`
`139`	`120`	`*/`
`140`	`121`
`141`	`122`	`staticvoidfmtstr(charvalue,intljust,intlen,intzpad,intmaxwidth,charend);`
`142`		`-staticvoidfmtnum(long_longvalue,intbase,intdosign,intljust,intlen,intzpad,char*end);`
	`123`	`+staticvoidfmtnum(int64value,intbase,intdosign,intljust,intlen,intzpad,char*end);`
`143`	`124`	`staticvoidfmtfloat(doublevalue,chartype,intljust,intlen,intprecision,intpointflag,char*end);`
`144`	`125`	`staticvoiddostr(charstr,intcut,charend);`
`145`	`126`	`staticvoiddopr_outch(intc,char*end);`
`@@ -155,7 +136,7 @@ static void`
`155`	`136`	`dopr(charbuffer,constcharformat,va_listargs,char*end)`
`156`	`137`	`{`
`157`	`138`	`intch;`
`158`		`-long_longvalue;`
	`139`	`+int64value;`
`159`	`140`	`doublefvalue;`
`160`	`141`	`intlonglongflag=0;`
`161`	`142`	`intlongflag=0;`
`@@ -175,7 +156,7 @@ dopr(char buffer, const char format, va_list args, char *end)`
`175`	`156`	`constchar*fmtbegin;`
`176`	`157`	`constchar*fmtend;`
`177`	`158`	`void*value;`
`178`		`-long_longnumvalue;`
	`159`	`+int64numvalue;`
`179`	`160`	`doublefvalue;`
`180`	`161`	`intcharvalue;`
`181`	`162`	`intljust;`
`@@ -258,7 +239,7 @@ dopr(char buffer, const char format, va_list args, char *end)`
`258`	`239`	`if (longflag)`
`259`	`240`	`{`
`260`	`241`	`if (longlongflag)`
`261`		`-value=va_arg(args,ulong_long);`
	`242`	`+value=va_arg(args,uint64);`
`262`	`243`	`else`
`263`	`244`	`value=va_arg(args,unsignedlong);`
`264`	`245`	`}`
`@@ -282,7 +263,7 @@ dopr(char buffer, const char format, va_list args, char *end)`
`282`	`263`	`if (longflag)`
`283`	`264`	`{`
`284`	`265`	`if (longlongflag)`
`285`		`-value=va_arg(args,ulong_long);`
	`266`	`+value=va_arg(args,uint64);`
`286`	`267`	`else`
`287`	`268`	`value=va_arg(args,unsignedlong);`
`288`	`269`	`}`
`@@ -305,7 +286,7 @@ dopr(char buffer, const char format, va_list args, char *end)`
`305`	`286`	`if (longflag)`
`306`	`287`	`{`
`307`	`288`	`if (longlongflag)`
`308`		`-value=va_arg(args,long_long);`
	`289`	`+value=va_arg(args,int64);`
`309`	`290`	`else`
`310`	`291`	`value=va_arg(args,long);`
`311`	`292`	`}`
`@@ -327,7 +308,7 @@ dopr(char buffer, const char format, va_list args, char *end)`
`327`	`308`	`if (longflag)`
`328`	`309`	`{`
`329`	`310`	`if (longlongflag)`
`330`		`-value=va_arg(args,ulong_long);`
	`311`	`+value=va_arg(args,uint64);`
`331`	`312`	`else`
`332`	`313`	`value=va_arg(args,unsignedlong);`
`333`	`314`	`}`
`@@ -349,7 +330,7 @@ dopr(char buffer, const char format, va_list args, char *end)`
`349`	`330`	`if (longflag)`
`350`	`331`	`{`
`351`	`332`	`if (longlongflag)`
`352`		`-value=va_arg(args,ulong_long);`
	`333`	`+value=va_arg(args,uint64);`
`353`	`334`	`else`
`354`	`335`	`value=va_arg(args,unsignedlong);`
`355`	`336`	`}`
`@@ -505,10 +486,10 @@ fmtstr(char value, int ljust, int len, int zpad, int maxwidth, char end)`
`505`	`486`	`}`
`506`	`487`
`507`	`488`	`staticvoid`
`508`		`-fmtnum(long_longvalue,intbase,intdosign,intljust,intlen,intzpad,char*end)`
	`489`	`+fmtnum(int64value,intbase,intdosign,intljust,intlen,intzpad,char*end)`
`509`	`490`	`{`
`510`	`491`	`intsignvalue=0;`
`511`		`-ulong_longuvalue;`
	`492`	`+uint64uvalue;`
`512`	`493`	`charconvert[64];`
`513`	`494`	`intplace=0;`
`514`	`495`	`intpadlen=0;/* amount to pad */`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit03b8efa

File tree

1 file changed

1 file changed

`‎src/port/snprintf.c‎`

0 commit comments