From 7c106621de6315fa089fe27cd5bc920c1faba29b Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 9 Jun 2001 02:19:07 +0000
Subject: [PATCH] Fix a few missed NOIND usages.
---
doc/src/sgml/pltcl.sgml | 4 ++--
src/pl/plperl/SPI.xs | 3 ---
src/pl/plperl/eloglvl.c | 6 ------
src/pl/plperl/eloglvl.h | 3 ---
src/pl/plperl/plperl.c | 6 ++----
src/pl/tcl/pltcl.c | 4 +---
src/pl/tcl/pltcl_guide.nr | 2 +-
7 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/doc/src/sgml/pltcl.sgml b/doc/src/sgml/pltcl.sgml
index 4f57beb25f3..0683739f1a4 100644
--- a/doc/src/sgml/pltcl.sgml
+++ b/doc/src/sgml/pltcl.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/pltcl.sgml,v 2.10 2001/05/12 22:51:35 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/pltcl.sgml,v 2.11 2001/06/09 02:19:07 tgl Exp $
-->
<chapter id="pltcl">
@@ -348,7 +348,7 @@ CREATE TRIGGER trig_mytab_modcount BEFORE INSERT OR UPDATE ON mytab
<listitem>
<para>
Fire a log message. Possible levels are NOTICE, ERROR,
- FATAL, DEBUG and NOIND
+ FATAL, and DEBUG
as for the <function>elog</function> C function.
</para>
</listitem>
diff --git a/src/pl/plperl/SPI.xs b/src/pl/plperl/SPI.xs
index 3fffbc67f6f..451714ce0e8 100644
--- a/src/pl/plperl/SPI.xs
+++ b/src/pl/plperl/SPI.xs
@@ -61,9 +61,6 @@ elog_elog(level, message)
elog(level, message);
-int
-elog_NOIND()
-
int
elog_DEBUG()
diff --git a/src/pl/plperl/eloglvl.c b/src/pl/plperl/eloglvl.c
index 7fe2b043400..03353a103e3 100644
--- a/src/pl/plperl/eloglvl.c
+++ b/src/pl/plperl/eloglvl.c
@@ -22,12 +22,6 @@ elog_ERROR(void)
return ERROR;
}
-int
-elog_NOIND(void)
-{
- return NOIND;
-}
-
int
elog_NOTICE(void)
{
diff --git a/src/pl/plperl/eloglvl.h b/src/pl/plperl/eloglvl.h
index e79f5530c12..c07cd5b5d49 100644
--- a/src/pl/plperl/eloglvl.h
+++ b/src/pl/plperl/eloglvl.h
@@ -5,7 +5,4 @@ int
int
elog_ERROR(void);
-int
- elog_NOIND(void);
-
int elog_NOTICE(void);
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index bb9ab670ae6..cfd3a6c8c1e 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -33,7 +33,7 @@
* ENHANCEMENTS, OR MODIFICATIONS.
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/pl/plperl/plperl.c,v 1.20 2001/06/01 18:17:44 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/pl/plperl/plperl.c,v 1.21 2001/06/09 02:19:07 tgl Exp $
*
**********************************************************************/
@@ -252,7 +252,7 @@ plperl_init_safe_interp(void)
*/
"require Safe; SPI::bootstrap();"
"sub ::mksafefunc { my $x = new Safe; $x->permit_only(':default');$x->permit(':base_math');"
- "$x->share(qw[&elog &DEBUG &NOTICE &NOIND &ERROR]);"
+ "$x->share(qw[&elog &DEBUG &NOTICE &ERROR]);"
" return $x->reval(qq[sub { $_[0] }]); }"
};
@@ -1192,8 +1192,6 @@ plperl_elog(ClientData cdata, Tcl_Interp *interp,
level = FATAL;
else if (strcmp(argv[1], "DEBUG") == 0)
level = DEBUG;
- else if (strcmp(argv[1], "NOIND") == 0)
- level = NOIND;
else
{
Tcl_AppendResult(interp, "Unknown elog level '", argv[1],
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index 30985a434c1..0f847a61bfe 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -31,7 +31,7 @@
* ENHANCEMENTS, OR MODIFICATIONS.
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.36 2001/06/01 18:17:44 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.37 2001/06/09 02:19:07 tgl Exp $
*
**********************************************************************/
@@ -1295,8 +1295,6 @@ pltcl_elog(ClientData cdata, Tcl_Interp *interp,
level = FATAL;
else if (strcmp(argv[1], "DEBUG") == 0)
level = DEBUG;
- else if (strcmp(argv[1], "NOIND") == 0)
- level = NOIND;
else
{
Tcl_AppendResult(interp, "Unknown elog level '", argv[1],
diff --git a/src/pl/tcl/pltcl_guide.nr b/src/pl/tcl/pltcl_guide.nr
index 6fcd155a403..aa718d2776b 100644
--- a/src/pl/tcl/pltcl_guide.nr
+++ b/src/pl/tcl/pltcl_guide.nr
@@ -268,7 +268,7 @@ the body of a PL/Tcl procedure:
elog level msg
.br
Fire a log message. Possible levels are NOTICE, WARN, ERROR,
-FATAL, DEBUG and NOIND
+FATAL, and DEBUG
like for the elog() C function.
.ti -4
--
GitLab