aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils')
-rw-r--r--src/backend/utils/adt/name.c24
-rw-r--r--src/backend/utils/cache/relcache.c18
-rw-r--r--src/backend/utils/cache/temprel.c10
3 files changed, 26 insertions, 26 deletions
diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c
index 479d9e25393..da47dd1b343 100644
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.25 1999/11/25 19:15:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.26 2000/01/22 14:20:49 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,7 +31,7 @@
* Now, always NULL terminated
*/
NameData *
-namein(char *s)
+namein(const char *s)
{
NameData *result;
int len;
@@ -54,7 +54,7 @@ namein(char *s)
* nameout - converts internal reprsentation to "..."
*/
char *
-nameout(NameData *s)
+nameout(const NameData *s)
{
if (s == NULL)
return "-";
@@ -82,7 +82,7 @@ nameout(NameData *s)
*
*/
bool
-nameeq(NameData *arg1, NameData *arg2)
+nameeq(const NameData *arg1, const NameData *arg2)
{
if (!arg1 || !arg2)
return 0;
@@ -91,7 +91,7 @@ nameeq(NameData *arg1, NameData *arg2)
}
bool
-namene(NameData *arg1, NameData *arg2)
+namene(const NameData *arg1, const NameData *arg2)
{
if (arg1 == NULL || arg2 == NULL)
return (bool) 0;
@@ -99,7 +99,7 @@ namene(NameData *arg1, NameData *arg2)
}
bool
-namelt(NameData *arg1, NameData *arg2)
+namelt(const NameData *arg1, const NameData *arg2)
{
if (arg1 == NULL || arg2 == NULL)
return (bool) 0;
@@ -107,7 +107,7 @@ namelt(NameData *arg1, NameData *arg2)
}
bool
-namele(NameData *arg1, NameData *arg2)
+namele(const NameData *arg1, const NameData *arg2)
{
if (arg1 == NULL || arg2 == NULL)
return (bool) 0;
@@ -115,7 +115,7 @@ namele(NameData *arg1, NameData *arg2)
}
bool
-namegt(NameData *arg1, NameData *arg2)
+namegt(const NameData *arg1, const NameData *arg2)
{
if (arg1 == NULL || arg2 == NULL)
return (bool) 0;
@@ -124,7 +124,7 @@ namegt(NameData *arg1, NameData *arg2)
}
bool
-namege(NameData *arg1, NameData *arg2)
+namege(const NameData *arg1, const NameData *arg2)
{
if (arg1 == NULL || arg2 == NULL)
return (bool) 0;
@@ -163,7 +163,7 @@ namecmp(Name n1, Name n2)
#endif
int
-namestrcpy(Name name, char *str)
+namestrcpy(Name name, const char *str)
{
if (!name || !str)
return -1;
@@ -173,7 +173,7 @@ namestrcpy(Name name, char *str)
#ifdef NOT_USED
int
-namestrcat(Name name, char *str)
+namestrcat(Name name, const char *str)
{
int i;
char *p,
@@ -195,7 +195,7 @@ namestrcat(Name name, char *str)
#endif
int
-namestrcmp(Name name, char *str)
+namestrcmp(Name name, const char *str)
{
if (!name && !str)
return 0;
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index ed11b77325d..a6b0f6ca9be 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.85 2000/01/15 02:59:39 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.86 2000/01/22 14:20:50 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -62,7 +62,7 @@
static void RelationClearRelation(Relation relation, bool rebuildIt);
static void RelationFlushRelation(Relation *relationPtr,
bool onlyFlushReferenceCountZero);
-static Relation RelationNameCacheGetRelation(char *relationName);
+static Relation RelationNameCacheGetRelation(const char *relationName);
static void RelationCacheAbortWalker(Relation *relationPtr,
int dummy);
static void init_irels(void);
@@ -1067,7 +1067,7 @@ RelationIdCacheGetRelation(Oid relationId)
* --------------------------------
*/
static Relation
-RelationNameCacheGetRelation(char *relationName)
+RelationNameCacheGetRelation(const char *relationName)
{
Relation rd;
NameData name;
@@ -1144,7 +1144,7 @@ RelationIdGetRelation(Oid relationId)
* --------------------------------
*/
Relation
-RelationNameGetRelation(char *relationName)
+RelationNameGetRelation(const char *relationName)
{
char *temprelname;
Relation rd;
@@ -1180,7 +1180,7 @@ RelationNameGetRelation(char *relationName)
* ----------------
*/
buildinfo.infotype = INFO_RELNAME;
- buildinfo.i.info_name = relationName;
+ buildinfo.i.info_name = (char *)relationName;
rd = RelationBuildDesc(buildinfo, NULL);
return rd;
@@ -1727,7 +1727,7 @@ AttrDefaultFetch(Relation relation)
if (adform->adnum != attrdef[i].adnum)
continue;
if (attrdef[i].adbin != NULL)
- elog(ERROR, "AttrDefaultFetch: second record found for attr %s in rel %s",
+ elog(NOTICE, "AttrDefaultFetch: second record found for attr %s in rel %s",
NameStr(relation->rd_att->attrs[adform->adnum - 1]->attname),
RelationGetRelationName(relation));
@@ -1735,7 +1735,7 @@ AttrDefaultFetch(Relation relation)
Anum_pg_attrdef_adbin,
adrel->rd_att, &isnull);
if (isnull)
- elog(ERROR, "AttrDefaultFetch: adbin IS NULL for attr %s in rel %s",
+ elog(NOTICE, "AttrDefaultFetch: adbin IS NULL for attr %s in rel %s",
NameStr(relation->rd_att->attrs[adform->adnum - 1]->attname),
RelationGetRelationName(relation));
attrdef[i].adbin = textout(val);
@@ -1744,13 +1744,13 @@ AttrDefaultFetch(Relation relation)
ReleaseBuffer(buffer);
if (i >= ndef)
- elog(ERROR, "AttrDefaultFetch: unexpected record found for attr %d in rel %s",
+ elog(NOTICE, "AttrDefaultFetch: unexpected record found for attr %d in rel %s",
adform->adnum,
RelationGetRelationName(relation));
}
if (found < ndef)
- elog(ERROR, "AttrDefaultFetch: %d record not found for rel %s",
+ elog(NOTICE, "AttrDefaultFetch: %d record not found for rel %s",
ndef - found, RelationGetRelationName(relation));
index_endscan(sd);
diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c
index 23ac1aadbcf..88894a806e6 100644
--- a/src/backend/utils/cache/temprel.c
+++ b/src/backend/utils/cache/temprel.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.18 1999/12/10 03:56:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.19 2000/01/22 14:20:50 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -49,7 +49,7 @@ typedef struct TempTable
void
-create_temp_relation(char *relname, HeapTuple pg_class_tuple)
+create_temp_relation(const char *relname, HeapTuple pg_class_tuple)
{
MemoryContext oldcxt;
TempTable *temp_rel;
@@ -202,7 +202,7 @@ invalidate_temp_relations(void)
}
char *
-get_temp_rel_by_username(char *user_relname)
+get_temp_rel_by_username(const char *user_relname)
{
List *l;
@@ -217,7 +217,7 @@ get_temp_rel_by_username(char *user_relname)
}
char *
-get_temp_rel_by_physicalname(char *relname)
+get_temp_rel_by_physicalname(const char *relname)
{
List *l;
@@ -229,5 +229,5 @@ get_temp_rel_by_physicalname(char *relname)
return temp_rel->user_relname;
}
/* needed for bootstrapping temp tables */
- return relname;
+ return pstrdup(relname);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 16:28:02 +0000