*** empty log message ***

5 files changed, 21 insertions, 24 deletions

diff --git a/src/bltGrAxisOp.C b/src/bltGrAxisOp.C
index 00450f4..2ed7aef 100644
--- a/src/bltGrAxisOp.C
+++ b/src/bltGrAxisOp.C
@@ -143,13 +143,13 @@ static int BindOp(ClientData clientData, Tcl_Interp* interp,
   Graph* graphPtr = (Graph*)clientData;
   if (objc == 3) {
     Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
-    Tcl_HashSearch cursor;
-    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->axes_.tagTable, &cursor); hPtr != NULL; hPtr = Tcl_NextHashEntry(&cursor)) {
-      const char *tagName = (const char*)
-	Tcl_GetHashKey(&graphPtr->axes_.tagTable, hPtr);
-      Tcl_Obj *objPtr = Tcl_NewStringObj(tagName, -1);
+    Tcl_HashSearch iter;
+    for (Tcl_HashEntry* hPtr=Tcl_FirstHashEntry(&graphPtr->axes_.tagTable, &iter); hPtr; hPtr = Tcl_NextHashEntry(&iter)) {
+      char* tagName = (char*)Tcl_GetHashKey(&graphPtr->axes_.tagTable, hPtr);
+      Tcl_Obj* objPtr = Tcl_NewStringObj(tagName, -1);
       Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
     }
+
     Tcl_SetObjResult(interp, listObjPtr);
     return TCL_OK;
   }
diff --git a/src/bltGrBind.C b/src/bltGrBind.C
index f6b6e77..4a41838 100644
--- a/src/bltGrBind.C
+++ b/src/bltGrBind.C
@@ -56,8 +56,8 @@ typedef struct _Blt_BindTable BindTable;
 
   static int buttonMasks[] = {0, Button1Mask, Button2Mask, Button3Mask, Button4Mask, Button5Mask};
 
-static void DoEvent(BindTable* bindPtr, XEvent* eventPtr, ClientData item,
-		    ClientData context)
+static void DoEvent(BindTable* bindPtr, XEvent* eventPtr, 
+		    ClientData item, ClientData context)
 {
   if (!bindPtr->tkwin || !bindPtr->bindingTable)
     return;
diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index d56adad..b9b6160 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -196,11 +196,12 @@ static int BindOp(ClientData clientData, Tcl_Interp* interp,
     Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
 
     Tcl_HashSearch iter;
-    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->elements_.tagTable, &iter); hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) {
-      char *tagName = (char*)Tcl_GetHashKey(&graphPtr->elements_.tagTable, hPtr);
-      Tcl_ListObjAppendElement(interp, listObjPtr, 
-			       Tcl_NewStringObj(tagName, -1));
+    for (Tcl_HashEntry* hPtr=Tcl_FirstHashEntry(&graphPtr->elements_.tagTable, &iter); hPtr; hPtr = Tcl_NextHashEntry(&iter)) {
+      char* tagName = 
+	(char*)Tcl_GetHashKey(&graphPtr->elements_.tagTable, hPtr);
+      Tcl_ListObjAppendElement(interp, listObjPtr,Tcl_NewStringObj(tagName,-1));
     }
+
     Tcl_SetObjResult(interp, listObjPtr);
     return TCL_OK;
   }
@@ -253,8 +254,7 @@ static int ClosestOp(ClientData clientData, Tcl_Interp* interp,
     // searching the display list from back to front.  That way if
     // the points from two different elements overlay each other
     // exactly, the last one picked will be the topmost.  
-
-    for (Blt_ChainLink link=Blt_Chain_LastLink(graphPtr->elements_.displayList); 
+    for (Blt_ChainLink link=Blt_Chain_LastLink(graphPtr->elements_.displayList);
 	 link; link = Blt_Chain_PrevLink(link)) {
       Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
       ElementOptions* eops = (ElementOptions*)elemPtr->ops();
diff --git a/src/bltGrLegdOp.C b/src/bltGrLegdOp.C
index daea382..ea31ae8 100644
--- a/src/bltGrLegdOp.C
+++ b/src/bltGrLegdOp.C
@@ -185,18 +185,15 @@ static int BindOp(ClientData clientData, Tcl_Interp* interp,
   Graph* graphPtr = (Graph*)clientData;
 
   if (objc == 3) {
-    Tcl_HashEntry *hPtr;
+    Tcl_Obj* listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
     Tcl_HashSearch iter;
-    Tcl_Obj *listObjPtr;
-
-    listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
-    for (hPtr = Tcl_FirstHashEntry(&graphPtr->elements_.tagTable, &iter);
-	 hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) {
-      const char *tagName = 
-	(const char*)Tcl_GetHashKey(&graphPtr->elements_.tagTable, hPtr);
+    for (Tcl_HashEntry* hPtr=Tcl_FirstHashEntry(&graphPtr->elements_.tagTable, &iter); hPtr; hPtr = Tcl_NextHashEntry(&iter)) {
+      char* tagName = 
+	(char*)Tcl_GetHashKey(&graphPtr->elements_.tagTable, hPtr);
       Tcl_Obj *objPtr = Tcl_NewStringObj(tagName, -1);
       Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
     }
+
     Tcl_SetObjResult(interp, listObjPtr);
     return TCL_OK;
   }
diff --git a/src/bltGraph.C b/src/bltGraph.C
index b9996c7..0e9fd7a 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -744,7 +744,8 @@ int Graph::getElement(Tcl_Obj *objPtr, Element **elemPtrPtr)
 ClientData Graph::elementTag(const char *tagName)
 {
   int isNew;
-  Tcl_HashEntry* hPtr = Tcl_CreateHashEntry(&elements_.tagTable,tagName,&isNew);
+  Tcl_HashEntry* hPtr = 
+    Tcl_CreateHashEntry(&elements_.tagTable, tagName, &isNew);
   return Tcl_GetHashKey(&elements_.tagTable, hPtr);
 }
 
@@ -831,7 +832,7 @@ void Graph::printMarkers(Blt_Ps ps, int under)
   }
 }
 
-ClientData Graph::markerTag(const char* tagName)
+ClientData Graph::markerTag(const char* tagName)    
 {
   int isNew;
   Tcl_HashEntry* hPtr = Tcl_CreateHashEntry(&markers_.tagTable, tagName,&isNew);
@@ -1362,7 +1363,6 @@ static ClientData PickEntry(ClientData clientData, int x, int y,
     ElementOptions* eops = (ElementOptions*)elemPtr->ops();
     if (eops->hide)
       continue;
-
     elemPtr->closest();
   }