rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add #define INT64_MODIFIER for the printf length modifier for 64-bit ints. 

We have had INT64_FORMAT and UINT64_FORMAT for a long time, but that's not
good enough if you want something more exotic, like "%20lld".

Abhijit Menon-Sen, per Andres Freund's suggestion.
This commit is contained in:
Heikki Linnakangas 2014-08-21 09:56:44 +03:00
parent fa069822f5
commit ce486056ec
6 changed files with 49 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
config/c-library.m4
View File

@ -221,22 +221,22 @@ HAVE_POSIX_SIGNALS=$pgac_cv_func_posix_signals
AC_SUBST(HAVE_POSIX_SIGNALS)])# PGAC_FUNC_POSIX_SIGNALS AC_SUBST(HAVE_POSIX_SIGNALS)])# PGAC_FUNC_POSIX_SIGNALS
# PGAC_FUNC_SNPRINTF_LONG_LONG_INT_FORMAT # PGAC_FUNC_SNPRINTF_LONG_LONG_INT_MODIFIER
# --------------------------------------- # ---------------------------------------
# Determine which format snprintf uses for long long int. We handle # Determine which length modifier snprintf uses for long long int. We
# %lld, %qd, %I64d. The result is in shell variable # handle ll, q, and I64. The result is in shell variable
# LONG_LONG_INT_FORMAT. # LONG_LONG_INT_MODIFIER.
# #
# MinGW uses '%I64d', though gcc throws an warning with -Wall, # MinGW uses '%I64d', though gcc throws an warning with -Wall,
# while '%lld' doesn't generate a warning, but doesn't work. # while '%lld' doesn't generate a warning, but doesn't work.
# #
AC_DEFUN([PGAC_FUNC_SNPRINTF_LONG_LONG_INT_FORMAT], AC_DEFUN([PGAC_FUNC_SNPRINTF_LONG_LONG_INT_MODIFIER],
[AC_MSG_CHECKING([snprintf format for long long int]) [AC_MSG_CHECKING([snprintf length modifier for long long int])
AC_CACHE_VAL(pgac_cv_snprintf_long_long_int_format, AC_CACHE_VAL(pgac_cv_snprintf_long_long_int_modifier,
[for pgac_format in '%lld' '%qd' '%I64d'; do [for pgac_modifier in 'll' 'q' 'I64'; do
AC_TRY_RUN([#include <stdio.h> AC_TRY_RUN([#include <stdio.h>
typedef long long int ac_int64; typedef long long int ac_int64;
#define INT64_FORMAT "$pgac_format" #define INT64_FORMAT "%${pgac_modifier}d"
ac_int64 a = 20000001; ac_int64 a = 20000001;
ac_int64 b = 40000005; ac_int64 b = 40000005;
@ -258,19 +258,19 @@ int does_int64_snprintf_work()
main() { main() {
exit(! does_int64_snprintf_work()); exit(! does_int64_snprintf_work());
}], }],
[pgac_cv_snprintf_long_long_int_format=$pgac_format; break], [pgac_cv_snprintf_long_long_int_modifier=$pgac_modifier; break],
[], [],
[pgac_cv_snprintf_long_long_int_format=cross; break]) [pgac_cv_snprintf_long_long_int_modifier=cross; break])
done])dnl AC_CACHE_VAL done])dnl AC_CACHE_VAL
LONG_LONG_INT_FORMAT='' LONG_LONG_INT_MODIFIER=''
case $pgac_cv_snprintf_long_long_int_format in case $pgac_cv_snprintf_long_long_int_modifier in
cross) AC_MSG_RESULT([cannot test (not on host machine)]);; cross) AC_MSG_RESULT([cannot test (not on host machine)]);;
?*) AC_MSG_RESULT([$pgac_cv_snprintf_long_long_int_format]) ?*) AC_MSG_RESULT([$pgac_cv_snprintf_long_long_int_modifier])
LONG_LONG_INT_FORMAT=$pgac_cv_snprintf_long_long_int_format;; LONG_LONG_INT_MODIFIER=$pgac_cv_snprintf_long_long_int_modifier;;
*) AC_MSG_RESULT(none);; *) AC_MSG_RESULT(none);;
esac])# PGAC_FUNC_SNPRINTF_LONG_LONG_INT_FORMAT esac])# PGAC_FUNC_SNPRINTF_LONG_LONG_INT_MODIFIER
# PGAC_FUNC_SNPRINTF_ARG_CONTROL # PGAC_FUNC_SNPRINTF_ARG_CONTROL

44
configure vendored
View File

@ -13095,20 +13095,20 @@ fi
if test "$HAVE_LONG_LONG_INT_64" = yes ; then if test "$HAVE_LONG_LONG_INT_64" = yes ; then
if test $pgac_need_repl_snprintf = no; then if test $pgac_need_repl_snprintf = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking snprintf format for long long int" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking snprintf length modifier for long long int" >&5
$as_echo_n "checking snprintf format for long long int... " >&6; } $as_echo_n "checking snprintf length modifier for long long int... " >&6; }
if ${pgac_cv_snprintf_long_long_int_format+:} false; then : if ${pgac_cv_snprintf_long_long_int_modifier+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
for pgac_format in '%lld' '%qd' '%I64d'; do for pgac_modifier in 'll' 'q' 'I64'; do
if test "$cross_compiling" = yes; then : if test "$cross_compiling" = yes; then :
pgac_cv_snprintf_long_long_int_format=cross; break pgac_cv_snprintf_long_long_int_modifier=cross; break
else else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include <stdio.h> #include <stdio.h>
typedef long long int ac_int64; typedef long long int ac_int64;
#define INT64_FORMAT "$pgac_format" #define INT64_FORMAT "%${pgac_modifier}d"
ac_int64 a = 20000001; ac_int64 a = 20000001;
ac_int64 b = 40000005; ac_int64 b = 40000005;
@ -13132,7 +13132,7 @@ main() {
} }
_ACEOF _ACEOF
if ac_fn_c_try_run "$LINENO"; then : if ac_fn_c_try_run "$LINENO"; then :
pgac_cv_snprintf_long_long_int_format=$pgac_format; break pgac_cv_snprintf_long_long_int_modifier=$pgac_modifier; break
fi fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext conftest.$ac_objext conftest.beam conftest.$ac_ext
@ -13141,44 +13141,36 @@ fi
done done
fi fi
LONG_LONG_INT_FORMAT='' LONG_LONG_INT_MODIFIER=''
case $pgac_cv_snprintf_long_long_int_format in case $pgac_cv_snprintf_long_long_int_modifier in
cross) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot test (not on host machine)" >&5 cross) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot test (not on host machine)" >&5
$as_echo "cannot test (not on host machine)" >&6; };; $as_echo "cannot test (not on host machine)" >&6; };;
?*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_snprintf_long_long_int_format" >&5 ?*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_snprintf_long_long_int_modifier" >&5
$as_echo "$pgac_cv_snprintf_long_long_int_format" >&6; } $as_echo "$pgac_cv_snprintf_long_long_int_modifier" >&6; }
LONG_LONG_INT_FORMAT=$pgac_cv_snprintf_long_long_int_format;; LONG_LONG_INT_MODIFIER=$pgac_cv_snprintf_long_long_int_modifier;;
*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
$as_echo "none" >&6; };; $as_echo "none" >&6; };;
esac esac
if test "$LONG_LONG_INT_FORMAT" = ""; then if test "$LONG_LONG_INT_MODIFIER" = ""; then
# Force usage of our own snprintf, since system snprintf is broken # Force usage of our own snprintf, since system snprintf is broken
pgac_need_repl_snprintf=yes pgac_need_repl_snprintf=yes
LONG_LONG_INT_FORMAT='%lld' LONG_LONG_INT_MODIFIER='ll'
fi fi
else else
# Here if we previously decided we needed to use our own snprintf # Here if we previously decided we needed to use our own snprintf
LONG_LONG_INT_FORMAT='%lld' LONG_LONG_INT_MODIFIER='ll'
fi fi
LONG_LONG_UINT_FORMAT=`echo "$LONG_LONG_INT_FORMAT" | sed 's/d$/u/'`
INT64_FORMAT="\"$LONG_LONG_INT_FORMAT\""
UINT64_FORMAT="\"$LONG_LONG_UINT_FORMAT\""
else else
# Here if we are not using 'long long int' at all # Here if we are not using 'long long int' at all
INT64_FORMAT='"%ld"' LONG_LONG_INT_MODIFIER='l'
UINT64_FORMAT='"%lu"'
fi fi
INT64_MODIFIER="\"$LONG_LONG_INT_MODIFIER\""
cat >>confdefs.h <<_ACEOF
#define INT64_FORMAT $INT64_FORMAT
_ACEOF
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define UINT64_FORMAT $UINT64_FORMAT #define INT64_MODIFIER $INT64_MODIFIER
_ACEOF _ACEOF

21
configure.in
View File

@ -1642,30 +1642,25 @@ fi
if test "$HAVE_LONG_LONG_INT_64" = yes ; then if test "$HAVE_LONG_LONG_INT_64" = yes ; then
if test $pgac_need_repl_snprintf = no; then if test $pgac_need_repl_snprintf = no; then
PGAC_FUNC_SNPRINTF_LONG_LONG_INT_FORMAT PGAC_FUNC_SNPRINTF_LONG_LONG_INT_MODIFIER
if test "$LONG_LONG_INT_FORMAT" = ""; then if test "$LONG_LONG_INT_MODIFIER" = ""; then
# Force usage of our own snprintf, since system snprintf is broken # Force usage of our own snprintf, since system snprintf is broken
pgac_need_repl_snprintf=yes pgac_need_repl_snprintf=yes
LONG_LONG_INT_FORMAT='%lld' LONG_LONG_INT_MODIFIER='ll'
fi fi
else else
# Here if we previously decided we needed to use our own snprintf # Here if we previously decided we needed to use our own snprintf
LONG_LONG_INT_FORMAT='%lld' LONG_LONG_INT_MODIFIER='ll'
fi fi
LONG_LONG_UINT_FORMAT=`echo "$LONG_LONG_INT_FORMAT" | sed 's/d$/u/'`
INT64_FORMAT="\"$LONG_LONG_INT_FORMAT\""
UINT64_FORMAT="\"$LONG_LONG_UINT_FORMAT\""
else else
# Here if we are not using 'long long int' at all # Here if we are not using 'long long int' at all
INT64_FORMAT='"%ld"' LONG_LONG_INT_MODIFIER='l'
UINT64_FORMAT='"%lu"'
fi fi
AC_DEFINE_UNQUOTED(INT64_FORMAT, $INT64_FORMAT, INT64_MODIFIER="\"$LONG_LONG_INT_MODIFIER\""
[Define to the appropriate snprintf format for 64-bit ints.])
AC_DEFINE_UNQUOTED(UINT64_FORMAT, $UINT64_FORMAT, AC_DEFINE_UNQUOTED(INT64_MODIFIER, $INT64_MODIFIER,
[Define to the appropriate snprintf format for unsigned 64-bit ints.]) [Define to the appropriate snprintf length modifier for 64-bit ints.])
# Also force use of our snprintf if the system's doesn't support the %z flag. # Also force use of our snprintf if the system's doesn't support the %z flag.
if test "$pgac_need_repl_snprintf" = no; then if test "$pgac_need_repl_snprintf" = no; then

3
src/include/c.h
View File

@ -288,6 +288,9 @@ typedef unsigned long long int uint64;
#define UINT64CONST(x) ((uint64) x) #define UINT64CONST(x) ((uint64) x)
#endif #endif
/* snprintf format strings to use for 64-bit integers */
#define INT64_FORMAT "%" INT64_MODIFIER "d"
#define UINT64_FORMAT "%" INT64_MODIFIER "u"
/* Select timestamp representation (float8 or int64) */ /* Select timestamp representation (float8 or int64) */
#ifdef USE_INTEGER_DATETIMES #ifdef USE_INTEGER_DATETIMES

7
src/include/pg_config.h.in
View File

@ -653,8 +653,8 @@
/* Define to 1 if your compiler understands __VA_ARGS__ in macros. */ /* Define to 1 if your compiler understands __VA_ARGS__ in macros. */
#undef HAVE__VA_ARGS #undef HAVE__VA_ARGS
/* Define to the appropriate snprintf format for 64-bit ints. */ /* Define to the appropriate snprintf length modifier for 64-bit ints. */
#undef INT64_FORMAT #undef INT64_MODIFIER
/* Define to 1 if `locale_t' requires <xlocale.h>. */ /* Define to 1 if `locale_t' requires <xlocale.h>. */
#undef LOCALE_T_IN_XLOCALE #undef LOCALE_T_IN_XLOCALE
@ -744,9 +744,6 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */ /* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME #undef TM_IN_SYS_TIME
/* Define to the appropriate snprintf format for unsigned 64-bit ints. */
#undef UINT64_FORMAT
/* Define to 1 to build with assertion checks. (--enable-cassert) */ /* Define to 1 to build with assertion checks. (--enable-cassert) */
#undef USE_ASSERT_CHECKING #undef USE_ASSERT_CHECKING

8
src/include/pg_config.h.win32
View File

@ -532,8 +532,8 @@
/* Define to 1 if your compiler understands __VA_ARGS__ in macros. */ /* Define to 1 if your compiler understands __VA_ARGS__ in macros. */
#define HAVE__VA_ARGS 1 #define HAVE__VA_ARGS 1
/* Define to the appropriate snprintf format for 64-bit ints, if any. */ /* Define to the appropriate snprintf length modifier for 64-bit ints. */
#define INT64_FORMAT "%lld" #define INT64_MODIFIER "ll"
/* Define to 1 if `locale_t' requires <xlocale.h>. */ /* Define to 1 if `locale_t' requires <xlocale.h>. */
/* #undef LOCALE_T_IN_XLOCALE */ /* #undef LOCALE_T_IN_XLOCALE */
@ -604,10 +604,6 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */ /* Define to 1 if your <sys/time.h> declares `struct tm'. */
/* #undef TM_IN_SYS_TIME */ /* #undef TM_IN_SYS_TIME */
/* Define to the appropriate snprintf format for unsigned 64-bit ints, if any.
*/
#define UINT64_FORMAT "%llu"
/* Define to 1 to build with assertion checks. (--enable-cassert) */ /* Define to 1 to build with assertion checks. (--enable-cassert) */
/* #undef USE_ASSERT_CHECKING */ /* #undef USE_ASSERT_CHECKING */