diff options
| author | Bruce Momjian <bruce@momjian.us> | 1997-08-18 20:53:48 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1997-08-18 20:53:48 +0000 |
| commit | b99c63cfc029cc0552e98f652d1734aec1124a5b (patch) | |
| tree | 6e18eedc0b8ebfc0d84479ed26d0ea9b12d8125d /src/backend/executor | |
| parent | 022903f22e54cbc78b4acc1ef54f73d19a051630 (diff) | |
| download | postgresql-b99c63cfc029cc0552e98f652d1734aec1124a5b.tar.gz postgresql-b99c63cfc029cc0552e98f652d1734aec1124a5b.zip | |
Now that names are null terminated, no need to do all that NAMEDATALEN stuff.
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/execMain.c | 10 | ||||
| -rw-r--r-- | src/backend/executor/execUtils.c | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 7c93fe2af66..b79be5d746f 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.14 1997/08/12 22:52:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.15 1997/08/18 20:52:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -308,9 +308,9 @@ ExecCheckPerms(CmdType operation, if (!HeapTupleIsValid(htp)) elog(WARN, "ExecCheckPerms: bogus RT relid: %d", relid); - strncpy(rname.data, + strNcpy(rname.data, ((Form_pg_class) GETSTRUCT(htp))->relname.data, - NAMEDATALEN); + NAMEDATALEN-1); if (i == resultRelation) { /* this is the result relation */ qvars = pull_varnos(parseTree->qual); tvars = pull_varnos((Node*)parseTree->targetList); @@ -348,10 +348,6 @@ ExecCheckPerms(CmdType operation, ++i; } if (!ok) { -/* - elog(WARN, "%s on \"%-.*s\": permission denied", opstr, - NAMEDATALEN, rname.data); -*/ elog(WARN, "%s: %s", rname.data, aclcheck_error_strings[aclcheck_result]); } } diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index 45e8fefb70c..a44c0f024ac 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.9 1997/06/13 03:24:26 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.10 1997/08/18 20:52:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -491,7 +491,7 @@ ExecSetTypeInfo(int index, att->attrelid = 0; /* dummy value */ if (attName != (char *) NULL) - strncpy(att->attname.data, attName, NAMEDATALEN); + strNcpy(att->attname.data, attName, NAMEDATALEN-1); else memset(att->attname.data,0,NAMEDATALEN); |