summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoye <joye>2014-03-17 15:06:11 (GMT)
committerjoye <joye>2014-03-17 15:06:11 (GMT)
commitfff063cd21e73eb609794076d3011794fa37ad93 (patch)
treeb0377382ca6d95810265dc37c66ddbf9c3cf896c
parent2502655cf696ac6b78ade1376845f3726e6179d6 (diff)
downloadblt-fff063cd21e73eb609794076d3011794fa37ad93.zip
blt-fff063cd21e73eb609794076d3011794fa37ad93.tar.gz
blt-fff063cd21e73eb609794076d3011794fa37ad93.tar.bz2
*** empty log message ***
-rw-r--r--src/bltGrElemLineSpline.C44
-rw-r--r--src/bltGrText.C2
-rw-r--r--src/bltSwitch.C750
3 files changed, 340 insertions, 456 deletions
diff --git a/src/bltGrElemLineSpline.C b/src/bltGrElemLineSpline.C
index e876032..c0b1bcf 100644
--- a/src/bltGrElemLineSpline.C
+++ b/src/bltGrElemLineSpline.C
@@ -28,6 +28,7 @@
*
*/
+extern "C" {
#include <assert.h>
#include <float.h>
#include <math.h>
@@ -35,6 +36,7 @@
#include "bltInt.h"
#include "bltSpline.h"
#include "bltOp.h"
+};
typedef int (SplineProc)(Point2d origPts[], int nOrigPts, Point2d intpPts[],
int nIntpPts);
@@ -777,15 +779,11 @@ int
Blt_QuadraticSpline(Point2d *origPts, int nOrigPts, Point2d *intpPts,
int nIntpPts)
{
- double epsilon;
- double *work;
- int result;
-
- work = malloc(nOrigPts * sizeof(double));
- epsilon = 0.0; /* TBA: adjust error via command-line option */
+ double* work = (double*)malloc(nOrigPts * sizeof(double));
+ double epsilon = 0.0;
/* allocate space for vectors used in calculation */
QuadSlopes(origPts, work, nOrigPts);
- result = QuadEval(origPts, nOrigPts, intpPts, nIntpPts, work, epsilon);
+ int result = QuadEval(origPts, nOrigPts, intpPts, nIntpPts, work, epsilon);
free(work);
if (result > 1) {
return FALSE;
@@ -810,15 +808,12 @@ int
Blt_NaturalSpline(Point2d *origPts, int nOrigPts, Point2d *intpPts,
int nIntpPts)
{
- Cubic2D *eq;
Point2d *ip, *iend;
- TriDiagonalMatrix *A;
- double *dx; /* vector of deltas in x */
double x, dy, alpha;
int isKnot;
int i, j, n;
- dx = malloc(sizeof(double) * nOrigPts);
+ double* dx = (double*)malloc(sizeof(double) * nOrigPts);
/* Calculate vector of differences */
for (i = 0, j = 1; j < nOrigPts; i++, j++) {
dx[i] = origPts[j].x - origPts[i].x;
@@ -827,8 +822,9 @@ Blt_NaturalSpline(Point2d *origPts, int nOrigPts, Point2d *intpPts,
}
}
n = nOrigPts - 1; /* Number of intervals. */
- A = malloc(sizeof(TriDiagonalMatrix) * nOrigPts);
- if (A == NULL) {
+ TriDiagonalMatrix* A =
+ (TriDiagonalMatrix*)malloc(sizeof(TriDiagonalMatrix) * nOrigPts);
+ if (!A) {
free(dx);
return 0;
}
@@ -846,8 +842,8 @@ Blt_NaturalSpline(Point2d *origPts, int nOrigPts, Point2d *intpPts,
A[j][2] = (alpha - dx[i] * A[i][2]) / A[j][0];
}
- eq = malloc(sizeof(Cubic2D) * nOrigPts);
- if (eq == NULL) {
+ Cubic2D* eq = (Cubic2D*)malloc(sizeof(Cubic2D) * nOrigPts);
+ if (!eq) {
free(A);
free(dx);
return FALSE;
@@ -1010,18 +1006,17 @@ CubicSlopes(
double unitX,
double unitY) /* Unit length in x and y (norm=1) */
{
- CubicSpline *spline;
CubicSpline *s1, *s2;
int n, i;
double norm, dx, dy;
- TriDiagonalMatrix *A; /* The tri-diagonal matrix is saved here. */
- spline = malloc(sizeof(CubicSpline) * nPoints);
- if (spline == NULL) {
+ CubicSpline* spline = (CubicSpline*)malloc(sizeof(CubicSpline) * nPoints);
+ if (!spline)
return NULL;
- }
- A = malloc(sizeof(TriDiagonalMatrix) * nPoints);
- if (A == NULL) {
+
+ TriDiagonalMatrix *A
+ = (TriDiagonalMatrix*)malloc(sizeof(TriDiagonalMatrix) * nPoints);
+ if (!A) {
free(spline);
return NULL;
}
@@ -1261,19 +1256,16 @@ Blt_CatromParametricSpline(Point2d *points, int nPoints, Point2d *intpPts,
int nIntpPts)
{
int i;
- Point2d *origPts;
double t;
int interval;
Point2d a, b, c, d;
- assert(nPoints > 0);
-
/*
* The spline is computed in screen coordinates instead of data points so
* that we can select the abscissas of the interpolated points from each
* pixel horizontally across the plotting area.
*/
- origPts = malloc((nPoints + 4) * sizeof(Point2d));
+ Point2d* origPts = (Point2d*)malloc((nPoints + 4) * sizeof(Point2d));
memcpy(origPts + 1, points, sizeof(Point2d) * nPoints);
origPts[0] = origPts[1];
diff --git a/src/bltGrText.C b/src/bltGrText.C
index f733d8b..e78ac6c 100644
--- a/src/bltGrText.C
+++ b/src/bltGrText.C
@@ -27,6 +27,7 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+extern "C" {
#include <assert.h>
#include <X11/Xlib.h>
@@ -39,6 +40,7 @@
#include "bltInt.h"
#include "bltMath.h"
#include "bltText.h"
+};
#define ROTATE_0 0
#define ROTATE_90 1
diff --git a/src/bltSwitch.C b/src/bltSwitch.C
index b764eb6..801dc6e 100644
--- a/src/bltSwitch.C
+++ b/src/bltSwitch.C
@@ -27,477 +27,367 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+extern "C" {
#include <assert.h>
#include <stdarg.h>
#include "bltInt.h"
#include "bltSwitch.h"
+};
-static void
-DoHelp(Tcl_Interp* interp, Blt_SwitchSpec *specs)
+static void DoHelp(Tcl_Interp* interp, Blt_SwitchSpec *specs)
{
- Tcl_DString ds;
- Blt_SwitchSpec *sp;
-
- Tcl_DStringInit(&ds);
- Tcl_DStringAppend(&ds, "following switches are available:", -1);
- for (sp = specs; sp->type != BLT_SWITCH_END; sp++) {
- Tcl_DStringAppend(&ds, "\n ", 4);
- Tcl_DStringAppend(&ds, sp->switchName, -1);
- Tcl_DStringAppend(&ds, " ", 1);
- Tcl_DStringAppend(&ds, sp->help, -1);
- }
- Tcl_AppendResult(interp, Tcl_DStringValue(&ds), (char *)NULL);
- Tcl_DStringFree(&ds);
+ Tcl_DString ds;
+ Blt_SwitchSpec *sp;
+
+ Tcl_DStringInit(&ds);
+ Tcl_DStringAppend(&ds, "following switches are available:", -1);
+ for (sp = specs; sp->type != BLT_SWITCH_END; sp++) {
+ Tcl_DStringAppend(&ds, "\n ", 4);
+ Tcl_DStringAppend(&ds, sp->switchName, -1);
+ Tcl_DStringAppend(&ds, " ", 1);
+ Tcl_DStringAppend(&ds, sp->help, -1);
+ }
+ Tcl_AppendResult(interp, Tcl_DStringValue(&ds), (char *)NULL);
+ Tcl_DStringFree(&ds);
}
-/*
- *---------------------------------------------------------------------------
- *
- * FindSwitchSpec --
- *
- * Search through a table of configuration specs, looking for one that
- * matches a given argvName.
- *
- * Results:
- * The return value is a pointer to the matching entry, or NULL if
- * nothing matched. In that case an error message is left in the
- * interp's result.
- *
- * Side effects:
- * None.
- *
- *---------------------------------------------------------------------------
- */
-static Blt_SwitchSpec *
-FindSwitchSpec(
- Tcl_Interp* interp, /* Used for reporting errors. */
- Blt_SwitchSpec *specs, /* Pointer to table of configuration
- * specifications for a widget. */
- const char *name, /* Name identifying a particular switch. */
- int length, /* Length of name. */
- int needFlags, /* Flags that must be present in matching
- * entry. */
- int hateFlags) /* Flags that must NOT be present in matching
- * entry. */
+static Blt_SwitchSpec *FindSwitchSpec(Tcl_Interp* interp, Blt_SwitchSpec *specs,
+ const char *name, int length,
+ int needFlags, int hateFlags)
{
- Blt_SwitchSpec *sp;
- char c; /* First character of current argument. */
- Blt_SwitchSpec *matchPtr; /* Matching spec, or NULL. */
-
- c = name[1];
- matchPtr = NULL;
- for (sp = specs; sp->type != BLT_SWITCH_END; sp++) {
- if (sp->switchName == NULL) {
- continue;
- }
- if (((sp->flags & needFlags) != needFlags) || (sp->flags & hateFlags)) {
- continue;
- }
- if ((sp->switchName[1] != c) ||
- (strncmp(sp->switchName, name, length) != 0)) {
- continue;
- }
- if (sp->switchName[length] == '\0') {
- return sp; /* Stop on a perfect match. */
- }
- if (matchPtr != NULL) {
- Tcl_AppendResult(interp, "ambiguous switch \"", name, "\"\n",
- (char *) NULL);
- DoHelp(interp, specs);
- return NULL;
- }
- matchPtr = sp;
+ Blt_SwitchSpec *sp;
+ char c; /* First character of current argument. */
+ Blt_SwitchSpec *matchPtr; /* Matching spec, or NULL. */
+
+ c = name[1];
+ matchPtr = NULL;
+ for (sp = specs; sp->type != BLT_SWITCH_END; sp++) {
+ if (sp->switchName == NULL) {
+ continue;
+ }
+ if (((sp->flags & needFlags) != needFlags) || (sp->flags & hateFlags)) {
+ continue;
+ }
+ if ((sp->switchName[1] != c) ||
+ (strncmp(sp->switchName, name, length) != 0)) {
+ continue;
}
- if (strcmp(name, "-help") == 0) {
- DoHelp(interp, specs);
- return NULL;
+ if (sp->switchName[length] == '\0') {
+ return sp; /* Stop on a perfect match. */
}
- if (matchPtr == NULL) {
- Tcl_AppendResult(interp, "unknown switch \"", name, "\"\n",
- (char *)NULL);
- DoHelp(interp, specs);
- return NULL;
+ if (matchPtr != NULL) {
+ Tcl_AppendResult(interp, "ambiguous switch \"", name, "\"\n",
+ (char *) NULL);
+ DoHelp(interp, specs);
+ return NULL;
}
- return matchPtr;
+ matchPtr = sp;
+ }
+ if (strcmp(name, "-help") == 0) {
+ DoHelp(interp, specs);
+ return NULL;
+ }
+ if (matchPtr == NULL) {
+ Tcl_AppendResult(interp, "unknown switch \"", name, "\"\n",
+ (char *)NULL);
+ DoHelp(interp, specs);
+ return NULL;
+ }
+ return matchPtr;
}
-/*
- *---------------------------------------------------------------------------
- *
- * DoSwitch --
- *
- * This procedure applies a single configuration switch to a widget
- * record.
- *
- * Results:
- * A standard TCL return value.
- *
- * Side effects:
- * WidgRec is modified as indicated by specPtr and value. The old value
- * is recycled, if that is appropriate for the value type.
- *
- *---------------------------------------------------------------------------
- */
-static int
-DoSwitch(
- Tcl_Interp* interp, /* Interpreter for error reporting. */
- Blt_SwitchSpec *sp, /* Specifier to apply. */
- Tcl_Obj *objPtr, /* Value to use to fill in widgRec. */
- void *record) /* Record whose fields are to be modified.
- * Values must be properly initialized. */
+static int DoSwitch(Tcl_Interp* interp, Blt_SwitchSpec *sp,
+ Tcl_Obj *objPtr, void *record)
{
- do {
- char *ptr;
-
- ptr = (char *)record + sp->offset;
- switch (sp->type) {
- case BLT_SWITCH_BOOLEAN:
- {
- int bool;
-
- if (Tcl_GetBooleanFromObj(interp, objPtr, &bool) != TCL_OK) {
- return TCL_ERROR;
- }
- if (sp->mask > 0) {
- if (bool) {
- *((int *)ptr) |= sp->mask;
- } else {
- *((int *)ptr) &= ~sp->mask;
- }
- } else {
- *((int *)ptr) = bool;
- }
- }
- break;
-
- case BLT_SWITCH_DOUBLE:
- if (Tcl_GetDoubleFromObj(interp, objPtr, (double *)ptr) != TCL_OK) {
- return TCL_ERROR;
- }
- break;
-
- case BLT_SWITCH_OBJ:
- Tcl_IncrRefCount(objPtr);
- *(Tcl_Obj **)ptr = objPtr;
- break;
-
- case BLT_SWITCH_FLOAT:
- {
- double value;
-
- if (Tcl_GetDoubleFromObj(interp, objPtr, &value) != TCL_OK) {
- return TCL_ERROR;
- }
- *(float *)ptr = (float)value;
- }
- break;
-
- case BLT_SWITCH_INT:
- if (Tcl_GetIntFromObj(interp, objPtr, (int *)ptr) != TCL_OK) {
- return TCL_ERROR;
- }
- break;
-
- case BLT_SWITCH_INT_NNEG:
- {
- long value;
+ do {
+ char *ptr = (char *)record + sp->offset;
+ switch (sp->type) {
+ case BLT_SWITCH_BOOLEAN:
+ {
+ int boo;
+
+ if (Tcl_GetBooleanFromObj(interp, objPtr, &boo) != TCL_OK) {
+ return TCL_ERROR;
+ }
+ if (sp->mask > 0) {
+ if (boo) {
+ *((int *)ptr) |= sp->mask;
+ } else {
+ *((int *)ptr) &= ~sp->mask;
+ }
+ } else {
+ *((int *)ptr) = boo;
+ }
+ }
+ break;
+
+ case BLT_SWITCH_DOUBLE:
+ if (Tcl_GetDoubleFromObj(interp, objPtr, (double *)ptr) != TCL_OK) {
+ return TCL_ERROR;
+ }
+ break;
+
+ case BLT_SWITCH_OBJ:
+ Tcl_IncrRefCount(objPtr);
+ *(Tcl_Obj **)ptr = objPtr;
+ break;
+
+ case BLT_SWITCH_FLOAT:
+ {
+ double value;
+
+ if (Tcl_GetDoubleFromObj(interp, objPtr, &value) != TCL_OK) {
+ return TCL_ERROR;
+ }
+ *(float *)ptr = (float)value;
+ }
+ break;
+
+ case BLT_SWITCH_INT:
+ if (Tcl_GetIntFromObj(interp, objPtr, (int *)ptr) != TCL_OK) {
+ return TCL_ERROR;
+ }
+ break;
+
+ case BLT_SWITCH_INT_NNEG:
+ {
+ long value;
- if (Blt_GetCountFromObj(interp, objPtr, COUNT_NNEG,
- &value) != TCL_OK) {
- return TCL_ERROR;
- }
- *(int *)ptr = (int)value;
- }
- break;
-
- case BLT_SWITCH_INT_POS:
- {
- long value;
+ if (Blt_GetCountFromObj(interp, objPtr, COUNT_NNEG,
+ &value) != TCL_OK) {
+ return TCL_ERROR;
+ }
+ *(int *)ptr = (int)value;
+ }
+ break;
+
+ case BLT_SWITCH_INT_POS:
+ {
+ long value;
- if (Blt_GetCountFromObj(interp, objPtr, COUNT_POS,
- &value) != TCL_OK) {
- return TCL_ERROR;
- }
- *(int *)ptr = (int)value;
- }
- break;
-
- case BLT_SWITCH_LIST:
- {
- int argc;
-
- if (Tcl_SplitList(interp, Tcl_GetString(objPtr), &argc,
- (const char ***)ptr) != TCL_OK) {
- return TCL_ERROR;
- }
- }
- break;
-
- case BLT_SWITCH_LONG:
- if (Tcl_GetLongFromObj(interp, objPtr, (long *)ptr) != TCL_OK) {
- return TCL_ERROR;
- }
- break;
-
- case BLT_SWITCH_LONG_NNEG:
- {
- long value;
+ if (Blt_GetCountFromObj(interp, objPtr, COUNT_POS,
+ &value) != TCL_OK) {
+ return TCL_ERROR;
+ }
+ *(int *)ptr = (int)value;
+ }
+ break;
+
+ case BLT_SWITCH_LIST:
+ {
+ int argc;
+
+ if (Tcl_SplitList(interp, Tcl_GetString(objPtr), &argc,
+ (const char ***)ptr) != TCL_OK) {
+ return TCL_ERROR;
+ }
+ }
+ break;
+
+ case BLT_SWITCH_LONG:
+ if (Tcl_GetLongFromObj(interp, objPtr, (long *)ptr) != TCL_OK) {
+ return TCL_ERROR;
+ }
+ break;
+
+ case BLT_SWITCH_LONG_NNEG:
+ {
+ long value;
- if (Blt_GetCountFromObj(interp, objPtr, COUNT_NNEG,
- &value) != TCL_OK) {
- return TCL_ERROR;
- }
- *(long *)ptr = value;
- }
- break;
-
- case BLT_SWITCH_LONG_POS:
- {
- long value;
+ if (Blt_GetCountFromObj(interp, objPtr, COUNT_NNEG,
+ &value) != TCL_OK) {
+ return TCL_ERROR;
+ }
+ *(long *)ptr = value;
+ }
+ break;
+
+ case BLT_SWITCH_LONG_POS:
+ {
+ long value;
- if (Blt_GetCountFromObj(interp, objPtr, COUNT_POS, &value)
- != TCL_OK) {
- return TCL_ERROR;
- }
- *(long *)ptr = value;
- }
- break;
-
- case BLT_SWITCH_STRING:
- {
- char *value;
+ if (Blt_GetCountFromObj(interp, objPtr, COUNT_POS, &value)
+ != TCL_OK) {
+ return TCL_ERROR;
+ }
+ *(long *)ptr = value;
+ }
+ break;
+
+ case BLT_SWITCH_STRING:
+ {
+ char *value;
- value = Tcl_GetString(objPtr);
- value = (*value == '\0') ? NULL : Blt_Strdup(value);
- if (*(char **)ptr != NULL) {
- free(*(char **)ptr);
- }
- *(char **)ptr = value;
- }
- break;
-
- case BLT_SWITCH_CUSTOM:
- assert(sp->customPtr != NULL);
- if ((*sp->customPtr->parseProc)(sp->customPtr->clientData, interp,
- sp->switchName, objPtr, (char *)record, sp->offset, sp->flags)
- != TCL_OK) {
- return TCL_ERROR;
- }
- break;
-
- default:
- Tcl_AppendResult(interp, "bad switch table: unknown type \"",
- Blt_Itoa(sp->type), "\"", (char *)NULL);
- return TCL_ERROR;
+ value = Tcl_GetString(objPtr);
+ value = (*value == '\0') ? NULL : Blt_Strdup(value);
+ if (*(char **)ptr != NULL) {
+ free(*(char **)ptr);
}
- sp++;
- } while ((sp->switchName == NULL) && (sp->type != BLT_SWITCH_END));
- return TCL_OK;
+ *(char **)ptr = value;
+ }
+ break;
+
+ case BLT_SWITCH_CUSTOM:
+ assert(sp->customPtr != NULL);
+ if ((*sp->customPtr->parseProc)(sp->customPtr->clientData, interp,
+ sp->switchName, objPtr, (char *)record, sp->offset, sp->flags)
+ != TCL_OK) {
+ return TCL_ERROR;
+ }
+ break;
+
+ default:
+ Tcl_AppendResult(interp, "bad switch table: unknown type \"",
+ Blt_Itoa(sp->type), "\"", (char *)NULL);
+ return TCL_ERROR;
+ }
+ sp++;
+ } while ((sp->switchName == NULL) && (sp->type != BLT_SWITCH_END));
+ return TCL_OK;
}
-/*
- *---------------------------------------------------------------------------
- *
- * Blt_ParseSwitches --
- *
- * Process command-line switches to fill in fields of a record with
- * resources and other parameters.
- *
- * Results:
- * Returns the number of arguments comsumed by parsing the command line.
- * If an error occurred, -1 will be returned and an error messages can be
- * found as the interpreter result.
- *
- * Side effects:
- * The fields of widgRec get filled in with information from argc/argv.
- * Old information in widgRec's fields gets recycled.
- *
- *---------------------------------------------------------------------------
- */
-int
-Blt_ParseSwitches(
- Tcl_Interp* interp, /* Interpreter for error reporting. */
- Blt_SwitchSpec *specs, /* Describes legal switches. */
- int objc, /* Number of elements in argv. */
- Tcl_Obj* const objv[], /* Command-line switches. */
- void *record, /* Record whose fields are to be modified.
- * Values must be properly initialized. */
- int flags) /* Used to specify additional flags that must
- * be present in switch specs for them to be
- * considered. */
+int Blt_ParseSwitches(Tcl_Interp* interp, Blt_SwitchSpec *specs,
+ int objc, Tcl_Obj* const objv[], void *record,
+ int flags)
{
- Blt_SwitchSpec *sp;
- int count;
- int needFlags; /* Specs must contain this set of flags or
- * else they are not considered. */
- int hateFlags; /* If a spec contains any bits here, it's not
- * considered. */
-
- needFlags = flags & ~(BLT_SWITCH_USER_BIT - 1);
- hateFlags = 0;
-
- /*
- * Pass 1: Clear the change flags on all the specs so that we
- * can check it later.
- */
- for (sp = specs; sp->type != BLT_SWITCH_END; sp++) {
- sp->flags &= ~BLT_SWITCH_SPECIFIED;
+ Blt_SwitchSpec *sp;
+ int needFlags = flags & ~(BLT_SWITCH_USER_BIT - 1);
+ int hateFlags = 0;
+
+ /*
+ * Pass 1: Clear the change flags on all the specs so that we
+ * can check it later.
+ */
+ for (sp = specs; sp->type != BLT_SWITCH_END; sp++)
+ sp->flags &= ~BLT_SWITCH_SPECIFIED;
+
+ /*
+ * Pass 2: Process the arguments that match entries in the specs.
+ * It's an error if the argument doesn't match anything.
+ */
+ int count;
+ for (count = 0; count < objc; count++) {
+ char *arg;
+ int length;
+
+ arg = Tcl_GetStringFromObj(objv[count], &length);
+ if (flags & BLT_SWITCH_OBJV_PARTIAL) {
+ /*
+ * If the argument doesn't start with a '-' (not a switch) or is
+ * '--', stop processing and return the number of arguments
+ * comsumed.
+ */
+ if (arg[0] != '-') {
+ return count;
+ }
+ if ((arg[1] == '-') && (arg[2] == '\0')) {
+ return count + 1; /* include the "--" in the count. */
+ }
}
- /*
- * Pass 2: Process the arguments that match entries in the specs.
- * It's an error if the argument doesn't match anything.
- */
- for (count = 0; count < objc; count++) {
- char *arg;
- int length;
-
- arg = Tcl_GetStringFromObj(objv[count], &length);
- if (flags & BLT_SWITCH_OBJV_PARTIAL) {
- /*
- * If the argument doesn't start with a '-' (not a switch) or is
- * '--', stop processing and return the number of arguments
- * comsumed.
- */
- if (arg[0] != '-') {
- return count;
- }
- if ((arg[1] == '-') && (arg[2] == '\0')) {
- return count + 1; /* include the "--" in the count. */
- }
- }
- sp = FindSwitchSpec(interp, specs, arg, length, needFlags, hateFlags);
- if (sp == NULL) {
- return -1;
- }
- if (sp->type == BLT_SWITCH_BITMASK) {
- char *ptr;
+ sp = FindSwitchSpec(interp, specs, arg, length, needFlags, hateFlags);
+ if (sp == NULL) {
+ return -1;
+ }
+ if (sp->type == BLT_SWITCH_BITMASK) {
+ char *ptr;
- ptr = (char *)record + sp->offset;
- *((int *)ptr) |= sp->mask;
- } else if (sp->type == BLT_SWITCH_BITMASK_INVERT) {
- char *ptr;
+ ptr = (char *)record + sp->offset;
+ *((int *)ptr) |= sp->mask;
+ } else if (sp->type == BLT_SWITCH_BITMASK_INVERT) {
+ char *ptr;
- ptr = (char *)record + sp->offset;
- *((int *)ptr) &= ~sp->mask;
- } else if (sp->type == BLT_SWITCH_VALUE) {
- char *ptr;
+ ptr = (char *)record + sp->offset;
+ *((int *)ptr) &= ~sp->mask;
+ } else if (sp->type == BLT_SWITCH_VALUE) {
+ char *ptr;
- ptr = (char *)record + sp->offset;
- *((int *)ptr) = sp->mask;
- } else {
- count++;
- if (count == objc) {
- Tcl_AppendResult(interp, "value for \"", arg, "\" missing",
- (char *) NULL);
- return -1;
- }
- if (DoSwitch(interp, sp, objv[count], record) != TCL_OK) {
- char msg[200];
-
- sprintf_s(msg, 200, "\n (processing \"%.40s\" switch)",
- sp->switchName);
- Tcl_AddErrorInfo(interp, msg);
- return -1;
- }
- }
- sp->flags |= BLT_SWITCH_SPECIFIED;
+ ptr = (char *)record + sp->offset;
+ *((int *)ptr) = sp->mask;
+ } else {
+ count++;
+ if (count == objc) {
+ Tcl_AppendResult(interp, "value for \"", arg, "\" missing",
+ (char *) NULL);
+ return -1;
+ }
+ if (DoSwitch(interp, sp, objv[count], record) != TCL_OK) {
+ char msg[200];
+
+ sprintf_s(msg, 200, "\n (processing \"%.40s\" switch)",
+ sp->switchName);
+ Tcl_AddErrorInfo(interp, msg);
+ return -1;
+ }
}
- return count;
+ sp->flags |= BLT_SWITCH_SPECIFIED;
+ }
+
+ return count;
}
-/*
- *---------------------------------------------------------------------------
- *
- * Blt_FreeSwitches --
- *
- * Free up all resources associated with switches.
- *
- * Results:
- * None.
- *
- *---------------------------------------------------------------------------
- */
-/* ARGSUSED */
-void
-Blt_FreeSwitches(
- Blt_SwitchSpec *specs, /* Describes legal switches. */
- void *record, /* Record whose fields contain current values
- * for switches. */
- int needFlags) /* Used to specify additional flags that must
- * be present in config specs for them to be
- * considered. */
+void Blt_FreeSwitches(Blt_SwitchSpec *specs, void *record, int needFlags)
{
- Blt_SwitchSpec *sp;
-
- for (sp = specs; sp->type != BLT_SWITCH_END; sp++) {
- if ((sp->flags & needFlags) == needFlags) {
- char *ptr;
-
- ptr = (char *)record + sp->offset;
- switch (sp->type) {
- case BLT_SWITCH_STRING:
- case BLT_SWITCH_LIST:
- if (*((char **) ptr) != NULL) {
- free(*((char **) ptr));
- *((char **) ptr) = NULL;
- }
- break;
-
- case BLT_SWITCH_OBJ:
- if (*((Tcl_Obj **) ptr) != NULL) {
- Tcl_DecrRefCount(*((Tcl_Obj **)ptr));
- *((Tcl_Obj **) ptr) = NULL;
- }
- break;
-
- case BLT_SWITCH_CUSTOM:
- assert(sp->customPtr != NULL);
- if ((*(char **)ptr != NULL) &&
- (sp->customPtr->freeProc != NULL)) {
- (*sp->customPtr->freeProc)((char *)record, sp->offset,
- sp->flags);
- }
- break;
-
- default:
- break;
- }
+ for (Blt_SwitchSpec *sp = specs; sp->type != BLT_SWITCH_END; sp++) {
+ if ((sp->flags & needFlags) == needFlags) {
+ char *ptr = (char *)record + sp->offset;
+ switch (sp->type) {
+ case BLT_SWITCH_STRING:
+ case BLT_SWITCH_LIST:
+ if (*((char **) ptr) != NULL) {
+ free(*((char **) ptr));
+ *((char **) ptr) = NULL;
}
+ break;
+
+ case BLT_SWITCH_OBJ:
+ if (*((Tcl_Obj **) ptr) != NULL) {
+ Tcl_DecrRefCount(*((Tcl_Obj **)ptr));
+ *((Tcl_Obj **) ptr) = NULL;
+ }
+ break;
+
+ case BLT_SWITCH_CUSTOM:
+ assert(sp->customPtr != NULL);
+ if ((*(char **)ptr != NULL) &&
+ (sp->customPtr->freeProc != NULL)) {
+ (*sp->customPtr->freeProc)((char *)record, sp->offset,
+ sp->flags);
+ }
+ break;
+
+ default:
+ break;
+ }
}
+ }
}
-int
-Blt_ExprDoubleFromObj(Tcl_Interp* interp, Tcl_Obj *objPtr, double *valuePtr)
+int Blt_ExprDoubleFromObj(Tcl_Interp* interp, Tcl_Obj *objPtr, double *valuePtr)
{
- /* First try to extract the value as a double precision number. */
- if (Tcl_GetDoubleFromObj((Tcl_Interp *)NULL, objPtr, valuePtr) == TCL_OK) {
- return TCL_OK;
- }
- /* Then try to parse it as an expression. */
- if (Tcl_ExprDouble(interp, Tcl_GetString(objPtr), valuePtr) == TCL_OK) {
- return TCL_OK;
- }
- return TCL_ERROR;
+ // First try to extract the value as a double precision number.
+ if (Tcl_GetDoubleFromObj((Tcl_Interp *)NULL, objPtr, valuePtr) == TCL_OK)
+ return TCL_OK;
+
+ // Then try to parse it as an expression.
+ if (Tcl_ExprDouble(interp, Tcl_GetString(objPtr), valuePtr) == TCL_OK)
+ return TCL_OK;
+
+ return TCL_ERROR;
}
-int
-Blt_ExprIntFromObj(
- Tcl_Interp* interp,
- Tcl_Obj *objPtr,
- int *valuePtr)
+int Blt_ExprIntFromObj(Tcl_Interp* interp, Tcl_Obj *objPtr, int *valuePtr)
{
- long lvalue;
+ // First try to extract the value as a simple integer.
+ if (Tcl_GetIntFromObj((Tcl_Interp *)NULL, objPtr, valuePtr) == TCL_OK)
+ return TCL_OK;
- /* First try to extract the value as a simple integer. */
- if (Tcl_GetIntFromObj((Tcl_Interp *)NULL, objPtr, valuePtr) == TCL_OK) {
- return TCL_OK;
- }
- /* Otherwise try to parse it as an expression. */
- if (Tcl_ExprLong(interp, Tcl_GetString(objPtr), &lvalue) == TCL_OK) {
- *valuePtr = lvalue;
- return TCL_OK;
- }
- return TCL_ERROR;
+ // Otherwise try to parse it as an expression.
+ long lvalue;
+ if (Tcl_ExprLong(interp, Tcl_GetString(objPtr), &lvalue) == TCL_OK) {
+ *valuePtr = lvalue;
+ return TCL_OK;
+ }
+ return TCL_ERROR;
}