summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2007-11-16 11:17:26 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2007-11-16 11:17:26 (GMT)
commit7ac80cab9e7494b78ed8010a98bd096e83cd5955 (patch)
treefaf73bb4aa4dbfcaf72742a7e51b568cb341db1c /unix
parentf14f5f82187f59df377d861dfc7c2e06b3d0c66c (diff)
downloadtcl-7ac80cab9e7494b78ed8010a98bd096e83cd5955.zip
tcl-7ac80cab9e7494b78ed8010a98bd096e83cd5955.tar.gz
tcl-7ac80cab9e7494b78ed8010a98bd096e83cd5955.tar.bz2
Silence some warnings.
Diffstat (limited to 'unix')
-rw-r--r--unix/tclUnixFCmd.c6
-rw-r--r--unix/tclUnixThrd.c10
2 files changed, 8 insertions, 8 deletions
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index 07bdff9..3e9b6c6 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.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: tclUnixFCmd.c,v 1.63 2007/10/15 21:27:50 dgp Exp $
+ * RCS: @(#) $Id: tclUnixFCmd.c,v 1.64 2007/11/16 11:17:26 dkf Exp $
*
* Portions of this code were derived from NetBSD source code which has the
* following copyright notice:
@@ -1052,7 +1052,7 @@ TraverseUnixTree(
while ((ent = fts_read(fts)) != NULL) {
unsigned short info = ent->fts_info;
- char * path = ent->fts_path + sourceLen;
+ char *path = ent->fts_path + sourceLen;
unsigned short pathlen = ent->fts_pathlen - sourceLen;
int type;
Tcl_StatBuf *statBufPtr = NULL;
@@ -1084,7 +1084,7 @@ TraverseUnixTree(
break;
}
} else {
- statBufPtr = ent->fts_statp;
+ statBufPtr = (Tcl_StatBuf *) ent->fts_statp;
}
}
result = (*traverseProc)(sourcePtr, targetPtr, statBufPtr, type,
diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c
index 5f4f15c..cb206f9 100644
--- a/unix/tclUnixThrd.c
+++ b/unix/tclUnixThrd.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: tclUnixThrd.c,v 1.52 2007/05/29 23:35:06 hobbs Exp $
+ * RCS: @(#) $Id: tclUnixThrd.c,v 1.53 2007/11/16 11:17:28 dkf Exp $
*/
#include "tclInt.h"
@@ -157,14 +157,14 @@ int
Tcl_JoinThread(
Tcl_ThreadId threadId, /* Id of the thread to wait upon. */
int *state) /* Reference to the storage the result of the
- * thread we wait upon will be written
- * into. May be NULL. */
+ * thread we wait upon will be written into.
+ * May be NULL. */
{
#ifdef TCL_THREADS
int result;
- unsigned long retcode;
+ unsigned long retcode, *retcodePtr = &retcode;
- result = pthread_join((pthread_t) threadId, (void**) &retcode);
+ result = pthread_join((pthread_t) threadId, (void**) retcodePtr);
if (state) {
*state = (int) retcode;
}