Commit33bf73a

committed

Make the psql line counter 64-bit so it can handle files > 4gig lines.

David Fetter

1 parent6932048 commit33bf73aCopy full SHA for 33bf73a

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2006, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.122 2006/07/14 14:52:26 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.123 2006/08/11 19:20:59 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"common.h"`
`@@ -188,7 +188,7 @@ psql_error(const char *fmt,...)`
`188`	`188`	`fflush(pset.queryFout);`
`189`	`189`
`190`	`190`	`if (pset.inputfile)`
`191`		`-fprintf(stderr,"%s:%s:%u: ",pset.progname,pset.inputfile,pset.lineno);`
	`191`	`+fprintf(stderr,"%s:%s:"UINT64_FORMAT": ",pset.progname,pset.inputfile,pset.lineno);`
`192`	`192`	`va_start(ap,fmt);`
`193`	`193`	`vfprintf(stderr,_(fmt),ap);`
`194`	`194`	`va_end(ap);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2006, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.81 2006/07/14 14:52:26 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.82 2006/08/11 19:20:59 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"mainloop.h"`
`@@ -44,7 +44,7 @@ MainLoop(FILE *source)`
`44`	`44`	`/* Save the prior command source */`
`45`	`45`	`FILE*prev_cmd_source;`
`46`	`46`	`boolprev_cmd_interactive;`
`47`		`-unsignedintprev_lineno;`
	`47`	`+uint64prev_lineno;`
`48`	`48`
`49`	`49`	`/* Save old settings */`
`50`	`50`	`prev_cmd_source=pset.cur_cmd_source;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2006, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/settings.h,v 1.27 2006/03/05 15:58:52 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/settings.h,v 1.28 2006/08/11 19:20:59 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#ifndefSETTINGS_H`
`9`	`9`	`#defineSETTINGS_H`
`@@ -50,7 +50,7 @@ typedef struct _psqlSettings`
`50`	`50`	`charinputfile;/ for error reporting */`
`51`	`51`	`chardirname;/ current directory for \s display */`
`52`	`52`
`53`		`-unsignedlineno;/* also for error reporting */`
	`53`	`+uint64lineno;/* also for error reporting */`
`54`	`54`
`55`	`55`	`booltiming;/* enable timing of all queries */`
`56`	`56`

Comments

(0)