diff options
author | Adrián Medraño Calvo <adrian@medranocalvo.com> | 2018-10-08 12:00:00 (GMT) |
---|---|---|
committer | Adrián Medraño Calvo <adrian@medranocalvo.com> | 2018-10-08 12:00:00 (GMT) |
commit | fa194741f8b801f258aed9fbb6b1448dce97173b (patch) | |
tree | 9a66113a3440c396e5d97ccf8224a0453eca6561 /generic/tkbltGrAxisOp.C | |
parent | 9b8c9769c0b7ad4e232550609f8e99d3d5b24f3c (diff) | |
download | blt-fa194741f8b801f258aed9fbb6b1448dce97173b.zip blt-fa194741f8b801f258aed9fbb6b1448dce97173b.tar.gz blt-fa194741f8b801f258aed9fbb6b1448dce97173b.tar.bz2 |
Correct numargs checks and output error message
Many other commands not fixed in *Op.C files.
Diffstat (limited to 'generic/tkbltGrAxisOp.C')
-rw-r--r-- | generic/tkbltGrAxisOp.C | 48 |
1 files changed, 37 insertions, 11 deletions
diff --git a/generic/tkbltGrAxisOp.C b/generic/tkbltGrAxisOp.C index e467d53..fb3277e 100644 --- a/generic/tkbltGrAxisOp.C +++ b/generic/tkbltGrAxisOp.C @@ -98,8 +98,10 @@ static int CgetOp(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { Graph* graphPtr = (Graph*)clientData; - if (objc<4) + if (objc!=5) { + Tcl_WrongNumArgs(interp, 3, objv, "axisId option"); return TCL_ERROR; + } Axis* axisPtr; if (graphPtr->getAxis(objv[3], &axisPtr) != TCL_OK) @@ -112,8 +114,10 @@ static int ConfigureOp(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { Graph* graphPtr = (Graph*)clientData; - if (objc<4) + if (objc<4) { + Tcl_WrongNumArgs(interp, 3, objv, "axisId ?option value?..."); return TCL_ERROR; + } Axis* axisPtr; if (graphPtr->getAxis(objv[3], &axisPtr) != TCL_OK) @@ -126,8 +130,10 @@ static int ActivateOp(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { Graph* graphPtr = (Graph*)clientData; - if (objc<4) + if (objc!=4) { + Tcl_WrongNumArgs(interp, 3, objv, "axisId"); return TCL_ERROR; + } Axis* axisPtr; if (graphPtr->getAxis(objv[3], &axisPtr) != TCL_OK) @@ -160,8 +166,10 @@ static int CreateOp(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { Graph* graphPtr = (Graph*)clientData; - if (objc<4) + if (objc!=4) { + Tcl_WrongNumArgs(interp, 3, objv, "axisId"); return TCL_ERROR; + } if (graphPtr->createAxis(objc, objv) != TCL_OK) return TCL_ERROR; @@ -174,8 +182,10 @@ static int DeleteOp(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { Graph* graphPtr = (Graph*)clientData; - if (objc<4) + if (objc!=4) { + Tcl_WrongNumArgs(interp, 3, objv, "axisId"); return TCL_ERROR; + } Axis* axisPtr; if (graphPtr->getAxis(objv[3], &axisPtr) != TCL_OK) @@ -194,8 +204,10 @@ static int InvTransformOp(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { Graph* graphPtr = (Graph*)clientData; - if (objc<4) + if (objc!=5) { + Tcl_WrongNumArgs(interp, 3, objv, "axisId scoord"); return TCL_ERROR; + } Axis* axisPtr; if (graphPtr->getAxis(objv[3], &axisPtr) != TCL_OK) @@ -208,8 +220,10 @@ static int LimitsOp(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { Graph* graphPtr = (Graph*)clientData; - if (objc<4) + if (objc!=4) { + Tcl_WrongNumArgs(interp, 3, objv, "axisId"); return TCL_ERROR; + } Axis* axisPtr; if (graphPtr->getAxis(objv[3], &axisPtr) != TCL_OK) @@ -222,8 +236,10 @@ static int MarginOp(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { Graph* graphPtr = (Graph*)clientData; - if (objc<4) + if (objc!=4) { + Tcl_WrongNumArgs(interp, 3, objv, "axisId"); return TCL_ERROR; + } Axis* axisPtr; if (graphPtr->getAxis(objv[3], &axisPtr) != TCL_OK) @@ -237,6 +253,10 @@ static int NamesOp(ClientData clientData, Tcl_Interp* interp, { Graph* graphPtr = (Graph*)clientData; Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL); + if (objc<3) { + Tcl_WrongNumArgs(interp, 3, objv, "?pattern...?"); + return TCL_ERROR; + } if (objc == 3) { Tcl_HashSearch cursor; for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->axes_.table, &cursor); hPtr; hPtr = Tcl_NextHashEntry(&cursor)) { @@ -267,8 +287,10 @@ static int TransformOp(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { Graph* graphPtr = (Graph*)clientData; - if (objc<4) + if (objc!=5) { + Tcl_WrongNumArgs(interp, 3, objv, "axisId coord"); return TCL_ERROR; + } Axis* axisPtr; if (graphPtr->getAxis(objv[3], &axisPtr) != TCL_OK) @@ -281,8 +303,10 @@ static int TypeOp(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { Graph* graphPtr = (Graph*)clientData; - if (objc<4) + if (objc!=4) { + Tcl_WrongNumArgs(interp, 3, objv, "axisId"); return TCL_ERROR; + } Axis* axisPtr; if (graphPtr->getAxis(objv[3], &axisPtr) != TCL_OK) @@ -295,8 +319,10 @@ static int ViewOp(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { Graph* graphPtr = (Graph*)clientData; - if (objc<4) + if (objc!=4) { + Tcl_WrongNumArgs(interp, 3, objv, "axisId"); return TCL_ERROR; + } Axis* axisPtr; if (graphPtr->getAxis(objv[3], &axisPtr) != TCL_OK) |