1 files changed, 53 insertions, 16 deletions

diff --git a/generic/tkbltGrMarkerOp.C b/generic/tkbltGrMarkerOp.C
index 20933ab..5103a3d 100644
--- a/generic/tkbltGrMarkerOp.C
+++ b/generic/tkbltGrMarkerOp.C
@@ -121,6 +121,7 @@ static int CreateMarker(Graph* graphPtr, Tcl_Interp* interp,
     Tcl_AppendResult(graphPtr->interp_, "marker \"", name,
 		     "\" already exists in \"", Tcl_GetString(objv[0]),
 		     "\"", NULL);
+    delete [] name;
     return TCL_ERROR;
   }
 
@@ -133,6 +134,8 @@ static int CreateMarker(Graph* graphPtr, Tcl_Interp* interp,
   else if (!strcmp(type, "text"))
     markerPtr = new TextMarker(graphPtr, name, hPtr);
   else {
+    Tcl_DeleteHashEntry(hPtr);
+    delete [] name;
     Tcl_AppendResult(interp, "unknown marker type ", type, NULL);
     return TCL_ERROR;
   }
@@ -141,6 +144,7 @@ static int CreateMarker(Graph* graphPtr, Tcl_Interp* interp,
 
   if ((Tk_InitOptions(graphPtr->interp_, (char*)markerPtr->ops(), markerPtr->optionTable(), graphPtr->tkwin_) != TCL_OK) || (MarkerObjConfigure(graphPtr, markerPtr, interp, objc-offset, objv+offset) != TCL_OK)) {
     delete markerPtr;
+    delete [] name;
     return TCL_ERROR;
   }
 
@@ -157,8 +161,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, "markerId option");
     return TCL_ERROR;
+  }
 
   Marker* markerPtr;
   if (GetMarkerFromObj(interp, graphPtr, objv[3], &markerPtr) != TCL_OK)
@@ -179,8 +185,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, "markerId ?option value...?");
     return TCL_ERROR;
+  }
 
   Marker* markerPtr;
   if (GetMarkerFromObj(interp, graphPtr, objv[3], &markerPtr) != TCL_OK)
@@ -219,15 +227,22 @@ static int BindOp(ClientData clientData, Tcl_Interp* interp,
     }
     Tcl_SetObjResult(interp, listObjPtr);
     return TCL_OK;
+  } else if (objc >= 4) {
+    return graphPtr->bindTable_->configure(graphPtr->markerTag(Tcl_GetString(objv[3])), objc - 4, objv + 4);
+  } else {
+    Tcl_WrongNumArgs(interp, 3, objv, "markerId ?tag? ?sequence? ?command?");
+    return TCL_ERROR;
   }
-
-  return graphPtr->bindTable_->configure(graphPtr->markerTag(Tcl_GetString(objv[3])), objc - 4, objv + 4);
 }
 
 static int CreateOp(ClientData clientData, Tcl_Interp* interp,
 		    int objc, Tcl_Obj* const objv[])
 {
   Graph* graphPtr = (Graph*)clientData;
+  if (objc<4) {
+    Tcl_WrongNumArgs(interp, 2, objv, "markerId ?type? ?option value...?");
+    return TCL_ERROR;
+  }
   if (CreateMarker(graphPtr, interp, objc, objv) != TCL_OK)
     return TCL_ERROR;
   // set in CreateMarker
@@ -243,29 +258,45 @@ static int DeleteOp(ClientData clientData, Tcl_Interp* interp,
 		    int objc, Tcl_Obj* const objv[])
 {
   Graph* graphPtr = (Graph*)clientData;
+
+  if (objc<4) {
+    Tcl_WrongNumArgs(interp, 2, objv, "markerId...");
+    return TCL_ERROR;
+  }
+
+  int res = TCL_OK;
+
   for (int ii=3; ii<objc; ii++) {
     Marker* markerPtr;
-    if (GetMarkerFromObj(NULL, graphPtr, objv[ii], &markerPtr) != TCL_OK) {
-      Tcl_AppendResult(interp, "can't find marker \"", 
-		       Tcl_GetString(objv[ii]), "\" in \"", 
-		       Tk_PathName(graphPtr->tkwin_), "\"", NULL);
-      return TCL_ERROR;
+    const char* string = Tcl_GetString(objv[ii]);
+    Tcl_HashEntry* hPtr = Tcl_FindHashEntry(&graphPtr->markers_.table, string);
+    if (!hPtr) {
+      if (res == TCL_OK) {
+	Tcl_AppendResult(interp, "can't find markers in \"",
+			 Tk_PathName(graphPtr->tkwin_), "\":", NULL);
+      }
+      Tcl_AppendResult(interp, " ", Tcl_GetString(objv[ii]));
+      res = TCL_ERROR;
+    } else {
+      markerPtr = (Marker*)Tcl_GetHashValue(hPtr);
+      delete markerPtr;
     }
-    delete markerPtr;
   }
 
   graphPtr->flags |= CACHE;
   graphPtr->eventuallyRedraw();
 
-  return TCL_OK;
+  return res;
 }
 
 static int ExistsOp(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, "markerId");
     return TCL_ERROR;
+  }
 
   Tcl_HashEntry* hPtr =
     Tcl_FindHashEntry(&graphPtr->markers_.table, Tcl_GetString(objv[3]));
@@ -278,8 +309,10 @@ static int FindOp(ClientData clientData, Tcl_Interp* interp,
 		  int objc, Tcl_Obj* const objv[])
 {
   Graph* graphPtr = (Graph*)clientData;
-  if (objc<4)
+  if (objc!=8) {
+    Tcl_WrongNumArgs(interp, 3, objv, "searchtype left top right bottom");
     return TCL_ERROR;
+  }
 
   const char* string = Tcl_GetString(objv[3]);
   int mode;
@@ -378,8 +411,10 @@ static int RelinkOp(ClientData clientData, Tcl_Interp* interp,
 		    int objc, Tcl_Obj* const objv[])
 {
   Graph* graphPtr = (Graph*)clientData;
-  if (objc<4)
+  if (objc!=4 && objc!=5) {
+    Tcl_WrongNumArgs(interp, 3, objv, "markerId ?placeId?");
     return TCL_ERROR;
+  }
 
   Marker* markerPtr;
   if (GetMarkerFromObj(interp, graphPtr, objv[3], &markerPtr) != TCL_OK)
@@ -411,8 +446,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, "markerId");
     return TCL_ERROR;
+  }
 
   Marker* markerPtr;
   if (GetMarkerFromObj(interp, graphPtr, objv[3], &markerPtr) != TCL_OK)
@@ -450,7 +487,7 @@ static int GetMarkerFromObj(Tcl_Interp* interp, Graph* graphPtr,
   }
   if (interp) {
     Tcl_AppendResult(interp, "can't find marker \"", string, 
-		     "\" in \"", Tk_PathName(graphPtr->tkwin_), NULL);
+		     "\" in \"", Tk_PathName(graphPtr->tkwin_), "\"", NULL);
   }
 
   return TCL_ERROR;