summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2005-12-01 06:11:40 (GMT)
committerdas <das>2005-12-01 06:11:40 (GMT)
commit5303d9d6cd0b2d4a1b0623aecb9c45873f22d330 (patch)
tree1568209fc0e72c421d3077ba322d45f440bda741
parent69017663e915a742c38e4087eb54af223885cf2e (diff)
downloadtcl-5303d9d6cd0b2d4a1b0623aecb9c45873f22d330.zip
tcl-5303d9d6cd0b2d4a1b0623aecb9c45873f22d330.tar.gz
tcl-5303d9d6cd0b2d4a1b0623aecb9c45873f22d330.tar.bz2
* generic/tclClock.c: fix warning.
-rw-r--r--ChangeLog2
-rw-r--r--generic/tclClock.c10
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f30576..72dc1b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2005-12-01 Daniel Steffen <das@users.sourceforge.net>
+ * generic/tclClock.c: fix warning.
+
* unix/tcl.m4 (Darwin): fixed error when MACOSX_DEPLOYMENT_TARGET unset.
* unix/configure: regen.
diff --git a/generic/tclClock.c b/generic/tclClock.c
index a29de78..522f6b1 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.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: tclClock.c,v 1.47 2005/11/30 19:34:13 kennykb Exp $
+ * RCS: @(#) $Id: tclClock.c,v 1.48 2005/12/01 06:11:40 das Exp $
*/
#include "tclInt.h"
@@ -482,6 +482,7 @@ ClockGetjuliandayfromerayearmonthdayObjCmd (
int changeover;
int copied = 0;
int status;
+ int era = 0;
/* Check params */
@@ -492,7 +493,7 @@ ClockGetjuliandayfromerayearmonthdayObjCmd (
dict = objv[1];
if (Tcl_DictObjGet(interp, dict, literals[LIT_ERA], &fieldPtr) != TCL_OK
|| Tcl_GetIndexFromObj(interp, fieldPtr, eras, "era", TCL_EXACT,
- &(fields.era)) != TCL_OK
+ &era) != TCL_OK
|| Tcl_DictObjGet(interp, dict, literals[LIT_YEAR],
&fieldPtr) != TCL_OK
|| Tcl_GetIntFromObj(interp, fieldPtr, &(fields.year)) != TCL_OK
@@ -505,6 +506,7 @@ ClockGetjuliandayfromerayearmonthdayObjCmd (
|| Tcl_GetIntFromObj(interp, objv[2], &changeover) != TCL_OK) {
return TCL_ERROR;
}
+ fields.era = era;
/* Get Julian day */
@@ -564,6 +566,7 @@ ClockGetjuliandayfromerayearweekdayObjCmd (
int changeover;
int copied = 0;
int status;
+ int era = 0;
/* Check params */
@@ -574,7 +577,7 @@ ClockGetjuliandayfromerayearweekdayObjCmd (
dict = objv[1];
if (Tcl_DictObjGet(interp, dict, literals[LIT_ERA], &fieldPtr) != TCL_OK
|| Tcl_GetIndexFromObj(interp, fieldPtr, eras, "era", TCL_EXACT,
- &(fields.era)) != TCL_OK
+ &era) != TCL_OK
|| Tcl_DictObjGet(interp, dict, literals[LIT_ISO8601YEAR],
&fieldPtr) != TCL_OK
|| Tcl_GetIntFromObj(interp, fieldPtr, &(fields.iso8601Year)) != TCL_OK
@@ -587,6 +590,7 @@ ClockGetjuliandayfromerayearweekdayObjCmd (
|| Tcl_GetIntFromObj(interp, objv[2], &changeover) != TCL_OK) {
return TCL_ERROR;
}
+ fields.era = era;
/* Get Julian day */