summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog14
-rw-r--r--generic/tclIOUtil.c58
-rw-r--r--generic/tclTest.c58
-rw-r--r--unix/dltest/.cvsignore1
-rw-r--r--unix/tclLoadDl.c4
-rw-r--r--unix/tclLoadDyld.c6
-rw-r--r--unix/tclLoadNext.c4
-rw-r--r--unix/tclLoadOSF.c4
-rw-r--r--unix/tclLoadShl.c4
-rw-r--r--win/tclWin32Dll.c4
-rw-r--r--win/tclWinLoad.c4
11 files changed, 87 insertions, 74 deletions
diff --git a/ChangeLog b/ChangeLog
index 3c2425e..e88fd25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-03-10 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tclTest.c Remove unnecessary '&' decoration for function
+ * generic/tclIOUtil.c pointers
+ * win/tclWin32Dll.c Double declaration of TclNativeDupInternalRep
+ * win/tclWinLoad.c
+ * unix/tclIOUtil.c
+ * unix/tclLoadDl.c
+ * unix/tclLoadDyld.c
+ * unix/tclLoadNext.c
+ * unix/tclLoadOSF.c
+ * unix/tclLoadShl.c
+ * unix/dltest/.cvsignore Ignore *.so here
+
2010-03-09 Andreas Kupries <andreask@activestate.com>
* generic/tclIORChan.c: [Bug 2936225]: Thanks to Alexandre Ferrieux
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 23e864b..a838df6 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.169 2010/03/05 14:34:04 dkf Exp $
+ * RCS: @(#) $Id: tclIOUtil.c,v 1.170 2010/03/11 13:35:24 nijtmans Exp $
*/
#include "tclInt.h"
@@ -111,39 +111,39 @@ const Tcl_Filesystem tclNativeFilesystem = {
"native",
sizeof(Tcl_Filesystem),
TCL_FILESYSTEM_VERSION_2,
- &TclNativePathInFilesystem,
- &TclNativeDupInternalRep,
- &NativeFreeInternalRep,
- &TclpNativeToNormalized,
- &TclNativeCreateNativeRep,
- &TclpObjNormalizePath,
- &TclpFilesystemPathType,
- &NativeFilesystemSeparator,
- &TclpObjStat,
- &TclpObjAccess,
- &TclpOpenFileChannel,
- &TclpMatchInDirectory,
- &TclpUtime,
+ TclNativePathInFilesystem,
+ TclNativeDupInternalRep,
+ NativeFreeInternalRep,
+ TclpNativeToNormalized,
+ TclNativeCreateNativeRep,
+ TclpObjNormalizePath,
+ TclpFilesystemPathType,
+ NativeFilesystemSeparator,
+ TclpObjStat,
+ TclpObjAccess,
+ TclpOpenFileChannel,
+ TclpMatchInDirectory,
+ TclpUtime,
#ifndef S_IFLNK
NULL,
#else
- &TclpObjLink,
+ TclpObjLink,
#endif /* S_IFLNK */
- &TclpObjListVolumes,
- &NativeFileAttrStrings,
- &NativeFileAttrsGet,
- &NativeFileAttrsSet,
- &TclpObjCreateDirectory,
- &TclpObjRemoveDirectory,
- &TclpObjDeleteFile,
- &TclpObjCopyFile,
- &TclpObjRenameFile,
- &TclpObjCopyDirectory,
- &TclpObjLstat,
- &TclpDlopen,
+ TclpObjListVolumes,
+ NativeFileAttrStrings,
+ NativeFileAttrsGet,
+ NativeFileAttrsSet,
+ TclpObjCreateDirectory,
+ TclpObjRemoveDirectory,
+ TclpObjDeleteFile,
+ TclpObjCopyFile,
+ TclpObjRenameFile,
+ TclpObjCopyDirectory,
+ TclpObjLstat,
+ TclpDlopen,
/* Needs a cast since we're using version_2. */
- (Tcl_FSGetCwdProc *) &TclpGetNativeCwd,
- &TclpObjChdir
+ (Tcl_FSGetCwdProc *) TclpGetNativeCwd,
+ TclpObjChdir
};
/*
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 4e717bd..5aedb14 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -14,7 +14,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclTest.c,v 1.149 2010/03/07 14:39:26 nijtmans Exp $
+ * RCS: @(#) $Id: tclTest.c,v 1.150 2010/03/11 13:35:25 nijtmans Exp $
*/
#undef STATIC_BUILD
@@ -428,41 +428,41 @@ static const Tcl_Filesystem testReportingFilesystem = {
"reporting",
sizeof(Tcl_Filesystem),
TCL_FILESYSTEM_VERSION_1,
- &TestReportInFilesystem, /* path in */
- &TestReportDupInternalRep,
- &TestReportFreeInternalRep,
+ TestReportInFilesystem, /* path in */
+ TestReportDupInternalRep,
+ TestReportFreeInternalRep,
NULL, /* native to norm */
NULL, /* convert to native */
- &TestReportNormalizePath,
+ TestReportNormalizePath,
NULL, /* path type */
NULL, /* separator */
- &TestReportStat,
- &TestReportAccess,
- &TestReportOpenFileChannel,
- &TestReportMatchInDirectory,
- &TestReportUtime,
- &TestReportLink,
+ TestReportStat,
+ TestReportAccess,
+ TestReportOpenFileChannel,
+ TestReportMatchInDirectory,
+ TestReportUtime,
+ TestReportLink,
NULL /* list volumes */,
- &TestReportFileAttrStrings,
- &TestReportFileAttrsGet,
- &TestReportFileAttrsSet,
- &TestReportCreateDirectory,
- &TestReportRemoveDirectory,
- &TestReportDeleteFile,
- &TestReportCopyFile,
- &TestReportRenameFile,
- &TestReportCopyDirectory,
- &TestReportLstat,
- &TestReportLoadFile,
+ TestReportFileAttrStrings,
+ TestReportFileAttrsGet,
+ TestReportFileAttrsSet,
+ TestReportCreateDirectory,
+ TestReportRemoveDirectory,
+ TestReportDeleteFile,
+ TestReportCopyFile,
+ TestReportRenameFile,
+ TestReportCopyDirectory,
+ TestReportLstat,
+ TestReportLoadFile,
NULL /* cwd */,
- &TestReportChdir
+ TestReportChdir
};
static const Tcl_Filesystem simpleFilesystem = {
"simple",
sizeof(Tcl_Filesystem),
TCL_FILESYSTEM_VERSION_1,
- &SimplePathInFilesystem,
+ SimplePathInFilesystem,
NULL,
NULL,
/* No internal to normalized, since we don't create any
@@ -476,14 +476,14 @@ static const Tcl_Filesystem simpleFilesystem = {
NULL,
NULL,
NULL,
- &SimpleStat,
- &SimpleAccess,
- &SimpleOpenFileChannel,
- &SimpleMatchInDirectory,
+ SimpleStat,
+ SimpleAccess,
+ SimpleOpenFileChannel,
+ SimpleMatchInDirectory,
NULL,
/* We choose not to support symbolic links inside our vfs's */
NULL,
- &SimpleListVolumes,
+ SimpleListVolumes,
NULL,
NULL,
NULL,
diff --git a/unix/dltest/.cvsignore b/unix/dltest/.cvsignore
index 5325f6e..6ff1067 100644
--- a/unix/dltest/.cvsignore
+++ b/unix/dltest/.cvsignore
@@ -2,3 +2,4 @@ Makefile
*.bundle
*.dylib
*.dll
+*.so
diff --git a/unix/tclLoadDl.c b/unix/tclLoadDl.c
index 7bb1da3..3043f92 100644
--- a/unix/tclLoadDl.c
+++ b/unix/tclLoadDl.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLoadDl.c,v 1.17 2008/04/27 22:21:33 dkf Exp $
+ * RCS: @(#) $Id: tclLoadDl.c,v 1.18 2010/03/11 13:35:25 nijtmans Exp $
*/
#include "tclInt.h"
@@ -104,7 +104,7 @@ TclpDlopen(
return TCL_ERROR;
}
- *unloadProcPtr = &TclpUnloadFile;
+ *unloadProcPtr = TclpUnloadFile;
*loadHandle = (Tcl_LoadHandle) handle;
return TCL_OK;
}
diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c
index 5e330c8..79fa227 100644
--- a/unix/tclLoadDyld.c
+++ b/unix/tclLoadDyld.c
@@ -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: tclLoadDyld.c,v 1.32 2009/04/10 18:10:39 das Exp $
+ * RCS: @(#) $Id: tclLoadDyld.c,v 1.33 2010/03/11 13:35:25 nijtmans Exp $
*/
#include "tclInt.h"
@@ -308,7 +308,7 @@ TclpDlopen(
dyldLoadHandle->modulePtr = modulePtr;
#endif
*loadHandle = (Tcl_LoadHandle) dyldLoadHandle;
- *unloadProcPtr = &TclpUnloadFile;
+ *unloadProcPtr = TclpUnloadFile;
result = TCL_OK;
} else {
Tcl_AppendResult(interp, errMsg, NULL);
@@ -758,7 +758,7 @@ TclpLoadMemory(
dyldLoadHandle->dyldLibHeader = NULL;
dyldLoadHandle->modulePtr = modulePtr;
*loadHandle = (Tcl_LoadHandle) dyldLoadHandle;
- *unloadProcPtr = &TclpUnloadFile;
+ *unloadProcPtr = TclpUnloadFile;
return TCL_OK;
}
#endif /* TCL_LOAD_FROM_MEMORY */
diff --git a/unix/tclLoadNext.c b/unix/tclLoadNext.c
index 4168ebb..5b66f4e 100644
--- a/unix/tclLoadNext.c
+++ b/unix/tclLoadNext.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLoadNext.c,v 1.14 2008/04/27 22:21:34 dkf Exp $
+ * RCS: @(#) $Id: tclLoadNext.c,v 1.15 2010/03/11 13:35:25 nijtmans Exp $
*/
#include "tclInt.h"
@@ -96,7 +96,7 @@ TclpDlopen(
NXCloseMemory(errorStream, NX_FREEBUFFER);
*loadHandle = (Tcl_LoadHandle)1; /* A dummy non-NULL value */
- *unloadProcPtr = &TclpUnloadFile;
+ *unloadProcPtr = TclpUnloadFile;
return TCL_OK;
}
diff --git a/unix/tclLoadOSF.c b/unix/tclLoadOSF.c
index 8a63035..4d91243 100644
--- a/unix/tclLoadOSF.c
+++ b/unix/tclLoadOSF.c
@@ -31,7 +31,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLoadOSF.c,v 1.14 2008/04/27 22:21:34 dkf Exp $
+ * RCS: @(#) $Id: tclLoadOSF.c,v 1.15 2010/03/11 13:35:25 nijtmans Exp $
*/
#include "tclInt.h"
@@ -120,7 +120,7 @@ TclpDlopen(
pkg++;
}
*loadHandle = pkg;
- *unloadProcPtr = &TclpUnloadFile;
+ *unloadProcPtr = TclpUnloadFile;
return TCL_OK;
}
diff --git a/unix/tclLoadShl.c b/unix/tclLoadShl.c
index a3a3fc5..b989d7e 100644
--- a/unix/tclLoadShl.c
+++ b/unix/tclLoadShl.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: tclLoadShl.c,v 1.17 2008/04/27 22:21:34 dkf Exp $
+ * RCS: @(#) $Id: tclLoadShl.c,v 1.18 2010/03/11 13:35:25 nijtmans Exp $
*/
#include <dl.h>
@@ -98,7 +98,7 @@ TclpDlopen(
return TCL_ERROR;
}
*loadHandle = (Tcl_LoadHandle) handle;
- *unloadProcPtr = &TclpUnloadFile;
+ *unloadProcPtr = TclpUnloadFile;
return TCL_OK;
}
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index 50689bc..3b2b0a0 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.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: tclWin32Dll.c,v 1.62 2010/03/07 14:39:25 nijtmans Exp $
+ * RCS: @(#) $Id: tclWin32Dll.c,v 1.63 2010/03/11 13:35:23 nijtmans Exp $
*/
#include "tclWinInt.h"
@@ -270,8 +270,6 @@ TCL_DECLARE_MUTEX(mountPointMap)
* We will need this below.
*/
-extern Tcl_FSDupInternalRepProc TclNativeDupInternalRep;
-
#ifdef __WIN32__
#ifndef STATIC_BUILD
diff --git a/win/tclWinLoad.c b/win/tclWinLoad.c
index 26f50a4..fea7b85 100644
--- a/win/tclWinLoad.c
+++ b/win/tclWinLoad.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: tclWinLoad.c,v 1.24 2010/02/15 22:56:19 nijtmans Exp $
+ * RCS: @(#) $Id: tclWinLoad.c,v 1.25 2010/03/11 13:35:23 nijtmans Exp $
*/
#include "tclWinInt.h"
@@ -130,7 +130,7 @@ TclpDlopen(
}
return TCL_ERROR;
} else {
- *unloadProcPtr = &TclpUnloadFile;
+ *unloadProcPtr = TclpUnloadFile;
}
return TCL_OK;
}
generated by cgit v0.12 at 2024-07-15 14:29:58 (GMT)