git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/contrib/pg_autovacuum/pg_autovacuum.c b/contrib/pg_autovacuum/pg_autovacuum.c

index ed59024b69dbbd708b2faa020b337cd4d8fe3223..89f0e0bf91da43fb15dcbea0cd2acda33bf9ebc2 100644 (file)

--- a/contrib/pg_autovacuum/pg_autovacuum.c

+++ b/contrib/pg_autovacuum/pg_autovacuum.c

*/

#include "pg_autovacuum.h"

-#define TIMEBUFF 256

+

FILE *LOGOUTPUT;

-char timebuffer[TIMEBUFF];

char logbuffer[4096];

void

{

time_t curtime;

struct tm *loctime;

+ char timebuffer[128];

curtime = time(NULL);

loctime = localtime(&curtime);

- strftime(timebuffer, TIMEBUFF, "%Y-%m-%d %r", loctime); /* cbb - %F is not

- * always available */

+ strftime(timebuffer, sizeof(timebuffer), "%Y-%m-%d %H:%M:%S %Z", loctime);

fprintf(LOGOUTPUT, "[%s] %s\n", timebuffer, logentry);

}

diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c

index d88d1555f36911a3d2f64eb6f0c7aa9ef59edcf5..e9109938adb5c5fbc49b2fe20660a26b73fb92d2 100644 (file)

--- a/src/backend/utils/adt/nabstime.c

+++ b/src/backend/utils/adt/nabstime.c

*

*

* IDENTIFICATION

- * $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.118 2003年11月29日 19:51:58 pgsql Exp $

+ * $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.119 2004年03月22日 15:34:22 tgl Exp $

*

*-------------------------------------------------------------------------

*/

{

struct timeval tp;

struct timezone tpz;

- char templ[100];

- char buf[100];

+ char templ[128];

+ char buf[128];

text *result;

int len;

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c

index 8569b6ce5cffb7385702725b46d3aa4ef7a11956..37c5b36e09d65413cd63f7c71f469bc5bb15bd41 100644 (file)

--- a/src/backend/utils/error/elog.c

+++ b/src/backend/utils/error/elog.c

*

*

* IDENTIFICATION

- * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.130 2004年03月21日 22:29:11 tgl Exp $

+ * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.131 2004年03月22日 15:34:22 tgl Exp $

*

*-------------------------------------------------------------------------

*/

case 't':

{

time_t stamp_time = time(NULL);

- char strfbuf[32];

+ char strfbuf[128];

- strftime(strfbuf, sizeof(strfbuf), "%Y-%m-%d %H:%M:%S",

+ strftime(strfbuf, sizeof(strfbuf), "%Y-%m-%d %H:%M:%S %Z",

localtime(&stamp_time));

appendStringInfoString(buf, strfbuf);

}

if (MyProcPort)

{

time_t stamp_time = MyProcPort->session_start.tv_sec;

- char strfbuf[32];

+ char strfbuf[128];

- strftime(strfbuf, sizeof(strfbuf), "%Y-%m-%d %H:%M:%S",

+ strftime(strfbuf, sizeof(strfbuf), "%Y-%m-%d %H:%M:%S %Z",

localtime(&stamp_time));

appendStringInfoString(buf, strfbuf);

}

diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c

index 9d7549cc6864d61bd5bb53bbb1244f9e29320ab3..4342d1e10afa3143f2cbdefa81fa86d5db938a1a 100644 (file)

--- a/src/bin/pg_controldata/pg_controldata.c

+++ b/src/bin/pg_controldata/pg_controldata.c

* copyright (c) Oliver Elphick <olly@lfix.co.uk>, 2001;

* licence: BSD

*

- * $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.13 2004年02月11日 22:55:25 tgl Exp $

+ * $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.14 2004年03月22日 15:34:22 tgl Exp $

*/

#include "postgres.h"

char ControlFilePath[MAXPGPATH];

char *DataDir;

crc64 crc;

- char pgctime_str[32];

- char ckpttime_str[32];

+ char pgctime_str[128];

+ char ckpttime_str[128];

char sysident_str[32];

char *strftime_fmt = "%c";

char *progname;