summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-03-08 22:14:44 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-03-08 22:14:44 (GMT)
commitb839cc7b23cc44e72ee1a857ba26249b6b2370fb (patch)
tree57ada047e313cead9c8e3e9257629efb0f587d2d
parentfbbea57c8db5cba0fe0ebe3d067ed136454343b5 (diff)
parentd76f731864215bbd4f01222a06ca7ff03af57c19 (diff)
downloadtcl-b839cc7b23cc44e72ee1a857ba26249b6b2370fb.zip
tcl-b839cc7b23cc44e72ee1a857ba26249b6b2370fb.tar.gz
tcl-b839cc7b23cc44e72ee1a857ba26249b6b2370fb.tar.bz2
Fix gcc warnings: variable set but not used
-rw-r--r--ChangeLog8
-rw-r--r--generic/tclBasic.c4
-rw-r--r--generic/tclProc.c6
3 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4253e38..efc0a67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-08 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tclBasic.c: Fix gcc warnings: variable set but not used
+
2011-03-08 Don Porter <dgp@users.sourceforge.net>
* generic/tclInt.h: Remove TclMarkList() routine, an experimental
@@ -6,10 +10,6 @@
* generic/tclResult.c (ResetObjResult): Correct failure to clear
invalid intrep. Thanks to Colin McDonald. [Bug 3202905]
-2011-03-07 Jan Nijtmans <nijtmans@users.sf.net>
-
- * unix/tclUnixInit:
-
2011-03-06 Don Porter <dgp@users.sourceforge.net>
* generic/tclBasic.c: More replacements of Tcl_UtfBackslash() calls
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 36ece2c..ea1be61 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -3664,6 +3664,7 @@ TclEvalObjvInternal(
}
}
+#ifdef USE_DTRACE
if (TCL_DTRACE_CMD_ARGS_ENABLED()) {
char *a[10];
int i = 0;
@@ -3682,6 +3683,7 @@ TclEvalObjvInternal(
TCL_DTRACE_CMD_INFO(a[0], a[1], a[2], a[3], i[0], i[1]);
TclDecrRefCount(info);
}
+#endif /* USE_DTRACE */
/*
* Finally, invoke the command's Tcl_ObjCmdProc.
@@ -3756,12 +3758,14 @@ TclEvalObjvInternal(
(void) Tcl_GetObjResult(interp);
}
+#ifdef USE_DTRACE
if (TCL_DTRACE_CMD_RESULT_ENABLED()) {
Tcl_Obj *r;
r = Tcl_GetObjResult(interp);
TCL_DTRACE_CMD_RESULT(TclGetString(objv[0]), code, TclGetString(r),r);
}
+#endif /* USE_DTRACE */
done:
if (savedVarFramePtr) {
diff --git a/generic/tclProc.c b/generic/tclProc.c
index 518ddb5..978c5f7 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -1712,6 +1712,7 @@ TclObjInterpProcCore(
}
#endif /*TCL_COMPILE_DEBUG*/
+#ifdef USE_DTRACE
if (TCL_DTRACE_PROC_ARGS_ENABLED()) {
char *a[10];
int i = 0;
@@ -1732,6 +1733,7 @@ TclObjInterpProcCore(
TCL_DTRACE_PROC_INFO(a[0], a[1], a[2], a[3], i[0], i[1]);
TclDecrRefCount(info);
}
+#endif /* USE_DTRACE */
/*
* Invoke the commands in the procedure's body.
@@ -1747,6 +1749,7 @@ TclObjInterpProcCore(
procPtr->bodyPtr->internalRep.otherValuePtr;
codePtr->refCount++;
+#ifdef USE_DTRACE
if (TCL_DTRACE_PROC_ENTRY_ENABLED()) {
int l;
@@ -1755,6 +1758,7 @@ TclObjInterpProcCore(
iPtr->varFramePtr->objc - l,
(Tcl_Obj **)(iPtr->varFramePtr->objv + l));
}
+#endif /* USE_DTRACE */
result = TclExecuteByteCode(interp, codePtr);
if (TCL_DTRACE_PROC_RETURN_ENABLED()) {
TCL_DTRACE_PROC_RETURN(TclGetString(procNameObj), result);
@@ -1825,6 +1829,7 @@ TclObjInterpProcCore(
(void) 0; /* do nothing */
}
+#ifdef USE_DTRACE
if (TCL_DTRACE_PROC_RESULT_ENABLED()) {
Tcl_Obj *r;
@@ -1832,6 +1837,7 @@ TclObjInterpProcCore(
TCL_DTRACE_PROC_RESULT(TclGetString(procNameObj), result,
TclGetString(r), r);
}
+#endif /* USE_DTRACE */
procDone:
/*