Changeset 4970


Ignore:
Timestamp:
07/23/12 03:53:36 (6 years ago)
Author:
quintiliani
Message:

Moved server check error in the main loop for server list

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/diagnostic_tools/getmenu/getmenu.c

    r4715 r4970  
    7373char     wsAddrCmdLine[MAX_WAVESERVERS][MAX_ADRCMDLEN]; 
    7474char     wsIp[MAX_WAVESERVERS][MAX_ADRLEN]; 
     75int      ws_rc[MAX_WAVESERVERS]; 
    7576char     wsPort[MAX_WAVESERVERS][MAX_ADRLEN];  /* Available wave servers */ 
    7677int      CalendarDate = 1;                     /* 1: yymmdd etc */ 
     
    125126      memset( wsIp[i], 0, MAX_ADRLEN ); 
    126127      memset( wsPort[i], 0, MAX_ADRLEN ); 
     128      ws_rc[i] = WS_ERR_NONE; 
    127129    } 
    128130 
     
    141143    { 
    142144      rc = wsAppendMenu( wsIp[i], wsPort[i], &queue, wsTimeout ); 
    143       if ( rc != WS_ERR_NONE ) 
    144         { 
    145           LogWsErr( "wsAppendMenu", rc ); 
    146           return -1; 
    147         } 
     145      ws_rc[i] = rc; 
    148146    } 
    149147 
    150148  if (queue.head == NULL ) 
    151149    { 
    152       logit("e", "GETMENU: nothing in server\n"); 
     150      logit("e", "GETMENU: nothing in server"); 
     151      if(numserv > 1) { 
     152        logit("e", "s\n"); 
     153      } 
     154      logit("e", "\n"); 
    153155      exit( 0 ); 
    154156    } 
     
    160162      WS_PSCNL scnlp; 
    161163      printf( "\nTank contents for %s:%s\n", wsAddrCmdLine[i], wsPort[i]); 
     164 
     165      if ( ws_rc[i] != WS_ERR_NONE ) { 
     166        LogWsErr( "wsAppendMenu", ws_rc[i] ); 
     167        continue; 
     168      } 
    162169 
    163170      rc = wsGetServerPSCNL( wsIp[i], wsPort[i], &scnlp, &queue ); 
Note: See TracChangeset for help on using the changeset viewer.