database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-29 10:41:53 +03:00
Code Activity

Don't use BLCKSZ for the physical length of the pg_control file, but

Browse Source 
instead a dedicated symbol.  This probably makes no functional difference
for likely values of BLCKSZ, but it makes the intent clearer.
Simon Riggs, minor editorialization by Tom Lane.
This commit is contained in:
Tom Lane
2006-04-04 22:39:59 +00:00
parent 147d4bf3e5
commit e6140d9052
3 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/backend/access/transam/xlog.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.232 2006/04/03 23:35:03 tgl Exp $
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.233 2006/04/04 22:39:59 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -3391,7 +3391,7 @@ static void
WriteControlFile(void)
{
int fd;
char buffer[BLCKSZ]; /* need not be aligned */
char buffer[PG_CONTROL_SIZE]; /* need not be aligned */
char *localeptr;
/*
@ -3437,17 +3437,16 @@ WriteControlFile(void)
FIN_CRC32(ControlFile->crc);
/*
* We write out BLCKSZ bytes into pg_control, zero-padding the excess over
* sizeof(ControlFileData). This reduces the odds of premature-EOF errors
* when reading pg_control. We'll still fail when we check the contents
* of the file, but hopefully with a more specific error than "couldn't
* read pg_control".
* We write out PG_CONTROL_SIZE bytes into pg_control, zero-padding the
* excess over sizeof(ControlFileData). This reduces the odds of
* premature-EOF errors when reading pg_control. We'll still fail when we
* check the contents of the file, but hopefully with a more specific
* error than "couldn't read pg_control".
*/
if (sizeof(ControlFileData) > BLCKSZ)
ereport(PANIC,
(errmsg("sizeof(ControlFileData) is larger than BLCKSZ; fix either one")));
if (sizeof(ControlFileData) > PG_CONTROL_SIZE)
elog(PANIC, "sizeof(ControlFileData) is larger than PG_CONTROL_SIZE; fix either one");
memset(buffer, 0, BLCKSZ);
memset(buffer, 0, PG_CONTROL_SIZE);
memcpy(buffer, ControlFile, sizeof(ControlFileData));
fd = BasicOpenFile(XLOG_CONTROL_FILE,
@ -3460,7 +3459,7 @@ WriteControlFile(void)
XLOG_CONTROL_FILE)));
errno = 0;
if (write(fd, buffer, BLCKSZ) != BLCKSZ)
if (write(fd, buffer, PG_CONTROL_SIZE) != PG_CONTROL_SIZE)
{
/* if write didn't set errno, assume problem is no disk space */
if (errno == 0)