summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--generic/tcl.decls12
-rw-r--r--generic/tclDecls.h18
-rw-r--r--generic/tclIOUtil.c4
4 files changed, 23 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 75aadb4..222b1a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-02 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tcl.decls (Tcl_LoadFile): Add missing "const" in signature,
+ * generic/tclIOUtil.c (Tcl_LoadFile): and some formatting fixes
+ * generic/tclDecls.h (regenerated)
+
2010-04-02 Donal K. Fellows <dkf@users.sf.net>
* generic/tclIOUtil.c (Tcl_LoadFile): Corrections to previous commit
diff --git a/generic/tcl.decls b/generic/tcl.decls
index 0e59216..b090747 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.173 2010/04/02 21:21:04 kennykb Exp $
+# RCS: @(#) $Id: tcl.decls,v 1.174 2010/04/02 23:11:55 nijtmans Exp $
library tcl
@@ -2308,15 +2308,15 @@ declare 626 generic {
# TIP #357 (Export TclLoadFile and TclpFindSymbol) kbk
declare 627 generic {
int Tcl_LoadFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
- const char *symv[], int flags, void* procPtrs,
- Tcl_LoadHandle* handlePtr)
+ const char *const symv[], int flags, void *procPtrs,
+ Tcl_LoadHandle *handlePtr)
}
declare 628 generic {
- void* Tcl_FindSymbol(Tcl_Interp* interp, Tcl_LoadHandle handle,
- const char* symbol)
+ void* Tcl_FindSymbol(Tcl_Interp *interp, Tcl_LoadHandle handle,
+ const char *symbol)
}
declare 629 generic {
- int Tcl_FSUnloadFile(Tcl_Interp* interp, Tcl_LoadHandle handlePtr)
+ int Tcl_FSUnloadFile(Tcl_Interp *interp, Tcl_LoadHandle handlePtr)
}
# ----- BASELINE -- FOR -- 8.6.0 ----- #
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 8c2db65..39f53fc 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.175 2010/04/02 21:21:05 kennykb Exp $
+ * RCS: @(#) $Id: tclDecls.h,v 1.176 2010/04/02 23:11:55 nijtmans Exp $
*/
#ifndef _TCLDECLS
@@ -3688,19 +3688,19 @@ EXTERN int Tcl_NRSubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
#define Tcl_LoadFile_TCL_DECLARED
/* 627 */
EXTERN int Tcl_LoadFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
- const char *symv[], int flags, void*procPtrs,
- Tcl_LoadHandle*handlePtr);
+ const char *const symv[], int flags,
+ void *procPtrs, Tcl_LoadHandle *handlePtr);
#endif
#ifndef Tcl_FindSymbol_TCL_DECLARED
#define Tcl_FindSymbol_TCL_DECLARED
/* 628 */
-EXTERN void* Tcl_FindSymbol(Tcl_Interp*interp,
- Tcl_LoadHandle handle, const char*symbol);
+EXTERN void* Tcl_FindSymbol(Tcl_Interp *interp,
+ Tcl_LoadHandle handle, const char *symbol);
#endif
#ifndef Tcl_FSUnloadFile_TCL_DECLARED
#define Tcl_FSUnloadFile_TCL_DECLARED
/* 629 */
-EXTERN int Tcl_FSUnloadFile(Tcl_Interp*interp,
+EXTERN int Tcl_FSUnloadFile(Tcl_Interp *interp,
Tcl_LoadHandle handlePtr);
#endif
@@ -4365,9 +4365,9 @@ typedef struct TclStubs {
int (*tcl_CloseEx) (Tcl_Interp *interp, Tcl_Channel chan, int flags); /* 624 */
int (*tcl_NRExprObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Obj *resultPtr); /* 625 */
int (*tcl_NRSubstObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 626 */
- int (*tcl_LoadFile) (Tcl_Interp *interp, Tcl_Obj *pathPtr, const char *symv[], int flags, void*procPtrs, Tcl_LoadHandle*handlePtr); /* 627 */
- void* (*tcl_FindSymbol) (Tcl_Interp*interp, Tcl_LoadHandle handle, const char*symbol); /* 628 */
- int (*tcl_FSUnloadFile) (Tcl_Interp*interp, Tcl_LoadHandle handlePtr); /* 629 */
+ int (*tcl_LoadFile) (Tcl_Interp *interp, Tcl_Obj *pathPtr, const char *const symv[], int flags, void *procPtrs, Tcl_LoadHandle *handlePtr); /* 627 */
+ void* (*tcl_FindSymbol) (Tcl_Interp *interp, Tcl_LoadHandle handle, const char *symbol); /* 628 */
+ int (*tcl_FSUnloadFile) (Tcl_Interp *interp, Tcl_LoadHandle handlePtr); /* 629 */
} TclStubs;
#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index f4dac35..ff7af5a 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -17,7 +17,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIOUtil.c,v 1.172 2010/04/02 22:52:26 dkf Exp $
+ * RCS: @(#) $Id: tclIOUtil.c,v 1.173 2010/04/02 23:11:55 nijtmans Exp $
*/
#include "tclInt.h"
@@ -3031,7 +3031,7 @@ Tcl_LoadFile(
Tcl_Interp *interp, /* Used for error reporting. */
Tcl_Obj *pathPtr, /* Name of the file containing the desired
* code. */
- const char *symbols[], /* Names of functions to look up in the file's
+ const char *const symbols[], /* Names of functions to look up in the file's
* symbol table. */
int flags, /* Flags (unused) */
void *procVPtrs, /* Where to return the addresses corresponding