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

Make getpid() use %d consistently for printing.

Browse Source
This commit is contained in:
Bruce Momjian 2004-10-09 02:46:42 +00:00
parent b3723aeb1f
commit 67608a393b
4 changed files with 13 additions and 17 deletions
src
backend
access/transam
xlog.c
utils/error
elog.c
bin/psql
command.c
interfaces/ecpg/ecpglib
misc.c

11
src/backend/access/transam/xlog.c

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.171 2004/10/07 15:21:51 momjian Exp $ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.172 2004/10/09 02:46:40 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1513,8 +1513,7 @@ XLogFileInit(uint32 log, uint32 seg,
* up pre-creating an extra log segment. That seems OK, and better * up pre-creating an extra log segment. That seems OK, and better
* than holding the lock throughout this lengthy process. * than holding the lock throughout this lengthy process.
*/ */
snprintf(tmppath, MAXPGPATH, "%s/xlogtemp.%d", snprintf(tmppath, MAXPGPATH, "%s/xlogtemp.%d", XLogDir, getpid());
XLogDir, (int) getpid());
unlink(tmppath); unlink(tmppath);
@ -1634,8 +1633,7 @@ XLogFileCopy(uint32 log, uint32 seg,
/* /*
* Copy into a temp file name. * Copy into a temp file name.
*/ */
snprintf(tmppath, MAXPGPATH, "%s/xlogtemp.%d", snprintf(tmppath, MAXPGPATH, "%s/xlogtemp.%d", XLogDir, getpid());
XLogDir, (int) getpid());
unlink(tmppath); unlink(tmppath);
@ -2900,8 +2898,7 @@ writeTimeLineHistory(TimeLineID newTLI, TimeLineID parentTLI,
/* /*
* Write into a temp file name. * Write into a temp file name.
*/ */
snprintf(tmppath, MAXPGPATH, "%s/xlogtemp.%d", snprintf(tmppath, MAXPGPATH, "%s/xlogtemp.%d", XLogDir, getpid());
XLogDir, (int) getpid());
unlink(tmppath); unlink(tmppath);

8
src/backend/utils/error/elog.c

@ -42,7 +42,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.153 2004/10/09 01:24:47 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.154 2004/10/09 02:46:41 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1364,13 +1364,13 @@ log_line_prefix(StringInfo buf)
case 'c': case 'c':
if (MyProcPort) if (MyProcPort)
{ {
appendStringInfo(buf, "%lx.%lx", appendStringInfo(buf, "%lx.%x",
(long) (MyProcPort->session_start.tv_sec), (long) (MyProcPort->session_start.tv_sec),
(long) MyProcPid); MyProcPid);
} }
break; break;
case 'p': case 'p':
appendStringInfo(buf, "%ld", (long) MyProcPid); appendStringInfo(buf, "%d", MyProcPid);
break; break;
case 'l': case 'l':
appendStringInfo(buf, "%ld", log_line_number); appendStringInfo(buf, "%ld", log_line_number);

7
src/bin/psql/command.c

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2004, PostgreSQL Global Development Group * Copyright (c) 2000-2004, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.126 2004/10/07 15:21:56 momjian Exp $ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.127 2004/10/09 02:46:41 momjian Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
#include "command.h" #include "command.h"
@ -1132,9 +1132,8 @@ do_edit(const char *filename_arg, PQExpBuffer query_buf)
#ifndef WIN32 #ifndef WIN32
const char *tmpdirenv = getenv("TMPDIR"); const char *tmpdirenv = getenv("TMPDIR");
snprintf(fnametmp, sizeof(fnametmp), "%s/psql.edit.%ld.%ld", snprintf(fnametmp, sizeof(fnametmp), "%s/psql.edit.%d.%d",
tmpdirenv ? tmpdirenv : "/tmp", tmpdirenv ? tmpdirenv : "/tmp", geteuid(), getpid());
(long) geteuid(), (long) getpid());
#else #else
GetTempFileName(".", "psql", 0, fnametmp); GetTempFileName(".", "psql", 0, fnametmp);
#endif #endif

4
src/interfaces/ecpg/ecpglib/misc.c

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.22 2004/08/29 05:06:59 momjian Exp $ */ /* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.23 2004/10/09 02:46:42 momjian Exp $ */
#define POSTGRES_ECPG_INTERNAL #define POSTGRES_ECPG_INTERNAL
#include "postgres_fe.h" #include "postgres_fe.h"
@ -253,7 +253,7 @@ ECPGlog(const char *format,...)
return; return;
} }
sprintf(f, "[%d]: %s", (int) getpid(), format); sprintf(f, "[%d]: %s", getpid(), format);
va_start(ap, format); va_start(ap, format);
vfprintf(debugstream, f, ap); vfprintf(debugstream, f, ap);