diff options
| author | Bruce Momjian | 2005-05-27 15:15:31 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2005-05-27 15:15:31 +0000 |
| commit | 22f030302350b9fa9e8d286e2f5fb40e9c52a34b (patch) | |
| tree | 5d9e3ef437da20aa50dd0b1c9df78f6e5bcb9f20 /src/tools/entab | |
| parent | a4374f90703baf8c74b2bcc074ead2e7253d5b9a (diff) | |
Fix compile of entab to use stdarg.h. Clean up includes.
Marko Kreen
Diffstat (limited to 'src/tools/entab')
| -rw-r--r-- | src/tools/entab/entab.c | 11 | ||||
| -rw-r--r-- | src/tools/entab/halt.c | 8 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/tools/entab/entab.c b/src/tools/entab/entab.c index 7f8e40f7057..2e91bdb4882 100644 --- 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 d204d286780..dda2f23791a 100644 --- 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 |