Fix compile of entab to use stdarg.h. Clean up includes.

Marko Kreen

diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 119ab116bd930e4ac162afb7e0468a5ff79db440..f7274c037d35e0ef3874154ffc0bc9d8b177aa2b 100644 (file)
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.147 2005/05/26 15:26:00 momjian Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.148 2005/05/27 15:15:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -3461,12 +3461,9 @@ EncodeTimeOnly(struct pg_tm * tm, fsec_t fsec, int *tzp, int style, char *str)
 #ifdef HAVE_INT64_TIMESTAMP
                sprintf(str + strlen(str), ":%02d.%06d", tm->tm_sec, fsec);
 #else
-               sprintf(str + strlen(str), ":%013.10f", tm->tm_sec + fsec);
+               sprintf(str + strlen(str), ":%012.9f", tm->tm_sec + fsec);
 #endif
-               /* chop off trailing pairs of zeros... */
-               while (strcmp((str + strlen(str) - 2), "00") == 0 &&
-                       *(str + strlen(str) - 3) != '.')
-                       *(str + strlen(str) - 2) = '\0';
+               TrimTrailingZeros(str);
        }
        else
                sprintf(str + strlen(str), ":%02d", tm->tm_sec);
@@ -3804,7 +3801,7 @@ EncodeInterval(struct pg_tm * tm, fsec_t fsec, int style, char *str)
                                        sprintf(cp, ".%06d", Abs(fsec));
 #else
                                        fsec += tm->tm_sec;
-                                       sprintf(cp, ":%013.10f", fabs(fsec));
+                                       sprintf(cp, ":%012.9f", fabs(fsec));
 #endif
                                        TrimTrailingZeros(cp);
                                        cp += strlen(cp);

diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c
index f5b2b2573f2e237765eb1cfb4c2f05e68669dfc2..a5e9673b10d147aed0a3803f15fd89abfe626538 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/interval.c
+++ b/src/interfaces/ecpg/pgtypeslib/interval.c
@@ -511,7 +511,7 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
                                        sprintf(cp, ".%06d", Abs(fsec));
 #else
                                        fsec += tm->tm_sec;
-                                       sprintf(cp, ":%013.10f", fabs(fsec));
+                                       sprintf(cp, ":%012.9f", fabs(fsec));
 #endif
                                        TrimTrailingZeros(cp);
                                        cp += strlen(cp);

diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out
index ca8bc3d0e5ca536d80a11a7cdb2eb4e4e28441fc..c0a7f6e5b83c6206e782d1c834d4e5e655aaa1b2 100644 (file)
--- a/src/test/regress/expected/horology.out
+++ b/src/test/regress/expected/horology.out
@@ -205,62 +205,62 @@ SET DateStyle = 'ISO';
 -- As of 7.4, allow time without time zone having a time zone specified
 SELECT time without time zone '040506.789+08';
      time      
----------------
- 04:05:06.7890
+--------------
+ 04:05:06.789
 (1 row)
 
 SELECT time without time zone '040506.789-08';
      time      
----------------
- 04:05:06.7890
+--------------
+ 04:05:06.789
 (1 row)
 
 SELECT time without time zone 'T040506.789+08';
      time      
----------------
- 04:05:06.7890
+--------------
+ 04:05:06.789
 (1 row)
 
 SELECT time without time zone 'T040506.789-08';
      time      
----------------
- 04:05:06.7890
+--------------
+ 04:05:06.789
 (1 row)
 
 SELECT time with time zone '040506.789+08';
       timetz      
-------------------
- 04:05:06.7890+08
+-----------------
+ 04:05:06.789+08
 (1 row)
 
 SELECT time with time zone '040506.789-08';
       timetz      
-------------------
- 04:05:06.7890-08
+-----------------
+ 04:05:06.789-08
 (1 row)
 
 SELECT time with time zone 'T040506.789+08';
       timetz      
-------------------
- 04:05:06.7890+08
+-----------------
+ 04:05:06.789+08
 (1 row)
 
 SELECT time with time zone 'T040506.789-08';
       timetz      
-------------------
- 04:05:06.7890-08
+-----------------
+ 04:05:06.789-08
 (1 row)
 
 SELECT time with time zone 'T040506.789 +08';
       timetz      
-------------------
- 04:05:06.7890+08
+-----------------
+ 04:05:06.789+08
 (1 row)
 
 SELECT time with time zone 'T040506.789 -08';
       timetz      
-------------------
- 04:05:06.7890-08
+-----------------
+ 04:05:06.789-08
 (1 row)
 
 SET DateStyle = 'Postgres, MDY';

diff --git a/src/tools/entab/entab.c b/src/tools/entab/entab.c
index 7f8e40f7057b3f63925ba4ecfac42c43be9271a1..2e91bdb4882c8f5e62af4700180bb585399462bc 100644 (file)
--- a/src/tools/entab/entab.c
+++ b/src/tools/entab/entab.c
@@ -11,8 +11,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdarg.h>
 
-#include "../../include/c.h"
+#if defined(WIN32) || defined(__CYGWIN__)
+#define PG_BINARY_R "rb"
+#else
+#define PG_BINARY_R "r"
+#endif
 
 #define NUL                            '\0'
 
@@ -29,9 +34,7 @@ extern char *optarg;
 extern int     optind;
 
 int
-main(argc, argv)
-int                    argc;
-char     **argv;
+main(int argc, char **argv)
 {
        int                     tab_size = 8,
                                min_spaces = 2,

diff --git a/src/tools/entab/halt.c b/src/tools/entab/halt.c
index d204d28678095e1e5f1b41a0e5034113b0c7c5b2..dda2f23791af4388c34feb29216d49e12bbbd1ed 100644 (file)
--- a/src/tools/entab/halt.c
+++ b/src/tools/entab/halt.c
@@ -19,15 +19,13 @@
 
 /*VARARGS*/
 void
-halt(const char *path, ...)
+halt(const char *format, ...)
 {
        va_list         arg_ptr;
-       char       *format,
-                          *pstr;
+       const char  *pstr;
        void            (*sig_func) ();
 
-       va_start(arg_ptr, path);
-       format = va_arg(arg_ptr, char *);
+       va_start(arg_ptr, format);
        if (strncmp(format, "PERROR", 6) != 0)
                vfprintf(stderr, format, arg_ptr);
        else