summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2006-08-11 19:20:59 +0000
committerBruce Momjian2006-08-11 19:20:59 +0000
commit6350362c5a3bf3b94593f0f437b2700f3ba11022 (patch)
tree54a162da0085dbdc958b8a3cddd381040ff093d5
parent557039bcf4fb54d3b8da1c27c34dc6f76fd5df22 (diff)
Make the psql line counter 64-bit so it can handle files > 4gig lines.
David Fetter
-rw-r--r--src/bin/psql/common.c2
-rw-r--r--src/bin/psql/mainloop.c2
-rw-r--r--src/bin/psql/settings.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 78715285a5..63025d5179 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -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 d598881947..5ece98af44 100644
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -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 e044fc417e..f3eba3b526 100644
--- a/src/bin/psql/settings.h
+++ b/src/bin/psql/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 */