diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/adt/regproc.c | 7 | ||||
| -rw-r--r-- | src/backend/utils/adt/sets.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/cache/catcache.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/cache/syscache.c | 6 |
4 files changed, 11 insertions, 10 deletions
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c index 96263e9da4d..e6509f4beb1 100644 --- a/src/backend/utils/adt/regproc.c +++ b/src/backend/utils/adt/regproc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.19 1998/06/15 19:29:37 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.20 1998/07/20 16:57:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -130,7 +130,7 @@ regprocout(RegProcedure proid) RelationGetTupleDescriptor(proc), &isnull); if (!isnull) { - StrNCpy(result, s, 16); + StrNCpy(result, s, NAMEDATALEN); break; } elog(FATAL, "regprocout: null procedure %d", proid); @@ -207,7 +207,8 @@ oid8types(Oid (*oidArray)[]) RelationGetTupleDescriptor(type), &isnull); if (!isnull) { - StrNCpy(VARDATA(result) + strlen(VARDATA(result)), s, 16); + StrNCpy(VARDATA(result) + strlen(VARDATA(result)), s, + NAMEDATALEN); strcat(VARDATA(result), " "); } else diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c index ae12118d1c8..577d3360150 100644 --- a/src/backend/utils/adt/sets.c +++ b/src/backend/utils/adt/sets.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.13 1998/04/27 04:07:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.14 1998/07/20 16:57:02 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,7 +47,7 @@ SetDefine(char *querystr, char *typename) Oid setoid; char *procname = GENERICSETNAME; char *fileName = "-"; - char realprocname[16]; + char realprocname[NAMEDATALEN]; HeapTuple tup, newtup = NULL; Form_pg_proc proc; diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index 2a4a8605466..9687db978a3 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.29 1998/06/15 19:29:38 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.30 1998/07/20 16:57:03 momjian Exp $ * * Notes: * XXX This needs to use exception.h to handle recovery when @@ -220,7 +220,7 @@ CatalogCacheInitializeCache(struct catcache * cache, &cache->cc_skey[i].sk_func); cache->cc_skey[i].sk_nargs = cache->cc_skey[i].sk_func.fn_nargs; - CACHE5_elog(DEBUG, "CatalogCacheInit %16s %d %d %x", + CACHE5_elog(DEBUG, "CatalogCacheInit %s %d %d %x", &relation->rd_rel->relname, i, tupdesc->attrs[cache->cc_key[i] - 1]->attlen, diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c index 0348fa3481a..e98a26a60b7 100644 --- a/src/backend/utils/cache/syscache.c +++ b/src/backend/utils/cache/syscache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.18 1998/06/15 19:29:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.19 1998/07/20 16:57:05 momjian Exp $ * * NOTES * These routines allow the parser/planner/executor to perform @@ -372,7 +372,7 @@ InitCatalogCache() if (!PointerIsValid((char *) SysCache[cacheId])) { elog(ERROR, - "InitCatalogCache: Can't init cache %.16s(%d)", + "InitCatalogCache: Can't init cache %s(%d)", cacheinfo[cacheId].name, cacheId); } @@ -419,7 +419,7 @@ SearchSysCacheTuple(int cacheId,/* cache selection code */ cacheinfo[cacheId].iScanFunc); if (!PointerIsValid(SysCache[cacheId])) elog(ERROR, - "InitCatalogCache: Can't init cache %.16s(%d)", + "InitCatalogCache: Can't init cache %s(%d)", cacheinfo[cacheId].name, cacheId); } |