diff options
| author | Bruce Momjian <bruce@momjian.us> | 2006-08-11 19:20:59 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2006-08-11 19:20:59 +0000 |
| commit | 33bf73a79ae9175093d13674b5f28b89affdbca5 (patch) | |
| tree | abe92ce83cd1721367f328e14dec98915164bdd3 | |
| parent | 6932048b9bde89e81df48a0122a14e4784e64d1e (diff) | |
| download | postgresql-33bf73a79ae9175093d13674b5f28b89affdbca5.tar.gz postgresql-33bf73a79ae9175093d13674b5f28b89affdbca5.zip | |
Make the psql line counter 64-bit so it can handle files > 4gig lines.
David Fetter
| -rw-r--r-- | src/bin/psql/common.c | 4 | ||||
| -rw-r--r-- | src/bin/psql/mainloop.c | 4 | ||||
| -rw-r--r-- | src/bin/psql/settings.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index b7755aa374e..ca77b81808f 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.122 2006/07/14 14:52:26 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.123 2006/08/11 19:20:59 momjian Exp $ */ #include "postgres_fe.h" #include "common.h" @@ -188,7 +188,7 @@ psql_error(const char *fmt,...) fflush(pset.queryFout); if (pset.inputfile) - fprintf(stderr, "%s:%s:%u: ", pset.progname, pset.inputfile, pset.lineno); + fprintf(stderr, "%s:%s:" UINT64_FORMAT ": ", pset.progname, pset.inputfile, pset.lineno); va_start(ap, fmt); vfprintf(stderr, _(fmt), ap); va_end(ap); diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c index fdbf29d8e30..730210b20c9 100644 --- a/src/bin/psql/mainloop.c +++ b/src/bin/psql/mainloop.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.81 2006/07/14 14:52:26 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.82 2006/08/11 19:20:59 momjian Exp $ */ #include "postgres_fe.h" #include "mainloop.h" @@ -44,7 +44,7 @@ MainLoop(FILE *source) /* Save the prior command source */ FILE *prev_cmd_source; bool prev_cmd_interactive; - unsigned int prev_lineno; + uint64 prev_lineno; /* Save old settings */ prev_cmd_source = pset.cur_cmd_source; diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h index 2509593bbbe..a5c4a02be9e 100644 --- a/src/bin/psql/settings.h +++ b/src/bin/psql/settings.h @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/settings.h,v 1.27 2006/03/05 15:58:52 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/psql/settings.h,v 1.28 2006/08/11 19:20:59 momjian Exp $ */ #ifndef SETTINGS_H #define SETTINGS_H @@ -50,7 +50,7 @@ typedef struct _psqlSettings char *inputfile; /* for error reporting */ char *dirname; /* current directory for \s display */ - unsigned lineno; /* also for error reporting */ + uint64 lineno; /* also for error reporting */ bool timing; /* enable timing of all queries */ |