Show
Ignore:
Timestamp:
03/31/09 18:38:58 (15 years ago)
Author:
bhilburn
Message:

Memory leaks, style fixes, variable scoping.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • vtcross/trunk/src/libvtcross/libvtcross.cpp

    r226 r227  
    1717#include "vtcross/libvtcross.h" 
    1818 
     19 
    1920uint32_t 
    2021ConnectToRemoteComponent() 
     
    2627} 
    2728 
     29 
    2830/* Given a certain set of observables, ask the radio to find the optimum radio 
    2931 * parameters and return them.  
     
    3133 * TODO I'm a little confused about this function... why would anyone need to 
    3234 * use this?  Shouldn't this be internal to the radio operation?  
     35 * 
     36 * TODO this function is returning a pointer to allocated memory, which is fine, 
     37 * but we need to document this and make sure the caller is deallocating the 
     38 * memory when it is done using it. 
    3339 */ 
    34 Parameter* GetOptimalParameters(Observable *radioObservables, uint32_t numObservables) { 
    35     uint32_t i,socketfd,numParameters; 
     40Parameter*  
     41GetOptimalParameters(Observable *radioObservables, uint32_t numObservables) 
     42{ 
    3643    char var[50]; 
    3744    char counter[55]; 
    3845        char buffer[256]; 
    3946 
    40     socketfd = ConnectToRemoteComponent(); 
    41     SendMessage(socketfd,"request_optimization"); 
     47    uint32_t socketFD = ConnectToRemoteComponent(); 
     48    SendMessage(socketFD, "request_optimization"); 
    4249 
    4350    /* Get number of observables to send.  This information needs to be  
     
    4653 
    4754    // Send Observables 
    48     sprintf(counter,"%i",numObservables); 
    49     SendMessage(socketfd,counter); 
    50     for(i = 0; i < numObservables; i++) { 
    51         SendMessage(socketfd,radioObservables[i].name.c_str()); 
    52         sprintf(var,"%f",radioObservables[i].value); 
    53         SendMessage(socketfd,var);       
     55    sprintf(counter, "%i", numObservables); 
     56    SendMessage(socketFD, counter); 
     57    for(size_t i = 0; i < numObservables; i++) { 
     58        SendMessage(socketFD, radioObservables[i].name.c_str()); 
     59        sprintf(var, "%f", radioObservables[i].value); 
     60        SendMessage(socketFD, var);      
    5461    } 
    5562 
    5663    /* Receive Set of Parameters */ 
    5764    memset(buffer, 0, 256); 
    58     ReadMessage(socketfd, buffer); 
    59     numParameters = atoi(buffer); 
    60     Parameter * pList = new Parameter[numParameters]; 
     65    ReadMessage(socketFD, buffer); 
     66    int32_t numParameters = atoi(buffer); 
     67    Parameter *pList = new Parameter[numParameters]; 
    6168     
    62     for(size_t i = 0; i < numParameters; i++) { 
     69    for(ssize_t i = 0; i < numParameters; i++) { 
    6370        memset(buffer, 0, 256); 
    64         ReadMessage(socketfd, buffer); 
     71        ReadMessage(socketFD, buffer); 
    6572        pList[i].name = std::string(buffer); 
    6673         
    6774                memset(buffer, 0, 256); 
    68         ReadMessage(socketfd, buffer); 
     75        ReadMessage(socketFD, buffer); 
    6976        pList[i].value = atof(buffer); 
    7077    }    
     
    7279    return pList; 
    7380} 
     81