summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans@users.sourceforge.net <jan.nijtmans>2014-04-16 11:20:54 (GMT)
committernijtmans@users.sourceforge.net <jan.nijtmans>2014-04-16 11:20:54 (GMT)
commitd18594e3e256a6f81df66c5562b1c4d3fac0111c (patch)
tree786468d9876d90fd6815b063eeb2cf63e483bca6
parente20bfcc72e97b4f8fe8a51d67f10571edccf6ab6 (diff)
downloadtcl-d18594e3e256a6f81df66c5562b1c4d3fac0111c.zip
tcl-d18594e3e256a6f81df66c5562b1c4d3fac0111c.tar.gz
tcl-d18594e3e256a6f81df66c5562b1c4d3fac0111c.tar.bz2
Remove unused variable, don't use deprecated function, some formatting.
-rw-r--r--generic/tclIORChan.c2
-rw-r--r--win/tclWinInit.c10
-rw-r--r--win/tclWinSock.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/generic/tclIORChan.c b/generic/tclIORChan.c
index 16dc1ed..29819b6 100644
--- a/generic/tclIORChan.c
+++ b/generic/tclIORChan.c
@@ -2324,7 +2324,7 @@ InvokeTclMethod(
Tcl_IncrRefCount(cmd);
sr = Tcl_SaveInterpState(rcPtr->interp, 0 /* Dummy */);
Tcl_Preserve(rcPtr->interp);
- result = Tcl_GlobalEvalObj(rcPtr->interp, cmd);
+ result = Tcl_EvalObjEx(rcPtr->interp, cmd, TCL_EVAL_GLOBAL);
/*
* We do not try to extract the result information if the caller has no
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index d90d57a..8b600f6 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -135,11 +135,11 @@ TclpInitPlatform(void)
tclPlatform = TCL_PLATFORM_WINDOWS;
- /*
- * Initialize the winsock library. On Windows XP and higher this
- * can never fail.
- */
- WSAStartup(wVersionRequested, &wsaData);
+ /*
+ * Initialize the winsock library. On Windows XP and higher this
+ * can never fail.
+ */
+ WSAStartup(wVersionRequested, &wsaData);
#ifdef STATIC_BUILD
/*
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 8881cf2..3990111 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -280,7 +280,7 @@ static const Tcl_ChannelType tcpChannelType = {
static void
InitSockets(void)
{
- DWORD id, err;
+ DWORD id;
ThreadSpecificData *tsdPtr = TclThreadDataKeyGet(&dataKey);
if (!initialized) {
@@ -2414,7 +2414,7 @@ SocketThread(
*
* Side effects:
* The flags for the given socket are updated to reflect the event that
- * occured.
+ * occurred.
*
*----------------------------------------------------------------------
*/