From: hadaq <hadaq>
Date: Thu, 9 Jul 2009 18:11:21 +0000 (+0000)
Subject: bug fix
X-Git-Tag: v6.0~414
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=ebff23531df810115bc03196eb37b943e0e8f6c6;p=trbnettools.git

bug fix
.
---

diff --git a/libtrbnet/trbcmd.c b/libtrbnet/trbcmd.c
index a385527..e7706df 100644
--- a/libtrbnet/trbcmd.c
+++ b/libtrbnet/trbcmd.c
@@ -72,14 +72,14 @@ int main(int argc, char ** argv)
   uint16_t reg_address = 0; 
   int loop = 1;
   int loopCtr = 0;
-  int i;
+  int opt;
   
   trb_debug = 0;
   trb_lazy = 0;
 
   /* Parse Arguments */
-  while ((i = getopt(argc, argv, "+hf:n:d:DlH")) != -1) {
-    switch (i) {
+  while ((opt = getopt(argc, argv, "+hf:n:d:DlH")) != -1) {
+    switch (opt) {
     case '?':
       usage(basename(argv[0]));
       exit(EXIT_FAILURE);
@@ -235,6 +235,7 @@ int main(int argc, char ** argv)
 
         int status = 0;
         uint32_t data[256];
+        int i;
     
         if (cmdLen != 3) {
           if (scriptFile != NULL) {
@@ -424,8 +425,9 @@ int main(int argc, char ** argv)
         /*******************************************/
     
         uint32_t uidBuffer[512];
-        unsigned int size;
-    
+        int status;
+        int i;
+        
         if (cmdLen != 2) {
           if (scriptFile != NULL) {
             fprintf(stderr, "Line #%d: Invalid command\n", lineCtr);
@@ -444,8 +446,8 @@ int main(int argc, char ** argv)
                   trb_address);
         }
     
-        size = trb_read_uid(trb_address, uidBuffer, 128);
-        if (size == -1) {
+        status = trb_read_uid(trb_address, uidBuffer, 128);
+        if (status == -1) {
           if (scriptFile != NULL) {
             fprintf(stderr, "Line #%d: ", lineCtr);
           }
@@ -454,8 +456,8 @@ int main(int argc, char ** argv)
             exit(EXIT_FAILURE);
           }
         }
- 
-        for (i = 0; (i < size) && (i < 128); i += 4) {
+        
+        for (i = 0; (i < status) && (i < 128); i += 4) {
           fprintf(stdout, "0x%04x  0x%08x%08x  0x%02x\n",
                   uidBuffer[i + 3],
                   uidBuffer[i], 
@@ -608,8 +610,9 @@ int main(int argc, char ** argv)
         uint8_t random = 0;
         uint8_t info = 0;
         uint16_t number = 0;
-        int size = 0;
-
+        int status = 0;
+        int i;
+        
         if (cmdLen != 5) {
           if (scriptFile != NULL) {
             fprintf(stderr, "Line #%d: Invalid command\n", lineCtr);
@@ -634,8 +637,8 @@ int main(int argc, char ** argv)
                   "number: 0x%04x\n",
                   type, random, info, number);
         }
-        size = trb_ipu_data_read(type, info, random, number, buffer, 4096);
-        if (size == -1) {
+        status = trb_ipu_data_read(type, info, random, number, buffer, 4096);
+        if (status == -1) {
           if (scriptFile != NULL) {
             fprintf(stderr, "Line #%d: ", lineCtr);
           }
@@ -645,7 +648,7 @@ int main(int argc, char ** argv)
           }
         }
     
-        for (i = 0; i < size; i++) {
+        for (i = 0; i < status; i++) {
           fprintf(stdout, "0x%08x\n", buffer[i]);
         }
       } else if (strncmp(cmd[0], "f", CMD_SIZE) == 0) {