summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2008-11-18 07:02:17 (GMT)
committernijtmans <nijtmans>2008-11-18 07:02:17 (GMT)
commit3c9a69481dd1285a19f13ee18f5f4cc42cc1d877 (patch)
treed1cafd0e219687b5374a57df407fe07db79f8b30
parent2b17014256a8e898ed0d13b9440fb93c8167e6cc (diff)
downloadtcl-3c9a69481dd1285a19f13ee18f5f4cc42cc1d877.zip
tcl-3c9a69481dd1285a19f13ee18f5f4cc42cc1d877.tar.gz
tcl-3c9a69481dd1285a19f13ee18f5f4cc42cc1d877.tar.bz2
fix [Bug 2308236] signature of Tcl_HashStats() wrong
-rw-r--r--ChangeLog7
-rw-r--r--doc/Hash.34
-rw-r--r--generic/tcl.decls4
-rw-r--r--generic/tclDecls.h6
-rw-r--r--generic/tclHash.c4
5 files changed, 16 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a1f276..53e654b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-18 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tcl.decls: Fix signature and implementation of
+ * generic/tclDecls.h: Tcl_HashStats, such that it conforms
+ * generic/tclHash.c: to the documentation.
+ * doc/Hash.3: [Bug 2308236]
+
2008-11-13 Jan Nijtmans <nijtmans@users.sf.net>
* generic/tclInt.h: rename static function FSUnloadTempFile to
diff --git a/doc/Hash.3 b/doc/Hash.3
index 0bd3315..8204c10 100644
--- a/doc/Hash.3
+++ b/doc/Hash.3
@@ -5,7 +5,7 @@
'\" See the file "license.terms" for information on usage and redistribution
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
'\"
-'\" RCS: @(#) $Id: Hash.3,v 1.26 2007/12/13 15:22:31 dgp Exp $
+'\" RCS: @(#) $Id: Hash.3,v 1.26.2.1 2008/11/18 07:02:17 nijtmans Exp $
'\"
.so man.macros
.TH Tcl_Hash 3 "" Tcl "Tcl Library Procedures"
@@ -46,7 +46,7 @@ Tcl_HashEntry *
Tcl_HashEntry *
\fBTcl_NextHashEntry\fR(\fIsearchPtr\fR)
.sp
-const char *
+char *
\fBTcl_HashStats\fR(\fItablePtr\fR)
.SH ARGUMENTS
.AS Tcl_HashKeyType *searchPtr out
diff --git a/generic/tcl.decls b/generic/tcl.decls
index ecc0415..c238167 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -12,7 +12,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: tcl.decls,v 1.131 2008/03/19 16:56:13 das Exp $
+# RCS: @(#) $Id: tcl.decls,v 1.131.2.1 2008/11/18 07:02:17 nijtmans Exp $
library tcl
@@ -953,7 +953,7 @@ declare 268 generic {
void Tcl_AppendStringsToObjVA(Tcl_Obj *objPtr, va_list argList)
}
declare 269 generic {
- CONST84_RETURN char * Tcl_HashStats(Tcl_HashTable *tablePtr)
+ char * Tcl_HashStats(Tcl_HashTable *tablePtr)
}
declare 270 generic {
CONST84_RETURN char * Tcl_ParseVar(Tcl_Interp *interp, CONST char *start,
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 865dd6c..c3099ff 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclDecls.h,v 1.130 2007/12/13 15:23:16 dgp Exp $
+ * RCS: @(#) $Id: tclDecls.h,v 1.130.2.1 2008/11/18 07:02:17 nijtmans Exp $
*/
#ifndef _TCLDECLS
@@ -1690,7 +1690,7 @@ EXTERN void Tcl_AppendStringsToObjVA (Tcl_Obj * objPtr,
#ifndef Tcl_HashStats_TCL_DECLARED
#define Tcl_HashStats_TCL_DECLARED
/* 269 */
-EXTERN CONST84_RETURN char * Tcl_HashStats (Tcl_HashTable * tablePtr);
+EXTERN char * Tcl_HashStats (Tcl_HashTable * tablePtr);
#endif
#ifndef Tcl_ParseVar_TCL_DECLARED
#define Tcl_ParseVar_TCL_DECLARED
@@ -3829,7 +3829,7 @@ typedef struct TclStubs {
void (*tcl_ValidateAllMemory) (CONST char * file, int line); /* 266 */
void (*tcl_AppendResultVA) (Tcl_Interp * interp, va_list argList); /* 267 */
void (*tcl_AppendStringsToObjVA) (Tcl_Obj * objPtr, va_list argList); /* 268 */
- CONST84_RETURN char * (*tcl_HashStats) (Tcl_HashTable * tablePtr); /* 269 */
+ char * (*tcl_HashStats) (Tcl_HashTable * tablePtr); /* 269 */
CONST84_RETURN char * (*tcl_ParseVar) (Tcl_Interp * interp, CONST char * start, CONST84 char ** termPtr); /* 270 */
CONST84_RETURN char * (*tcl_PkgPresent) (Tcl_Interp * interp, CONST char * name, CONST char * version, int exact); /* 271 */
CONST84_RETURN char * (*tcl_PkgPresentEx) (Tcl_Interp * interp, CONST char * name, CONST char * version, int exact, ClientData * clientDataPtr); /* 272 */
diff --git a/generic/tclHash.c b/generic/tclHash.c
index 4285c9b..a606885 100644
--- a/generic/tclHash.c
+++ b/generic/tclHash.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclHash.c,v 1.33 2007/12/13 15:23:17 dgp Exp $
+ * RCS: @(#) $Id: tclHash.c,v 1.33.2.1 2008/11/18 07:02:17 nijtmans Exp $
*/
#include "tclInt.h"
@@ -614,7 +614,7 @@ Tcl_NextHashEntry(
*----------------------------------------------------------------------
*/
-const char *
+char *
Tcl_HashStats(
Tcl_HashTable *tablePtr) /* Table for which to produce stats. */
{