summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconfigure2
-rwxr-xr-xconfigure.in2
-rw-r--r--src/bltGrAxis.C36
-rw-r--r--src/bltGrElem.C1
-rw-r--r--src/bltGrElemBar.C22
-rw-r--r--src/bltGrElemLine.C24
-rw-r--r--src/bltGrElemOption.C2
-rw-r--r--src/bltGrMarkerOp.C17
-rw-r--r--src/bltGrPSOutput.C7
-rw-r--r--src/bltGrPen.C2
-rw-r--r--src/bltGrPen.h5
-rw-r--r--src/bltGrPenBar.C2
-rw-r--r--src/bltGrPenLine.C3
-rw-r--r--src/bltGraphOp.C2
-rw-r--r--src/bltGraphSup.C2
-rw-r--r--src/bltParse.C12
-rw-r--r--src/bltSwitch.C2
-rw-r--r--src/bltVector.C2
18 files changed, 84 insertions, 61 deletions
diff --git a/configure b/configure
index 0f7341f..8e6b88c 100755
--- a/configure
+++ b/configure
@@ -5571,7 +5571,7 @@ done
bltSpline.C
bltSwitch.C
bltText.C
- bltUtil.C
+ bltUtil.c
bltVecCmd.c
bltVecMath.c
bltVector.c
diff --git a/configure.in b/configure.in
index 44b91ec..b05a1cb 100755
--- a/configure.in
+++ b/configure.in
@@ -116,7 +116,7 @@ TEA_ADD_SOURCES([
bltSpline.C
bltSwitch.C
bltText.C
- bltUtil.C
+ bltUtil.c
bltVecCmd.c
bltVecMath.c
bltVector.c
diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index 73f6ba4..5a839ec 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -334,12 +334,12 @@ int Axis::configure()
if (((!isnan(ops->reqMin)) && (!isnan(ops->reqMax))) &&
(ops->reqMin >= ops->reqMax)) {
- char msg[200];
- sprintf_s(msg, 200,
- "impossible axis limits (-min %g >= -max %g) for \"%s\"",
- ops->reqMin, ops->reqMax, name_);
- Tcl_AppendResult(graphPtr_->interp_, msg, NULL);
- return TCL_ERROR;
+ ostringstream str;
+ str << "impossible axis limits (-min " << ops->reqMin
+ << " >= -max " << ops->reqMax << ") for \""
+ << name_ << "\"" << ends;
+ Tcl_AppendResult(graphPtr_->interp_, str.str().c_str(), NULL);
+ return TCL_ERROR;
}
scrollMin_ = ops->reqScrollMin;
@@ -349,10 +349,9 @@ int Axis::configure()
// Check that the logscale limits are positive.
if ((!isnan(ops->reqMin)) && (ops->reqMin <= 0.0)) {
ostringstream str;
- str << ops->reqMin << ends;
- Tcl_AppendResult(graphPtr_->interp_,"bad logscale -min limit \"",
- str.str().c_str(), "\" for axis \"", name_, "\"",
- NULL);
+ str << "bad logscale -min limit \"" << ops->reqMin
+ << "\" for axis \"" << name_ << "\"" << ends;
+ Tcl_AppendResult(graphPtr_->interp_, str.str().c_str(), NULL);
return TCL_ERROR;
}
}
@@ -672,10 +671,10 @@ void Axis::drawLimits(Drawable drawable)
const char* fmt = ops->limitsFormat;
if (fmt && *fmt) {
minPtr = minString;
- sprintf_s(minString, 200, fmt, axisRange_.min);
+ snprintf(minString, 200, fmt, axisRange_.min);
maxPtr = maxString;
- sprintf_s(maxString, 200, fmt, axisRange_.max);
+ snprintf(maxString, 200, fmt, axisRange_.max);
}
if (ops->descending) {
char *tmp = minPtr;
@@ -1044,13 +1043,12 @@ TickLabel* Axis::makeLabel(double value)
#define TICK_LABEL_SIZE 200
AxisOptions* ops = (AxisOptions*)ops_;
- char string[TICK_LABEL_SIZE + 1];
- TickLabel* labelPtr;
+ char string[TICK_LABEL_SIZE + 1];
if (ops->logScale)
- sprintf_s(string, TICK_LABEL_SIZE, "1E%d", ROUND(value));
+ snprintf(string, TICK_LABEL_SIZE, "1E%d", ROUND(value));
else
- sprintf_s(string, TICK_LABEL_SIZE, "%.*G", 15, value);
+ snprintf(string, TICK_LABEL_SIZE, "%.*G", 15, value);
if (ops->formatCmd) {
Tcl_Interp* interp = graphPtr_->interp_;
@@ -1074,7 +1072,7 @@ TickLabel* Axis::makeLabel(double value)
}
}
- labelPtr = (TickLabel*)malloc(sizeof(TickLabel) + strlen(string));
+ TickLabel* labelPtr = (TickLabel*)malloc(sizeof(TickLabel) + strlen(string));
strcpy(labelPtr->string, string);
labelPtr->anchorPos.x = DBL_MAX;
labelPtr->anchorPos.y = DBL_MAX;
@@ -1793,10 +1791,10 @@ void Axis::printLimits(Blt_Ps ps)
const char* fmt = ops->limitsFormat;
if (fmt && *fmt) {
minPtr = minString;
- sprintf_s(minString, 200, fmt, axisRange_.min);
+ snprintf(minString, 200, fmt, axisRange_.min);
maxPtr = maxString;
- sprintf_s(maxString, 200, fmt, axisRange_.max);
+ snprintf(maxString, 200, fmt, axisRange_.max);
}
if (ops->descending) {
char *tmp = minPtr;
diff --git a/src/bltGrElem.C b/src/bltGrElem.C
index 42f0347..b17ca6d 100644
--- a/src/bltGrElem.C
+++ b/src/bltGrElem.C
@@ -28,6 +28,7 @@
*/
#include <float.h>
+#include <stdlib.h>
#include "bltGraph.h"
#include "bltGrElem.h"
diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C
index ee96f07..d688b6b 100644
--- a/src/bltGrElemBar.C
+++ b/src/bltGrElemBar.C
@@ -1330,13 +1330,13 @@ void BarElement::DrawBarValues(Drawable drawable, BarPen* penPtr,
count++;
if (penOps->valueShow == SHOW_X)
- sprintf_s(string, TCL_DOUBLE_SPACE, fmt, x);
+ snprintf(string, TCL_DOUBLE_SPACE, fmt, x);
else if (penOps->valueShow == SHOW_Y)
- sprintf_s(string, TCL_DOUBLE_SPACE, fmt, y);
+ snprintf(string, TCL_DOUBLE_SPACE, fmt, y);
else if (penOps->valueShow == SHOW_BOTH) {
- sprintf_s(string, TCL_DOUBLE_SPACE, fmt, x);
+ snprintf(string, TCL_DOUBLE_SPACE, fmt, x);
strcat(string, ",");
- sprintf_s(string + strlen(string), TCL_DOUBLE_SPACE, fmt, y);
+ snprintf(string + strlen(string), TCL_DOUBLE_SPACE, fmt, y);
}
if (gops->inverted) {
@@ -1417,14 +1417,14 @@ void BarElement::BarValuesToPostScript(Blt_Ps ps, BarPen* penPtr,
x = ops->coords.x->values[barToData[count]];
y = ops->coords.y->values[barToData[count]];
count++;
- if (penOps->valueShow == SHOW_X) {
- sprintf_s(string, TCL_DOUBLE_SPACE, fmt, x);
- } else if (penOps->valueShow == SHOW_Y) {
- sprintf_s(string, TCL_DOUBLE_SPACE, fmt, y);
- } else if (penOps->valueShow == SHOW_BOTH) {
- sprintf_s(string, TCL_DOUBLE_SPACE, fmt, x);
+ if (penOps->valueShow == SHOW_X)
+ snprintf(string, TCL_DOUBLE_SPACE, fmt, x);
+ else if (penOps->valueShow == SHOW_Y)
+ snprintf(string, TCL_DOUBLE_SPACE, fmt, y);
+ else if (penOps->valueShow == SHOW_BOTH) {
+ snprintf(string, TCL_DOUBLE_SPACE, fmt, x);
strcat(string, ",");
- sprintf_s(string + strlen(string), TCL_DOUBLE_SPACE, fmt, y);
+ snprintf(string + strlen(string), TCL_DOUBLE_SPACE, fmt, y);
}
if (gops->inverted) {
anchorPos.y = rp->y + rp->height * 0.5;
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C
index 6974320..67c612d 100644
--- a/src/bltGrElemLine.C
+++ b/src/bltGrElemLine.C
@@ -29,6 +29,8 @@
#include <float.h>
#include <math.h>
+#include <stdlib.h>
+#include <string.h>
extern "C" {
#include "bltInt.h"
@@ -2795,13 +2797,13 @@ void LineElement::DrawValues(Drawable drawable, LinePen* penPtr,
double y = yval[map[count]];
count++;
if (penOps->valueShow == SHOW_X)
- sprintf_s(string, TCL_DOUBLE_SPACE, fmt, x);
+ snprintf(string, TCL_DOUBLE_SPACE, fmt, x);
else if (penOps->valueShow == SHOW_Y)
- sprintf_s(string, TCL_DOUBLE_SPACE, fmt, y);
+ snprintf(string, TCL_DOUBLE_SPACE, fmt, y);
else if (penOps->valueShow == SHOW_BOTH) {
- sprintf_s(string, TCL_DOUBLE_SPACE, fmt, x);
+ snprintf(string, TCL_DOUBLE_SPACE, fmt, x);
strcat(string, ",");
- sprintf_s(string + strlen(string), TCL_DOUBLE_SPACE, fmt, y);
+ snprintf(string + strlen(string), TCL_DOUBLE_SPACE, fmt, y);
}
Blt_DrawText(graphPtr_->tkwin_, drawable, string, &penOps->valueStyle,
@@ -2979,14 +2981,14 @@ void LineElement::ValuesToPostScript(Blt_Ps ps, LinePen* penPtr,
count++;
char string[TCL_DOUBLE_SPACE * 2 + 2];
- if (penOps->valueShow == SHOW_X) {
- sprintf_s(string, TCL_DOUBLE_SPACE, fmt, x);
- } else if (penOps->valueShow == SHOW_Y) {
- sprintf_s(string, TCL_DOUBLE_SPACE, fmt, y);
- } else if (penOps->valueShow == SHOW_BOTH) {
- sprintf_s(string, TCL_DOUBLE_SPACE, fmt, x);
+ if (penOps->valueShow == SHOW_X)
+ snprintf(string, TCL_DOUBLE_SPACE, fmt, x);
+ else if (penOps->valueShow == SHOW_Y)
+ snprintf(string, TCL_DOUBLE_SPACE, fmt, y);
+ else if (penOps->valueShow == SHOW_BOTH) {
+ snprintf(string, TCL_DOUBLE_SPACE, fmt, x);
strcat(string, ",");
- sprintf_s(string + strlen(string), TCL_DOUBLE_SPACE, fmt, y);
+ snprintf(string + strlen(string), TCL_DOUBLE_SPACE, fmt, y);
}
Blt_Ps_DrawText(ps, string, &penOps->valueStyle, pp->x, pp->y);
}
diff --git a/src/bltGrElemOption.C b/src/bltGrElemOption.C
index fa75e4b..ee1c6cc 100644
--- a/src/bltGrElemOption.C
+++ b/src/bltGrElemOption.C
@@ -29,6 +29,8 @@
#include <math.h>
#include <float.h>
+#include <stdlib.h>
+#include <string.h>
extern "C" {
#include "bltChain.h"
diff --git a/src/bltGrMarkerOp.C b/src/bltGrMarkerOp.C
index 61c56f3..b02c421 100644
--- a/src/bltGrMarkerOp.C
+++ b/src/bltGrMarkerOp.C
@@ -27,6 +27,11 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <iostream>
+#include <sstream>
+#include <iomanip>
+using namespace std;
+
extern "C" {
#include "bltInt.h"
#include "bltBind.h"
@@ -97,19 +102,19 @@ static int CreateMarker(Graph* graphPtr, Tcl_Interp* interp,
int objc, Tcl_Obj* const objv[])
{
int offset = 5;
- char* name =NULL;
- char ident[128];
+ const char* name =NULL;
+ ostringstream str;
if (objc == 4) {
offset = 4;
- sprintf_s(ident, 128, "marker%d", graphPtr->nextMarkerId_++);
- name = ident;
+ str << "marker" << graphPtr->nextMarkerId_++ << ends;
+ name = str.str().c_str();
}
else {
name = Tcl_GetString(objv[4]);
if (name[0] == '-') {
offset = 4;
- sprintf_s(ident, 128, "marker%d", graphPtr->nextMarkerId_++);
- name = ident;
+ str << "marker" << graphPtr->nextMarkerId_++ << ends;
+ name = str.str().c_str();
}
}
diff --git a/src/bltGrPSOutput.C b/src/bltGrPSOutput.C
index 8f3d54e..28e8708 100644
--- a/src/bltGrPSOutput.C
+++ b/src/bltGrPSOutput.C
@@ -30,6 +30,11 @@
#include <math.h>
+#include <iostream>
+#include <sstream>
+#include <iomanip>
+using namespace std;
+
extern "C" {
#include <tkPort.h>
#include <tk3d.h>
@@ -671,7 +676,7 @@ static void TextLayoutToPostScript(Blt_Ps ps, int x, int y, TextLayout *textPtr)
count += 2;
} else if ((c < ' ') || (c > '~')) {
/* Convert non-printable characters into octal. */
- sprintf_s(dst, 5, "\\%03o", c);
+ snprintf(dst, 5, "\\%03o", c);
dst += 4;
count += 4;
} else {
diff --git a/src/bltGrPen.C b/src/bltGrPen.C
index 44f8813..0bc540f 100644
--- a/src/bltGrPen.C
+++ b/src/bltGrPen.C
@@ -27,6 +27,8 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <stdlib.h>
+
#include "bltGrPen.h"
#include "bltGraph.h"
diff --git a/src/bltGrPen.h b/src/bltGrPen.h
index 21cb2a2..ef7e049 100644
--- a/src/bltGrPen.h
+++ b/src/bltGrPen.h
@@ -30,11 +30,6 @@
#ifndef __BltGrPen_h__
#define __BltGrPen_h__
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-using namespace std;
-
#include <tk.h>
#include "bltText.h"
diff --git a/src/bltGrPenBar.C b/src/bltGrPenBar.C
index 526f91b..b1abe8d 100644
--- a/src/bltGrPenBar.C
+++ b/src/bltGrPenBar.C
@@ -27,6 +27,8 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <stdlib.h>
+
#include "bltGrPenBar.h"
#include "bltGraph.h"
#include "bltGrDef.h"
diff --git a/src/bltGrPenLine.C b/src/bltGrPenLine.C
index 6d61af2..ae571fb 100644
--- a/src/bltGrPenLine.C
+++ b/src/bltGrPenLine.C
@@ -27,6 +27,9 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <stdlib.h>
+#include <string.h>
+
#include "bltGrPenLine.h"
#include "bltGraph.h"
#include "bltGrMisc.h"
diff --git a/src/bltGraphOp.C b/src/bltGraphOp.C
index c4bcf27..3e4def5 100644
--- a/src/bltGraphOp.C
+++ b/src/bltGraphOp.C
@@ -27,6 +27,8 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <string.h>
+
extern "C" {
#include "bltList.h"
};
diff --git a/src/bltGraphSup.C b/src/bltGraphSup.C
index ea7fd77..644e09f 100644
--- a/src/bltGraphSup.C
+++ b/src/bltGraphSup.C
@@ -27,6 +27,8 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <stdlib.h>
+
#include "bltGraph.h"
#include "bltGrAxis.h"
#include "bltGrElem.h"
diff --git a/src/bltParse.C b/src/bltParse.C
index 59e067b..f0860dc 100644
--- a/src/bltParse.C
+++ b/src/bltParse.C
@@ -26,6 +26,11 @@
#include <stdlib.h>
#include <string.h>
+#include <iostream>
+#include <sstream>
+#include <iomanip>
+using namespace std;
+
#include <tcl.h>
extern "C" {
@@ -502,11 +507,10 @@ int Blt_ParseQuotes(
src += nRead;
continue;
} else if (c == '\0') {
- char buf[10];
-
Tcl_ResetResult(interp);
- sprintf_s(buf, 10, "missing %c", termChar);
- Tcl_SetStringObj(Tcl_GetObjResult(interp), buf, 9);
+ ostringstream str;
+ str << "missing " << termChar << ends;
+ Tcl_SetStringObj(Tcl_GetObjResult(interp), str.str().c_str(), 9);
*termPtr = string - 1;
return TCL_ERROR;
} else {
diff --git a/src/bltSwitch.C b/src/bltSwitch.C
index 22619a1..0db5213 100644
--- a/src/bltSwitch.C
+++ b/src/bltSwitch.C
@@ -366,7 +366,7 @@ int Blt_ParseSwitches(Tcl_Interp* interp, Blt_SwitchSpec *specs,
if (DoSwitch(interp, sp, objv[count], record) != TCL_OK) {
char msg[200];
- sprintf_s(msg, 200, "\n (processing \"%.40s\" switch)",
+ snprintf(msg, 200, "\n (processing \"%.40s\" switch)",
sp->switchName);
Tcl_AddErrorInfo(interp, msg);
return -1;
diff --git a/src/bltVector.C b/src/bltVector.C
index 1f7d1d4..bae2fcd 100644
--- a/src/bltVector.C
+++ b/src/bltVector.C
@@ -1261,7 +1261,7 @@ Blt_Vec_Create(
do { /* Generate a unique vector name. */
char string[200];
- sprintf_s(string, 200, "vector%d", dataPtr->nextId++);
+ snprintf(string, 200, "vector%d", dataPtr->nextId++);
objName.name = string;
qualName = Blt_MakeQualifiedName(&objName, &dString);
hPtr = Tcl_FindHashEntry(&dataPtr->vectorTable, qualName);
generated by cgit v0.12 at 2024-07-19 20:42:35 (GMT)