[Cmap-cvs] cmap IngitFile.cpp,1.16,1.17

[Denis P. <dy...@us...>]

Update of /cvsroot/cmap/cmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17493

Modified Files:
	IngitFile.cpp 
Log Message:
Spell var name

Index: IngitFile.cpp
===================================================================
RCS file: /cvsroot/cmap/cmap/IngitFile.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- IngitFile.cpp	11 May 2004 21:43:25 -0000	1.16
+++ IngitFile.cpp	12 May 2004 03:39:43 -0000	1.17
@@ -355,21 +355,20 @@
   int ATR_cod;
   long PointerATR;
 
-  for (unsigned long NunObj = 1; NunObj <= Max_Num_OBJ; NunObj++) {
+  for (unsigned long NumObj = 1; NumObj <= Max_Num_OBJ; NumObj++) {
     NextByte2 = 0;
-    memcpy(obj[NunObj].type, buf + OffsetOBJ, 7);
+    memcpy(obj[NumObj].type, buf + OffsetOBJ, 7);
     //=========================================
     // Íîìåð èç òàáëèöû àòðèáóòîâ
-    PointerATR = Index_Atr[obj[NunObj].num];
-    if (PointerATR != 0 ) {
+    PointerATR = Index_Atr[obj[NumObj].num];
+    if (PointerATR != 0) {
       memcpy(&num_atr, buf + PointerATR, 2);
-      obj[NunObj].ATR_num = num_atr;
-      PointerATR++;
-      PointerATR++;
+      obj[NumObj].ATR_num = num_atr;
+      PointerATR += 2;
       //printf ("%5i ", num_atr);
       // A+8-áàéò Êîäèôèêàòîðà â òàáëèöó
-      memcpy(obj[NunObj].Cod, buf + PointerATR, iTab.len_code + 1);
-      obj[NunObj].Cod[iTab.len_code + 1] = 0;
+      memcpy(obj[NumObj].Cod, buf + PointerATR, iTab.len_code + 1);
+      obj[NumObj].Cod[iTab.len_code + 1] = 0;
       //printf ("%s ", obj[NunObj].Cod);
       PointerATR += iTab.len_code + 1;
 
@@ -381,7 +380,7 @@
         PointerATR += 2;
         ATR_cod = attrToCode(buf_atr);
 
-        obj[NunObj].atr_cod[ATR_cod] = (char *)(buf + PointerATR);
+        obj[NumObj].atr_cod[ATR_cod] = (char *)(buf + PointerATR);
         while (buf[PointerATR] != 0)
           PointerATR++;
 
@@ -395,16 +394,16 @@
       }
     }
     // Çàïèñü ïðåäñòàâëÿåò ÒÅÊÑÒ
-    if (obj[NunObj].next_byte < 0) {
-      obj[NunObj].next_byte = obj[NunObj].next_byte & 0x7F;
+    if (obj[NumObj].next_byte < 0) {
+      obj[NumObj].next_byte = obj[NumObj].next_byte & 0x7F;
       // NextByte2 - âòîðîé ñ÷åò÷èê (TEXT)
-      NextByte2 = buf[OffsetOBJ + 7 + obj[NunObj].next_byte] + 2;
+      NextByte2 = buf[OffsetOBJ + 7 + obj[NumObj].next_byte] + 2;
       //----------------
       if (comm_off == 3) {
-        printf ("; %X: %i (i) length TEXT+10\n", OffsetOBJ + obj[NunObj].next_byte + 7, NextByte2);
-        printf ("; %X: ", OffsetOBJ + obj[NunObj].next_byte + 8);
+        printf ("; %X: %i (i) length TEXT+10\n", OffsetOBJ + obj[NumObj].next_byte + 7, NextByte2);
+        printf ("; %X: ", OffsetOBJ + obj[NumObj].next_byte + 8);
         for (int j1 = 0; j1 < 8; j1++)
-          printf("%.2X ", buf[OffsetOBJ + obj[NunObj].next_byte + 8 + j1]);
+          printf("%.2X ", buf[OffsetOBJ + obj[NumObj].next_byte + 8 + j1]);
         printf ("\n");
         if (buf[OffsetOBJ] == 6) {
           printf("; %X: ", OffsetOBJ + 22);
@@ -419,11 +418,11 @@
     //Êîíåö ïå÷àòè TXT
     //  ïåðåõîäèì ê ñëåäóþùåìó îáúåêòó
     // Äëÿ "õèòðûõ ôàéëîâ" FLAG = -1
-    obj[NunObj].data = OffsetOBJ + 7; // Çàïèñûâàåì Ñìåùåíèå äàííûõ îáúåêòà
-    OffsetOBJ = OffsetOBJ + 7 + obj[NunObj].next_byte + NextByte2 + FLAG;
+    obj[NumObj].data = OffsetOBJ + 7; // Çàïèñûâàåì Ñìåùåíèå äàííûõ îáúåêòà
+    OffsetOBJ = OffsetOBJ + 7 + obj[NumObj].next_byte + NextByte2 + FLAG;
     // Âûâîä ïðîöåíòîâ.
     if (comm_per == 1)
-      printf ("%2.f%%\r", NunObj / (Max_Num_OBJ / 100.0));
+      printf ("%2.f%%\r", NumObj / (Max_Num_OBJ / 100.0));
   }
   // Êîíåö öèêëà ïåðåáîðà îáúåêòîâ
 }