mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
David Fetter
This commit is contained in:
Bruce Momjian 2006-08-11 19:20:59 +00:00
parent 6932048b9b
commit 33bf73a79a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/psql/common.c
View File

@ -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);

4
src/bin/psql/mainloop.c
View File

@ -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;

4
src/bin/psql/settings.h
View File

@ -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 */