Commit 66fb9ca5 authored by Yang Tse's avatar Yang Tse
Browse files

For congruency sake with the naming of other CURL_XXXXXX_CURL_OFF_T macros, 

the names of the curl_off_t formatting string directives now become
CURL_FORMAT_CURL_OFF_T and CURL_FORMAT_CURL_OFF_TU.

CURL_FMT_OFF_T  -> CURL_FORMAT_CURL_OFF_T
CURL_FMT_OFF_TU -> CURL_FORMAT_CURL_OFF_TU

Remove the use of an internal name for the curl_off_t formatting string directives
and use the common one available from the inside and outside of the library.

FORMAT_OFF_T  -> CURL_FORMAT_CURL_OFF_T
FORMAT_OFF_TU -> CURL_FORMAT_CURL_OFF_TU
parent 11cb78c5

CHANGES

+6 −0
Original line number Diff line number Diff line
@@ -6,6 +6,12 @@ 


                                  Changelog



Yang Tse (15 Aug 2008)

- C preprocessor macros used internally and equally available externally which

  aid in the use of the curl_off_t data type are named: CURL_FORMAT_CURL_OFF_T,

  CURL_FORMAT_CURL_OFF_TU, CURL_SIZEOF_CURL_OFF_T, CURL_SUFFIX_CURL_OFF_T,

  CURL_SUFFIX_CURL_OFF_TU, CURL_OFF_T_C and CURL_OFF_TU_C.



Yang Tse (13 Aug 2008)

- The size of long is a build time characteristic and as such it is now recorded

  in curlbuild.h as CURL_SIZEOF_LONG. Definition now done from configure process

acinclude.m4

+2 −2
Original line number Diff line number Diff line
@@ -3886,8 +3886,8 @@ AC_DEFUN([CURL_CONFIGURE_CURL_OFF_T], [ 
  fi

  #

  CURL_DEFINE_UNQUOTED([CURL_OFF_T], [$x_typeof])

  CURL_DEFINE_UNQUOTED([CURL_FMT_OFF_T], ["$x_format"])

  CURL_DEFINE_UNQUOTED([CURL_FMT_OFF_TU], ["$u_format"])

  CURL_DEFINE_UNQUOTED([CURL_FORMAT_CURL_OFF_T], ["$x_format"])

  CURL_DEFINE_UNQUOTED([CURL_FORMAT_CURL_OFF_TU], ["$u_format"])

  CURL_DEFINE_UNQUOTED([CURL_FORMAT_OFF_T], ["%$x_format"])

  CURL_DEFINE_UNQUOTED([CURL_SIZEOF_CURL_OFF_T], [$x_sizeof])

  CURL_DEFINE_UNQUOTED([CURL_SUFFIX_CURL_OFF_T], [$curl_suffix_curl_off_t])

include/curl/curlbuild.h.dist

+66 −66
Original line number Diff line number Diff line
@@ -114,14 +114,14 @@ 
   Error Compilation_aborted_CURL_OFF_T_already_defined

#endif



#ifdef CURL_FMT_OFF_T

#  error "CURL_FMT_OFF_T shall not be defined except in curlbuild.h"

   Error Compilation_aborted_CURL_FMT_OFF_T_already_defined

#ifdef CURL_FORMAT_CURL_OFF_T

#  error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"

   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined

#endif



#ifdef CURL_FMT_OFF_TU

#  error "CURL_FMT_OFF_TU shall not be defined except in curlbuild.h"

   Error Compilation_aborted_CURL_FMT_OFF_TU_already_defined

#ifdef CURL_FORMAT_CURL_OFF_TU

#  error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"

   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined

#endif



#ifdef CURL_FORMAT_OFF_T
@@ -141,8 +141,8 @@ 
#if defined(__DJGPP__)

#  define CURL_SIZEOF_LONG        4

#  define CURL_OFF_T              long

#  define CURL_FMT_OFF_T          "ld"

#  define CURL_FMT_OFF_TU         "lu"

#  define CURL_FORMAT_CURL_OFF_T  "ld"

#  define CURL_FORMAT_CURL_OFF_TU "lu"

#  define CURL_FORMAT_OFF_T       "%ld"

#  define CURL_SIZEOF_CURL_OFF_T  4

#  define CURL_SUFFIX_CURL_OFF_T  L
@@ -151,8 +151,8 @@ 
#elif defined(__SALFORDC__)

#  define CURL_SIZEOF_LONG        4

#  define CURL_OFF_T              long

#  define CURL_FMT_OFF_T          "ld"

#  define CURL_FMT_OFF_TU         "lu"

#  define CURL_FORMAT_CURL_OFF_T  "ld"

#  define CURL_FORMAT_CURL_OFF_TU "lu"

#  define CURL_FORMAT_OFF_T       "%ld"

#  define CURL_SIZEOF_CURL_OFF_T  4

#  define CURL_SUFFIX_CURL_OFF_T  L
@@ -162,8 +162,8 @@ 
#  if (__BORLANDC__ < 0x520)

#    define CURL_SIZEOF_LONG        4

#    define CURL_OFF_T              long

#    define CURL_FMT_OFF_T          "ld"

#    define CURL_FMT_OFF_TU         "lu"

#    define CURL_FORMAT_CURL_OFF_T  "ld"

#    define CURL_FORMAT_CURL_OFF_TU "lu"

#    define CURL_FORMAT_OFF_T       "%ld"

#    define CURL_SIZEOF_CURL_OFF_T  4

#    define CURL_SUFFIX_CURL_OFF_T  L
@@ -171,8 +171,8 @@ 
#  else

#    define CURL_SIZEOF_LONG        4

#    define CURL_OFF_T              __int64

#    define CURL_FMT_OFF_T          "I64d"

#    define CURL_FMT_OFF_TU         "I64u"

#    define CURL_FORMAT_CURL_OFF_T  "I64d"

#    define CURL_FORMAT_CURL_OFF_TU "I64u"

#    define CURL_FORMAT_OFF_T       "%I64d"

#    define CURL_SIZEOF_CURL_OFF_T  8

#    define CURL_SUFFIX_CURL_OFF_T  i64
@@ -182,8 +182,8 @@ 
#elif defined(__TURBOC__)

#  define CURL_SIZEOF_LONG        4

#  define CURL_OFF_T              long

#  define CURL_FMT_OFF_T          "ld"

#  define CURL_FMT_OFF_TU         "lu"

#  define CURL_FORMAT_CURL_OFF_T  "ld"

#  define CURL_FORMAT_CURL_OFF_TU "lu"

#  define CURL_FORMAT_OFF_T       "%ld"

#  define CURL_SIZEOF_CURL_OFF_T  4

#  define CURL_SUFFIX_CURL_OFF_T  L
@@ -193,8 +193,8 @@ 
#  if defined(__386__)

#    define CURL_SIZEOF_LONG        4

#    define CURL_OFF_T              __int64

#    define CURL_FMT_OFF_T          "I64d"

#    define CURL_FMT_OFF_TU         "I64u"

#    define CURL_FORMAT_CURL_OFF_T  "I64d"

#    define CURL_FORMAT_CURL_OFF_TU "I64u"

#    define CURL_FORMAT_OFF_T       "%I64d"

#    define CURL_SIZEOF_CURL_OFF_T  8

#    define CURL_SUFFIX_CURL_OFF_T  i64
@@ -202,8 +202,8 @@ 
#  else

#    define CURL_SIZEOF_LONG        4

#    define CURL_OFF_T              long

#    define CURL_FMT_OFF_T          "ld"

#    define CURL_FMT_OFF_TU         "lu"

#    define CURL_FORMAT_CURL_OFF_T  "ld"

#    define CURL_FORMAT_CURL_OFF_TU "lu"

#    define CURL_FORMAT_OFF_T       "%ld"

#    define CURL_SIZEOF_CURL_OFF_T  4

#    define CURL_SUFFIX_CURL_OFF_T  L
@@ -214,8 +214,8 @@ 
#  if (__POCC__ < 280)

#    define CURL_SIZEOF_LONG        4

#    define CURL_OFF_T              long

#    define CURL_FMT_OFF_T          "ld"

#    define CURL_FMT_OFF_TU         "lu"

#    define CURL_FORMAT_CURL_OFF_T  "ld"

#    define CURL_FORMAT_CURL_OFF_TU "lu"

#    define CURL_FORMAT_OFF_T       "%ld"

#    define CURL_SIZEOF_CURL_OFF_T  4

#    define CURL_SUFFIX_CURL_OFF_T  L
@@ -223,8 +223,8 @@ 
#  elif defined(_MSC_VER)

#    define CURL_SIZEOF_LONG        4

#    define CURL_OFF_T              __int64

#    define CURL_FMT_OFF_T          "I64d"

#    define CURL_FMT_OFF_TU         "I64u"

#    define CURL_FORMAT_CURL_OFF_T  "I64d"

#    define CURL_FORMAT_CURL_OFF_TU "I64u"

#    define CURL_FORMAT_OFF_T       "%I64d"

#    define CURL_SIZEOF_CURL_OFF_T  8

#    define CURL_SUFFIX_CURL_OFF_T  i64
@@ -232,8 +232,8 @@ 
#  else

#    define CURL_SIZEOF_LONG        4

#    define CURL_OFF_T              long long

#    define CURL_FMT_OFF_T          "lld"

#    define CURL_FMT_OFF_TU         "llu"

#    define CURL_FORMAT_CURL_OFF_T  "lld"

#    define CURL_FORMAT_CURL_OFF_TU "llu"

#    define CURL_FORMAT_OFF_T       "%lld"

#    define CURL_SIZEOF_CURL_OFF_T  8

#    define CURL_SUFFIX_CURL_OFF_T  LL
@@ -243,8 +243,8 @@ 
#elif defined(__LCC__)

#  define CURL_SIZEOF_LONG        4

#  define CURL_OFF_T              long

#  define CURL_FMT_OFF_T          "ld"

#  define CURL_FMT_OFF_TU         "lu"

#  define CURL_FORMAT_CURL_OFF_T  "ld"

#  define CURL_FORMAT_CURL_OFF_TU "lu"

#  define CURL_FORMAT_OFF_T       "%ld"

#  define CURL_SIZEOF_CURL_OFF_T  4

#  define CURL_SUFFIX_CURL_OFF_T  L
@@ -254,8 +254,8 @@ 
#  if defined(__GCC32__)

#    define CURL_SIZEOF_LONG        4

#    define CURL_OFF_T              long long

#    define CURL_FMT_OFF_T          "lld"

#    define CURL_FMT_OFF_TU         "llu"

#    define CURL_FORMAT_CURL_OFF_T  "lld"

#    define CURL_FORMAT_CURL_OFF_TU "llu"

#    define CURL_FORMAT_OFF_T       "%lld"

#    define CURL_SIZEOF_CURL_OFF_T  8

#    define CURL_SUFFIX_CURL_OFF_T  LL
@@ -264,8 +264,8 @@ 
#    pragma longlong on

#    define CURL_SIZEOF_LONG        4

#    define CURL_OFF_T              long long

#    define CURL_FMT_OFF_T          "lld"

#    define CURL_FMT_OFF_TU         "llu"

#    define CURL_FORMAT_CURL_OFF_T  "lld"

#    define CURL_FORMAT_CURL_OFF_TU "llu"

#    define CURL_FORMAT_OFF_T       "%lld"

#    define CURL_SIZEOF_CURL_OFF_T  8

#    define CURL_SUFFIX_CURL_OFF_T  LL
@@ -273,8 +273,8 @@ 
#  elif defined(__VC32__)

#    define CURL_SIZEOF_LONG        4

#    define CURL_OFF_T              __int64

#    define CURL_FMT_OFF_T          "lld"

#    define CURL_FMT_OFF_TU         "llu"

#    define CURL_FORMAT_CURL_OFF_T  "lld"

#    define CURL_FORMAT_CURL_OFF_TU "llu"

#    define CURL_FORMAT_OFF_T       "%lld"

#    define CURL_SIZEOF_CURL_OFF_T  8

#    define CURL_SUFFIX_CURL_OFF_T  LL
@@ -284,8 +284,8 @@ 
#elif defined(__MWERKS__)

#  define CURL_SIZEOF_LONG        4

#  define CURL_OFF_T              long long

#  define CURL_FMT_OFF_T          "lld"

#  define CURL_FMT_OFF_TU         "llu"

#  define CURL_FORMAT_CURL_OFF_T  "lld"

#  define CURL_FORMAT_CURL_OFF_TU "llu"

#  define CURL_FORMAT_OFF_T       "%lld"

#  define CURL_SIZEOF_CURL_OFF_T  8

#  define CURL_SUFFIX_CURL_OFF_T  LL
@@ -294,8 +294,8 @@ 
#elif defined(_WIN32_WCE)

#  define CURL_SIZEOF_LONG        4

#  define CURL_OFF_T              __int64

#  define CURL_FMT_OFF_T          "I64d"

#  define CURL_FMT_OFF_TU         "I64u"

#  define CURL_FORMAT_CURL_OFF_T  "I64d"

#  define CURL_FORMAT_CURL_OFF_TU "I64u"

#  define CURL_FORMAT_OFF_T       "%I64d"

#  define CURL_SIZEOF_CURL_OFF_T  8

#  define CURL_SUFFIX_CURL_OFF_T  i64
@@ -304,8 +304,8 @@ 
#elif defined(__MINGW32__)

#  define CURL_SIZEOF_LONG        4

#  define CURL_OFF_T              long long

#  define CURL_FMT_OFF_T          "I64d"

#  define CURL_FMT_OFF_TU         "I64u"

#  define CURL_FORMAT_CURL_OFF_T  "I64d"

#  define CURL_FORMAT_CURL_OFF_TU "I64u"

#  define CURL_FORMAT_OFF_T       "%I64d"

#  define CURL_SIZEOF_CURL_OFF_T  8

#  define CURL_SUFFIX_CURL_OFF_T  LL
@@ -315,8 +315,8 @@ 
#  if defined(__alpha) || defined(__ia64)

#    define CURL_SIZEOF_LONG        4

#    define CURL_OFF_T              long long

#    define CURL_FMT_OFF_T          "lld"

#    define CURL_FMT_OFF_TU         "llu"

#    define CURL_FORMAT_CURL_OFF_T  "lld"

#    define CURL_FORMAT_CURL_OFF_TU "llu"

#    define CURL_FORMAT_OFF_T       "%lld"

#    define CURL_SIZEOF_CURL_OFF_T  8

#    define CURL_SUFFIX_CURL_OFF_T  LL
@@ -324,8 +324,8 @@ 
#  else

#    define CURL_SIZEOF_LONG        4

#    define CURL_OFF_T              long

#    define CURL_FMT_OFF_T          "ld"

#    define CURL_FMT_OFF_TU         "lu"

#    define CURL_FORMAT_CURL_OFF_T  "ld"

#    define CURL_FORMAT_CURL_OFF_TU "lu"

#    define CURL_FORMAT_OFF_T       "%ld"

#    define CURL_SIZEOF_CURL_OFF_T  4

#    define CURL_SUFFIX_CURL_OFF_T  L
@@ -336,8 +336,8 @@ 
#  if defined(__ILEC400__)

#    define CURL_SIZEOF_LONG        4

#    define CURL_OFF_T              long long

#    define CURL_FMT_OFF_T          "lld"

#    define CURL_FMT_OFF_TU         "llu"

#    define CURL_FORMAT_CURL_OFF_T  "lld"

#    define CURL_FORMAT_CURL_OFF_TU "llu"

#    define CURL_FORMAT_OFF_T       "%lld"

#    define CURL_SIZEOF_CURL_OFF_T  8

#    define CURL_SUFFIX_CURL_OFF_T  LL
@@ -353,24 +353,24 @@ 
#    endif

#    if defined(_LONG_LONG)

#      define CURL_OFF_T              long long

#      define CURL_FMT_OFF_T          "lld"

#      define CURL_FMT_OFF_TU         "llu"

#      define CURL_FORMAT_CURL_OFF_T  "lld"

#      define CURL_FORMAT_CURL_OFF_TU "llu"

#      define CURL_FORMAT_OFF_T       "%lld"

#      define CURL_SIZEOF_CURL_OFF_T  8

#      define CURL_SUFFIX_CURL_OFF_T  LL

#      define CURL_SUFFIX_CURL_OFF_TU ULL

#    elif defined(_LP64)

#      define CURL_OFF_T              long

#      define CURL_FMT_OFF_T          "ld"

#      define CURL_FMT_OFF_TU         "lu"

#      define CURL_FORMAT_CURL_OFF_T  "ld"

#      define CURL_FORMAT_CURL_OFF_TU "lu"

#      define CURL_FORMAT_OFF_T       "%ld"

#      define CURL_SIZEOF_CURL_OFF_T  8

#      define CURL_SUFFIX_CURL_OFF_T  L

#      define CURL_SUFFIX_CURL_OFF_TU UL

#    else

#      define CURL_OFF_T              long

#      define CURL_FMT_OFF_T          "ld"

#      define CURL_FMT_OFF_TU         "lu"

#      define CURL_FORMAT_CURL_OFF_T  "ld"

#      define CURL_FORMAT_CURL_OFF_TU "lu"

#      define CURL_FORMAT_OFF_T       "%ld"

#      define CURL_SIZEOF_CURL_OFF_T  4

#      define CURL_SUFFIX_CURL_OFF_T  L
@@ -387,24 +387,24 @@ 
#    endif

#    if defined(_LONG_LONG)

#      define CURL_OFF_T              long long

#      define CURL_FMT_OFF_T          "lld"

#      define CURL_FMT_OFF_TU         "llu"

#      define CURL_FORMAT_CURL_OFF_T  "lld"

#      define CURL_FORMAT_CURL_OFF_TU "llu"

#      define CURL_FORMAT_OFF_T       "%lld"

#      define CURL_SIZEOF_CURL_OFF_T  8

#      define CURL_SUFFIX_CURL_OFF_T  LL

#      define CURL_SUFFIX_CURL_OFF_TU ULL

#    elif defined(_LP64)

#      define CURL_OFF_T              long

#      define CURL_FMT_OFF_T          "ld"

#      define CURL_FMT_OFF_TU         "lu"

#      define CURL_FORMAT_CURL_OFF_T  "ld"

#      define CURL_FORMAT_CURL_OFF_TU "lu"

#      define CURL_FORMAT_OFF_T       "%ld"

#      define CURL_SIZEOF_CURL_OFF_T  8

#      define CURL_SUFFIX_CURL_OFF_T  L

#      define CURL_SUFFIX_CURL_OFF_TU UL

#    else

#      define CURL_OFF_T              long

#      define CURL_FMT_OFF_T          "ld"

#      define CURL_FMT_OFF_TU         "lu"

#      define CURL_FORMAT_CURL_OFF_T  "ld"

#      define CURL_FORMAT_CURL_OFF_TU "lu"

#      define CURL_FORMAT_OFF_T       "%ld"

#      define CURL_SIZEOF_CURL_OFF_T  4

#      define CURL_SUFFIX_CURL_OFF_T  L
@@ -420,8 +420,8 @@ 
#  if (_MSC_VER >= 900)

#    define CURL_SIZEOF_LONG        4

#    define CURL_OFF_T              __int64

#    define CURL_FMT_OFF_T          "I64d"

#    define CURL_FMT_OFF_TU         "I64u"

#    define CURL_FORMAT_CURL_OFF_T  "I64d"

#    define CURL_FORMAT_CURL_OFF_TU "I64u"

#    define CURL_FORMAT_OFF_T       "%I64d"

#    define CURL_SIZEOF_CURL_OFF_T  8

#    define CURL_SUFFIX_CURL_OFF_T  i64
@@ -429,8 +429,8 @@ 
#  else

#    define CURL_SIZEOF_LONG        4

#    define CURL_OFF_T              long

#    define CURL_FMT_OFF_T          "ld"

#    define CURL_FMT_OFF_TU         "lu"

#    define CURL_FORMAT_CURL_OFF_T  "ld"

#    define CURL_FORMAT_CURL_OFF_TU "lu"

#    define CURL_FORMAT_OFF_T       "%ld"

#    define CURL_SIZEOF_CURL_OFF_T  4

#    define CURL_SUFFIX_CURL_OFF_T  L
@@ -445,8 +445,8 @@ 
#  if defined(__i386__)

#    define CURL_SIZEOF_LONG        4

#    define CURL_OFF_T              long long

#    define CURL_FMT_OFF_T          "lld"

#    define CURL_FMT_OFF_TU         "llu"

#    define CURL_FORMAT_CURL_OFF_T  "lld"

#    define CURL_FORMAT_CURL_OFF_TU "llu"

#    define CURL_FORMAT_OFF_T       "%lld"

#    define CURL_SIZEOF_CURL_OFF_T  8

#    define CURL_SUFFIX_CURL_OFF_T  LL
@@ -454,8 +454,8 @@ 
#  elif defined(__x86_64__)

#    define CURL_SIZEOF_LONG        8

#    define CURL_OFF_T              long

#    define CURL_FMT_OFF_T          "ld"

#    define CURL_FMT_OFF_TU         "lu"

#    define CURL_FORMAT_CURL_OFF_T  "ld"

#    define CURL_FORMAT_CURL_OFF_TU "lu"

#    define CURL_FORMAT_OFF_T       "%ld"

#    define CURL_SIZEOF_CURL_OFF_T  8

#    define CURL_SUFFIX_CURL_OFF_T  L

include/curl/curlbuild.h.in

+8 −8
Original line number Diff line number Diff line
@@ -63,14 +63,14 @@ 
   Error Compilation_aborted_CURL_OFF_T_already_defined

#endif



#ifdef CURL_FMT_OFF_T

#  error "CURL_FMT_OFF_T shall not be defined except in curlbuild.h"

   Error Compilation_aborted_CURL_FMT_OFF_T_already_defined

#ifdef CURL_FORMAT_CURL_OFF_T

#  error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"

   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined

#endif



#ifdef CURL_FMT_OFF_TU

#  error "CURL_FMT_OFF_TU shall not be defined except in curlbuild.h"

   Error Compilation_aborted_CURL_FMT_OFF_TU_already_defined

#ifdef CURL_FORMAT_CURL_OFF_TU

#  error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"

   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined

#endif



#ifdef CURL_FORMAT_OFF_T
@@ -118,10 +118,10 @@ 
typedef CURL_OFF_T curl_off_t;



/* curl_off_t formatting string directive without "%" conversion specifier. */

#undef CURL_FMT_OFF_T

#undef CURL_FORMAT_CURL_OFF_T



/* unsigned curl_off_t formatting string without "%" conversion specifier. */

#undef CURL_FMT_OFF_TU

#undef CURL_FORMAT_CURL_OFF_TU



/* curl_off_t formatting string directive with "%" conversion specifier. */

#undef CURL_FORMAT_OFF_T

include/curl/curlrules.h

+6 −6
Original line number Diff line number Diff line
@@ -86,14 +86,14 @@ 
   Error Compilation_aborted_CURL_OFF_T_is_missing

#endif



#ifndef CURL_FMT_OFF_T

#  error "CURL_FMT_OFF_T definition is missing!"

   Error Compilation_aborted_CURL_FMT_OFF_T_is_missing

#ifndef CURL_FORMAT_CURL_OFF_T

#  error "CURL_FORMAT_CURL_OFF_T definition is missing!"

   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_is_missing

#endif



#ifndef CURL_FMT_OFF_TU

#  error "CURL_FMT_OFF_TU definition is missing!"

   Error Compilation_aborted_CURL_FMT_OFF_TU_is_missing

#ifndef CURL_FORMAT_CURL_OFF_TU

#  error "CURL_FORMAT_CURL_OFF_TU definition is missing!"

   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_is_missing

#endif



#ifndef CURL_FORMAT_OFF_T