Changeset 4675 for branches/1.3

Timestamp:

Nov 9, 2014, 6:58:32 PM (10 years ago)

Author:

ldelgass

Message:

merge r4658 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/src/RpPdbToVtk.c (modified) (2 diffs)

branches/1.3/gui/src/RpPdbToVtk.c

@@ -191 +191 @@
     for (i = 0, hPtr = Tcl_FirstHashEntry(atomTablePtr, &iter); hPtr != NULL;
          hPtr = Tcl_NextHashEntry(&iter), i++) {
-        PdbAtom *atomPtr;
-
-        atomPtr = Tcl_GetHashValue(hPtr);
+        PdbAtom *atomPtr = Tcl_GetHashValue(hPtr);
         array[i] = atomPtr;
     }
@@ -691 +689 @@
         Tcl_AppendToObj(objPtr, mesg, -1);
     }
+#if 0
     for (hPtr = Tcl_FirstHashEntry(&atomTable, &iter); hPtr != NULL;
          hPtr = Tcl_NextHashEntry(&iter)) {
-        PdbAtom *atomPtr;
-
-        atomPtr = Tcl_GetHashValue(hPtr);
-#if 0
+        PdbAtom *atomPtr = Tcl_GetHashValue(hPtr);
         fprintf(stderr, "%d %s %d connections\n", atomPtr->ordinal,
                 elements[atomPtr->number].symbol, atomPtr->numConnections);
+    }
 #endif
-    }
     sprintf(mesg, "POINT_DATA %d\n", atomTable.numEntries);
     Tcl_AppendToObj(objPtr, mesg, -1);