summaryrefslogtreecommitdiffstats
path: root/generic/tkCmds.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-02-22 08:44:24 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-02-22 08:44:24 (GMT)
commitf584bb01ccf547af727096674302e8a6dbae1252 (patch)
treee3dc2cfda6b3b802979347c59b408b18a068b995 /generic/tkCmds.c
parent2103923eee4d74b8f49cfdb91a73c3ef32baab5f (diff)
downloadtk-f584bb01ccf547af727096674302e8a6dbae1252.zip
tk-f584bb01ccf547af727096674302e8a6dbae1252.tar.gz
tk-f584bb01ccf547af727096674302e8a6dbae1252.tar.bz2
Replace all Tcl_TraceVar/Tcl_UntraceVar with Tcl_TraceVar2/Tcl_UntraceVar2 calls: The former are just thin wrappers around the latter.
Diffstat (limited to 'generic/tkCmds.c')
-rw-r--r--generic/tkCmds.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index 9f0097e..4933d34 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.c
@@ -1031,8 +1031,8 @@ Tk_TkwaitObjCmd(
}
Tcl_DoOneEvent(0);
}
- Tcl_UntraceVar(interp, Tcl_GetString(objv[2]),
- TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+ Tcl_UntraceVar2(interp, Tcl_GetString(objv[2]),
+ NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
WaitVariableProc, &done);
break;
iv>
# What compiler flags should be used for code development?
diff --git a/src/H5.c b/src/H5.c
index 71defe7..8f770b9 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -591,7 +591,7 @@ HDfprintf (FILE *stream, const char *fmt, ...)
if (prec>0) {
sprintf (template+strlen (template), ".%d", prec);
}
- if (modifier) {
+ if (*modifier) {
sprintf (template+strlen (template), "%s", modifier);
}
sprintf (template+strlen (template), "%c", conv);
@@ -1281,24 +1281,26 @@ H5_trace (hbool_t returning, const char *func, const char *type, ...)
case 'M':
switch (type[1]) {
-#ifdef HAVE_PARALLEL
case 'c':
if (ptr) {
fprintf (out, "0x%lx", (unsigned long)vp);
} else {
+#ifdef HAVE_PARALLEL
MPI_Comm comm = va_arg (ap, MPI_Comm);
fprintf (out, "%ld", (long)comm);
+#endif
}
break;
case 'i':
if (ptr) {
fprintf (out, "0x%lx", (unsigned long)vp);
} else {
+#ifdef HAVE_PARALLEL
MPI_Info info = va_arg (ap, MPI_Info);
fprintf (out, "%ld", (long)info);
+#endif
}
break;
-#endif
default:
goto error;
}
diff --git a/src/H5A.c b/src/H5A.c
index d7014b6..b07bf37 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -157,7 +157,6 @@ H5Acreate (hid_t loc_id, const char *name, hid_t datatype, hid_t dataspace,
H5G_entry_t *ent = NULL;
H5T_t *type = NULL;
H5S_t *space = NULL;
- const H5D_create_t *create_parms = NULL;
hid_t ret_value = FAIL;
FUNC_ENTER(H5Acreate, FAIL);
@@ -195,14 +194,11 @@ H5Acreate (hid_t loc_id, const char *name, hid_t datatype, hid_t dataspace,
NULL == (space = H5I_object(dataspace))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space");
}
- if (H5P_DEFAULT!=create_plist) {
- if (H5P_DATASET_CREATE != H5Pget_class(create_plist) ||
- NULL == (create_parms = H5I_object(create_plist))) {
- HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
- "not a dataset creation property list");
- }
- } else {
- create_parms = &H5D_create_dflt;
+ if (H5P_DEFAULT!=create_plist &&
+ (H5P_DATASET_CREATE != H5Pget_class(create_plist) ||
+ NULL == H5I_object(create_plist))) {
+ HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
+ "not a dataset creation property list");
}
/* Go do the real work for attaching the attribute to the dataset */
diff --git a/src/H5AC.c b/src/H5AC.c