mirror of
https://github.com/postgres/postgres.git
synced 2025-09-02 04:21:28 +03:00
Now that names are null terminated, no need to do all that NAMEDATALEN stuff.
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.6 1997/05/22 17:08:35 vadim Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.7 1997/08/18 20:53:18 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -125,8 +125,8 @@ smgrcreate(int16 which, Relation reln)
|
||||
int fd;
|
||||
|
||||
if ((fd = (*(smgrsw[which].smgr_create))(reln)) < 0)
|
||||
elog(WARN, "cannot open %.*s",
|
||||
NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
|
||||
elog(WARN, "cannot open %s",
|
||||
&(reln->rd_rel->relname.data[0]));
|
||||
|
||||
return (fd);
|
||||
}
|
||||
@@ -142,8 +142,8 @@ smgrunlink(int16 which, Relation reln)
|
||||
int status;
|
||||
|
||||
if ((status = (*(smgrsw[which].smgr_unlink))(reln)) == SM_FAIL)
|
||||
elog(WARN, "cannot unlink %.*s",
|
||||
NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
|
||||
elog(WARN, "cannot unlink %s",
|
||||
&(reln->rd_rel->relname.data[0]));
|
||||
|
||||
return (status);
|
||||
}
|
||||
@@ -162,8 +162,8 @@ smgrextend(int16 which, Relation reln, char *buffer)
|
||||
status = (*(smgrsw[which].smgr_extend))(reln, buffer);
|
||||
|
||||
if (status == SM_FAIL)
|
||||
elog(WARN, "%.*s: cannot extend",
|
||||
NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
|
||||
elog(WARN, "%s: cannot extend",
|
||||
&(reln->rd_rel->relname.data[0]));
|
||||
|
||||
return (status);
|
||||
}
|
||||
@@ -180,8 +180,8 @@ smgropen(int16 which, Relation reln)
|
||||
int fd;
|
||||
|
||||
if ((fd = (*(smgrsw[which].smgr_open))(reln)) < 0)
|
||||
elog(WARN, "cannot open %.*s",
|
||||
NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
|
||||
elog(WARN, "cannot open %s",
|
||||
&(reln->rd_rel->relname.data[0]));
|
||||
|
||||
return (fd);
|
||||
}
|
||||
@@ -202,8 +202,8 @@ int
|
||||
smgrclose(int16 which, Relation reln)
|
||||
{
|
||||
if ((*(smgrsw[which].smgr_close))(reln) == SM_FAIL)
|
||||
elog(WARN, "cannot close %.*s",
|
||||
NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
|
||||
elog(WARN, "cannot close %s",
|
||||
&(reln->rd_rel->relname.data[0]));
|
||||
|
||||
return (SM_SUCCESS);
|
||||
}
|
||||
@@ -226,8 +226,8 @@ smgrread(int16 which, Relation reln, BlockNumber blocknum, char *buffer)
|
||||
status = (*(smgrsw[which].smgr_read))(reln, blocknum, buffer);
|
||||
|
||||
if (status == SM_FAIL)
|
||||
elog(WARN, "cannot read block %d of %.*s",
|
||||
blocknum, NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
|
||||
elog(WARN, "cannot read block %d of %s",
|
||||
blocknum, &(reln->rd_rel->relname.data[0]));
|
||||
|
||||
return (status);
|
||||
}
|
||||
@@ -248,8 +248,8 @@ smgrwrite(int16 which, Relation reln, BlockNumber blocknum, char *buffer)
|
||||
status = (*(smgrsw[which].smgr_write))(reln, blocknum, buffer);
|
||||
|
||||
if (status == SM_FAIL)
|
||||
elog(WARN, "cannot write block %d of %.*s",
|
||||
blocknum, NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
|
||||
elog(WARN, "cannot write block %d of %s",
|
||||
blocknum, &(reln->rd_rel->relname.data[0]));
|
||||
|
||||
return (status);
|
||||
}
|
||||
@@ -265,8 +265,8 @@ smgrflush(int16 which, Relation reln, BlockNumber blocknum, char *buffer)
|
||||
status = (*(smgrsw[which].smgr_flush))(reln, blocknum, buffer);
|
||||
|
||||
if (status == SM_FAIL)
|
||||
elog(WARN, "cannot flush block %d of %.*s to stable store",
|
||||
blocknum, NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
|
||||
elog(WARN, "cannot flush block %d of %s to stable store",
|
||||
blocknum, &(reln->rd_rel->relname.data[0]));
|
||||
|
||||
return (status);
|
||||
}
|
||||
@@ -325,8 +325,8 @@ smgrnblocks(int16 which, Relation reln)
|
||||
int nblocks;
|
||||
|
||||
if ((nblocks = (*(smgrsw[which].smgr_nblocks))(reln)) < 0)
|
||||
elog(WARN, "cannot count blocks for %.*s",
|
||||
NAMEDATALEN, &(reln->rd_rel->relname.data[0]));
|
||||
elog(WARN, "cannot count blocks for %s",
|
||||
&(reln->rd_rel->relname.data[0]));
|
||||
|
||||
return (nblocks);
|
||||
}
|
||||
@@ -347,8 +347,8 @@ smgrtruncate(int16 which, Relation reln, int nblocks)
|
||||
if (smgrsw[which].smgr_truncate)
|
||||
{
|
||||
if ((newblks = (*(smgrsw[which].smgr_truncate))(reln, nblocks)) < 0)
|
||||
elog(WARN, "cannot truncate %.*s to %d blocks",
|
||||
NAMEDATALEN, &(reln->rd_rel->relname.data[0]), nblocks);
|
||||
elog(WARN, "cannot truncate %s to %d blocks",
|
||||
&(reln->rd_rel->relname.data[0]), nblocks);
|
||||
}
|
||||
|
||||
return (newblks);
|
||||
|
Reference in New Issue
Block a user