diff options
| author | Bruce Momjian <bruce@momjian.us> | 2005-12-31 17:46:19 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2005-12-31 17:46:19 +0000 |
| commit | ba3e1cb8c2025f9f94a270d2e659ab341c696ec8 (patch) | |
| tree | e4b09b9448a263e2b3ee67b6eb23e62eeb143aa3 /src | |
| parent | 206499d2fba1867da36b152dd9cf3dc1f31affc1 (diff) | |
| download | postgresql-ba3e1cb8c2025f9f94a270d2e659ab341c696ec8.tar.gz postgresql-ba3e1cb8c2025f9f94a270d2e659ab341c696ec8.zip | |
Rename variable 'what' to 'stat_msg'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/postmaster/pgstat.c | 16 | ||||
| -rw-r--r-- | src/include/pgstat.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index ae20a3bb710..fa6b1f24fba 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -13,7 +13,7 @@ * * Copyright (c) 2001-2005, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.113 2005/12/16 04:03:40 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.114 2005/12/31 17:46:19 momjian Exp $ * ---------- */ #include "postgres.h" @@ -777,7 +777,7 @@ pgstat_beshutdown_hook(int code, Datum arg) * ---------- */ void -pgstat_report_activity(const char *what) +pgstat_report_activity(const char *stat_msg) { PgStat_MsgActivity msg; int len; @@ -785,12 +785,12 @@ pgstat_report_activity(const char *what) if (!pgstat_collect_querystring || pgStatSock < 0) return; - len = strlen(what); - len = pg_mbcliplen(what, len, PGSTAT_ACTIVITY_SIZE - 1); + len = strlen(stat_msg); + len = pg_mbcliplen(stat_msg, len, PGSTAT_ACTIVITY_SIZE - 1); - memcpy(msg.m_what, what, len); - msg.m_what[len] = '\0'; - len += offsetof(PgStat_MsgActivity, m_what) +1; + memcpy(msg.m_stat_msg, stat_msg, len); + msg.m_stat_msg[len] = '\0'; + len += offsetof(PgStat_MsgActivity, m_stat_msg) +1; pgstat_setheader(&msg.m_hdr, PGSTAT_MTYPE_ACTIVITY); pgstat_send(&msg, len); @@ -3015,7 +3015,7 @@ pgstat_recv_activity(PgStat_MsgActivity *msg, int len) entry = &(pgStatBeTable[msg->m_hdr.m_backendid - 1]); - StrNCpy(entry->activity, msg->m_what, PGSTAT_ACTIVITY_SIZE); + StrNCpy(entry->activity, msg->m_stat_msg, PGSTAT_ACTIVITY_SIZE); entry->activity_start_timestamp = GetCurrentTimestamp(); } diff --git a/src/include/pgstat.h b/src/include/pgstat.h index cba5acb3038..3f1512f8a32 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -5,7 +5,7 @@ * * Copyright (c) 2001-2005, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/pgstat.h,v 1.38 2005/10/15 02:49:41 momjian Exp $ + * $PostgreSQL: pgsql/src/include/pgstat.h,v 1.39 2005/12/31 17:46:19 momjian Exp $ * ---------- */ #ifndef PGSTAT_H @@ -179,7 +179,7 @@ typedef struct PgStat_MsgAnalyze typedef struct PgStat_MsgActivity { PgStat_MsgHdr m_hdr; - char m_what[PGSTAT_ACTIVITY_SIZE]; + char m_stat_msg[PGSTAT_ACTIVITY_SIZE]; } PgStat_MsgActivity; /* ---------- |