Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 959dc92

Browse files
committed
Preliminary code cleanup in elog(). Split out some code into utility
functions, remove indent support, make sure all strings are marked translatable.
1 parent 24775c5 commit 959dc92

File tree

5 files changed

+182
-144
lines changed

5 files changed

+182
-144
lines changed

src/backend/commands/copy.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.138 2001/06/01 02:41:35 tgl Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.139 2001/06/08 21:16:48 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -59,7 +59,7 @@ static const char BinarySignature[12] = "PGBCOPY\n\377\r\n\0";
5959
* Static communication variables ... pretty grotty, but COPY has
6060
* never been reentrant...
6161
*/
62-
int lineno = 0; /* exported for use by elog() -- dz */
62+
int copy_lineno = 0; /* exported for use by elog() -- dz */
6363
static bool fe_eof;
6464

6565
/*
@@ -705,14 +705,14 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp,
705705
values = (Datum *) palloc(attr_count * sizeof(Datum));
706706
nulls = (char *) palloc(attr_count * sizeof(char));
707707

708-
lineno = 0;
708+
copy_lineno = 0;
709709
fe_eof = false;
710710

711711
while (!done)
712712
{
713713
CHECK_FOR_INTERRUPTS();
714714

715-
lineno++;
715+
copy_lineno++;
716716

717717
/* Reset the per-output-tuple exprcontext */
718718
ResetPerTupleExprContext(estate);
@@ -920,7 +920,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp,
920920
/*
921921
* Done, clean up
922922
*/
923-
lineno = 0;
923+
copy_lineno = 0;
924924

925925
pfree(values);
926926
pfree(nulls);

0 commit comments

Comments
 (0)