mirror of
https://github.com/postgres/postgres.git
synced 2025-08-27 07:42:10 +03:00
Initial attempt to clean up the code...
Switch sprintf() to snprintf() Remove any/all #if 0 -or- #ifdef NOT_USED -or- #ifdef FALSE sections of code
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.45 1998/11/27 19:51:28 vadim Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.46 1998/12/14 05:18:30 scrappy Exp $
|
||||
*
|
||||
* NOTES
|
||||
* some of the executor utility code such as "ExecTypeFromTL" should be
|
||||
@@ -488,7 +488,8 @@ BuildDescForRelation(List *schema, char *relname)
|
||||
if (arry != NIL)
|
||||
{
|
||||
/* array of XXX is _XXX */
|
||||
sprintf(typename, "_%.*s", NAMEDATALEN - 2, entry->typename->name);
|
||||
snprintf(typename, NAMEDATALEN,
|
||||
"_%.*s", NAMEDATALEN - 2, entry->typename->name);
|
||||
attdim = length(arry);
|
||||
}
|
||||
else
|
||||
|
@@ -1326,34 +1326,6 @@ _gistdump(Relation r)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef NOT_USED
|
||||
static char *
|
||||
text_range_out(TXTRANGE *r)
|
||||
{
|
||||
char *result;
|
||||
char *lower,
|
||||
*upper;
|
||||
|
||||
if (r == NULL)
|
||||
return NULL;
|
||||
result = (char *) palloc(NAMEDATALEN + VARSIZE(TRLOWER(r)) + VARSIZE(TRUPPER(r))
|
||||
- 2 * VARHDRSZ);
|
||||
|
||||
lower = (char *) palloc(VARSIZE(TRLOWER(r)) + 1 - VARHDRSZ);
|
||||
memcpy(lower, VARDATA(TRLOWER(r)), VARSIZE(TRLOWER(r)) - VARHDRSZ);
|
||||
lower[VARSIZE(TRLOWER(r)) - VARHDRSZ] = '\0';
|
||||
upper = (char *) palloc(VARSIZE(TRUPPER(r)) + 1 - VARHDRSZ);
|
||||
memcpy(upper, VARDATA(TRUPPER(r)), VARSIZE(TRUPPER(r)) - VARHDRSZ);
|
||||
upper[VARSIZE(TRUPPER(r)) - VARHDRSZ] = '\0';
|
||||
|
||||
sprintf(result, "[%s,%s): %d", lower, upper, r->flag);
|
||||
pfree(lower);
|
||||
pfree(upper);
|
||||
return result;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static char *
|
||||
int_range_out(INTRANGE *r)
|
||||
{
|
||||
@@ -1362,7 +1334,7 @@ int_range_out(INTRANGE *r)
|
||||
if (r == NULL)
|
||||
return NULL;
|
||||
result = (char *) palloc(80);
|
||||
sprintf(result, "[%d,%d): %d", r->lower, r->upper, r->flag);
|
||||
snprintf(result, 80, "[%d,%d): %d", r->lower, r->upper, r->flag);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.18 1998/10/08 18:29:18 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.19 1998/12/14 05:18:33 scrappy Exp $
|
||||
*
|
||||
* OLD COMMENTS
|
||||
* XXX WARNING
|
||||
@@ -53,18 +53,6 @@ xidout(TransactionId transactionId)
|
||||
|
||||
}
|
||||
|
||||
#ifdef NOT_USED
|
||||
/* ----------------------------------------------------------------
|
||||
* TransactionIdIsLessThan
|
||||
* ----------------------------------------------------------------
|
||||
*/
|
||||
bool
|
||||
TransactionIdIsLessThan(TransactionId id1, TransactionId id2)
|
||||
{
|
||||
return (bool) (id1 < id2);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* ----------------------------------------------------------------
|
||||
* xideq
|
||||
* ----------------------------------------------------------------
|
||||
@@ -82,23 +70,6 @@ xideq(TransactionId xid1, TransactionId xid2)
|
||||
|
||||
|
||||
|
||||
/* ----------------------------------------------------------------
|
||||
* TransactionIdIncrement
|
||||
* ----------------------------------------------------------------
|
||||
*/
|
||||
#ifdef NOT_USED
|
||||
void
|
||||
TransactionIdIncrement(TransactionId *transactionId)
|
||||
{
|
||||
|
||||
(*transactionId)++;
|
||||
if (*transactionId == DisabledTransactionId)
|
||||
elog(FATAL, "TransactionIdIncrement: exhausted XID's");
|
||||
return;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* ----------------------------------------------------------------
|
||||
* TransactionIdAdd
|
||||
* ----------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user