Fix for Size sizeof in cache code.
This commit is contained in:
parent
8135140a3e
commit
753c9cb9dd
1 changed files with 19 additions and 19 deletions
38
src/backend/utils/cache/relcache.c
vendored
38
src/backend/utils/cache/relcache.c
vendored
|
@ -7,7 +7,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.53 1999/01/17 06:18:51 momjian Exp $
|
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.54 1999/01/22 16:49:25 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -1876,7 +1876,7 @@ init_irels(void)
|
||||||
for (relno = 0; relno < Num_indices_bootstrap; relno++)
|
for (relno = 0; relno < Num_indices_bootstrap; relno++)
|
||||||
{
|
{
|
||||||
/* first read the relation descriptor length */
|
/* first read the relation descriptor length */
|
||||||
if ((nread = FileRead(fd, (char *) &len, sizeof(int))) != sizeof(int))
|
if ((nread = FileRead(fd, (char *) &len, sizeof(len))) != sizeof(len))
|
||||||
{
|
{
|
||||||
write_irels();
|
write_irels();
|
||||||
return;
|
return;
|
||||||
|
@ -1899,7 +1899,7 @@ init_irels(void)
|
||||||
ird->lockInfo = (char *) NULL;
|
ird->lockInfo = (char *) NULL;
|
||||||
|
|
||||||
/* next, read the access method tuple form */
|
/* next, read the access method tuple form */
|
||||||
if ((nread = FileRead(fd, (char *) &len, sizeof(int))) != sizeof(int))
|
if ((nread = FileRead(fd, (char *) &len, sizeof(len))) != sizeof(len))
|
||||||
{
|
{
|
||||||
write_irels();
|
write_irels();
|
||||||
return;
|
return;
|
||||||
|
@ -1915,7 +1915,7 @@ init_irels(void)
|
||||||
ird->rd_am = am;
|
ird->rd_am = am;
|
||||||
|
|
||||||
/* next read the relation tuple form */
|
/* next read the relation tuple form */
|
||||||
if ((nread = FileRead(fd, (char *) &len, sizeof(int))) != sizeof(int))
|
if ((nread = FileRead(fd, (char *) &len, sizeof(len))) != sizeof(len))
|
||||||
{
|
{
|
||||||
write_irels();
|
write_irels();
|
||||||
return;
|
return;
|
||||||
|
@ -1937,7 +1937,7 @@ init_irels(void)
|
||||||
len = ATTRIBUTE_TUPLE_SIZE;
|
len = ATTRIBUTE_TUPLE_SIZE;
|
||||||
for (i = 0; i < relform->relnatts; i++)
|
for (i = 0; i < relform->relnatts; i++)
|
||||||
{
|
{
|
||||||
if ((nread = FileRead(fd, (char *) &len, sizeof(int))) != sizeof(int))
|
if ((nread = FileRead(fd, (char *) &len, sizeof(len))) != sizeof(len))
|
||||||
{
|
{
|
||||||
write_irels();
|
write_irels();
|
||||||
return;
|
return;
|
||||||
|
@ -1953,7 +1953,7 @@ init_irels(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* next, read the index strategy map */
|
/* next, read the index strategy map */
|
||||||
if ((nread = FileRead(fd, (char *) &len, sizeof(int))) != sizeof(int))
|
if ((nread = FileRead(fd, (char *) &len, sizeof(len))) != sizeof(len))
|
||||||
{
|
{
|
||||||
write_irels();
|
write_irels();
|
||||||
return;
|
return;
|
||||||
|
@ -1985,7 +1985,7 @@ init_irels(void)
|
||||||
ird->rd_istrat = strat;
|
ird->rd_istrat = strat;
|
||||||
|
|
||||||
/* finally, read the vector of support procedures */
|
/* finally, read the vector of support procedures */
|
||||||
if ((nread = FileRead(fd, (char *) &len, sizeof(int))) != sizeof(int))
|
if ((nread = FileRead(fd, (char *) &len, sizeof(len))) != sizeof(len))
|
||||||
{
|
{
|
||||||
write_irels();
|
write_irels();
|
||||||
return;
|
return;
|
||||||
|
@ -2082,8 +2082,8 @@ write_irels(void)
|
||||||
len = sizeof(RelationData);
|
len = sizeof(RelationData);
|
||||||
|
|
||||||
/* first, write the relation descriptor length */
|
/* first, write the relation descriptor length */
|
||||||
if ((nwritten = FileWrite(fd, (char *) &len, sizeof(int)))
|
if ((nwritten = FileWrite(fd, (char *) &len, sizeof(len)))
|
||||||
!= sizeof(int))
|
!= sizeof(len))
|
||||||
elog(FATAL, "cannot write init file -- descriptor length");
|
elog(FATAL, "cannot write init file -- descriptor length");
|
||||||
|
|
||||||
/* next, write out the Relation structure */
|
/* next, write out the Relation structure */
|
||||||
|
@ -2092,8 +2092,8 @@ write_irels(void)
|
||||||
|
|
||||||
/* next, write the access method tuple form */
|
/* next, write the access method tuple form */
|
||||||
len = sizeof(FormData_pg_am);
|
len = sizeof(FormData_pg_am);
|
||||||
if ((nwritten = FileWrite(fd, (char *) &len, sizeof(int)))
|
if ((nwritten = FileWrite(fd, (char *) &len, sizeof(len)))
|
||||||
!= sizeof(int))
|
!= sizeof(len))
|
||||||
elog(FATAL, "cannot write init file -- am tuple form length");
|
elog(FATAL, "cannot write init file -- am tuple form length");
|
||||||
|
|
||||||
if ((nwritten = FileWrite(fd, (char *) am, len)) != len)
|
if ((nwritten = FileWrite(fd, (char *) am, len)) != len)
|
||||||
|
@ -2101,8 +2101,8 @@ write_irels(void)
|
||||||
|
|
||||||
/* next write the relation tuple form */
|
/* next write the relation tuple form */
|
||||||
len = sizeof(FormData_pg_class);
|
len = sizeof(FormData_pg_class);
|
||||||
if ((nwritten = FileWrite(fd, (char *) &len, sizeof(int)))
|
if ((nwritten = FileWrite(fd, (char *) &len, sizeof(len)))
|
||||||
!= sizeof(int))
|
!= sizeof(len))
|
||||||
elog(FATAL, "cannot write init file -- relation tuple form length");
|
elog(FATAL, "cannot write init file -- relation tuple form length");
|
||||||
|
|
||||||
if ((nwritten = FileWrite(fd, (char *) relform, len)) != len)
|
if ((nwritten = FileWrite(fd, (char *) relform, len)) != len)
|
||||||
|
@ -2112,8 +2112,8 @@ write_irels(void)
|
||||||
len = ATTRIBUTE_TUPLE_SIZE;
|
len = ATTRIBUTE_TUPLE_SIZE;
|
||||||
for (i = 0; i < relform->relnatts; i++)
|
for (i = 0; i < relform->relnatts; i++)
|
||||||
{
|
{
|
||||||
if ((nwritten = FileWrite(fd, (char *) &len, sizeof(int)))
|
if ((nwritten = FileWrite(fd, (char *) &len, sizeof(len)))
|
||||||
!= sizeof(int))
|
!= sizeof(len))
|
||||||
elog(FATAL, "cannot write init file -- length of attdesc %d", i);
|
elog(FATAL, "cannot write init file -- length of attdesc %d", i);
|
||||||
if ((nwritten = FileWrite(fd, (char *) ird->rd_att->attrs[i], len))
|
if ((nwritten = FileWrite(fd, (char *) ird->rd_att->attrs[i], len))
|
||||||
!= len)
|
!= len)
|
||||||
|
@ -2123,8 +2123,8 @@ write_irels(void)
|
||||||
/* next, write the index strategy map */
|
/* next, write the index strategy map */
|
||||||
len = AttributeNumberGetIndexStrategySize(relform->relnatts,
|
len = AttributeNumberGetIndexStrategySize(relform->relnatts,
|
||||||
am->amstrategies);
|
am->amstrategies);
|
||||||
if ((nwritten = FileWrite(fd, (char *) &len, sizeof(int)))
|
if ((nwritten = FileWrite(fd, (char *) &len, sizeof(len)))
|
||||||
!= sizeof(int))
|
!= sizeof(len))
|
||||||
elog(FATAL, "cannot write init file -- strategy map length");
|
elog(FATAL, "cannot write init file -- strategy map length");
|
||||||
|
|
||||||
if ((nwritten = FileWrite(fd, (char *) strat, len)) != len)
|
if ((nwritten = FileWrite(fd, (char *) strat, len)) != len)
|
||||||
|
@ -2132,8 +2132,8 @@ write_irels(void)
|
||||||
|
|
||||||
/* finally, write the vector of support procedures */
|
/* finally, write the vector of support procedures */
|
||||||
len = relform->relnatts * (am->amsupport * sizeof(RegProcedure));
|
len = relform->relnatts * (am->amsupport * sizeof(RegProcedure));
|
||||||
if ((nwritten = FileWrite(fd, (char *) &len, sizeof(int)))
|
if ((nwritten = FileWrite(fd, (char *) &len, sizeof(len)))
|
||||||
!= sizeof(int))
|
!= sizeof(len))
|
||||||
elog(FATAL, "cannot write init file -- support vector length");
|
elog(FATAL, "cannot write init file -- support vector length");
|
||||||
|
|
||||||
if ((nwritten = FileWrite(fd, (char *) support, len)) != len)
|
if ((nwritten = FileWrite(fd, (char *) support, len)) != len)
|
||||||
|
|
Loading…
Reference in a new issue