Changeset 213

Timestamp:

03/26/09 13:23:40 (15 years ago)

Author:

bhilburn

Message:

Making field names more descriptive and easier to read. Also, added a
bug not about a possible segfault.

Location:

vtcross/trunk/src

Files:

• include/vtcross/components.h (modified) (1 diff)
• shell/CognitiveRadioShell.cpp (modified) (3 diffs)

vtcross/trunk/src/include/vtcross/components.h

@@ -340 +340 @@
         int16_t commandPort;
 
-        Utility * u;
-        Parameter * p;
-        Observable * o;
-        struct Radio_Info * radio_info;
+        Utility *utils;
+        Parameter *params;
+        Observable *observables;
+        struct Radio_Info *radio_info;
 };
 

vtcross/trunk/src/shell/CognitiveRadioShell.cpp

@@ -42 +42 @@
     PE_present = false;
     CE_present = false;
+
+    // TODO =BUG= The params, observables, and utils arrays are not being
+    // allocated here. If an shell object is constructed, and then immediately
+    // destructed, there will be no allocated memory, and the delete operater
+    // will receive a null pointer, which will segfault.
 }
 
@@ -47 +52 @@
 CognitiveRadioShell::~CognitiveRadioShell()
 {
-    delete [] p;
-    delete [] o;
-    delete [] u;
+    delete [] params;
+    delete [] observables;
+    delete [] utils;
 }
 
@@ -58 +63 @@
     LOG("Creating Cognitive Radio Shell.\n");
 
-    p = new Parameter[10];
-    o = new Observable[10];
-    u = new Utility[10];
+    params = new Parameter[10];
+    observables = new Observable[10];
+    utils = new Utility[10];
     radio_info = new Radio_Info;
 
-    LoadRadioConfiguration(radioConfig, p, u, o, radio_info);
+    LoadRadioConfiguration(radioConfig, params, utils, observables, radio_info);
 
     primaryPort = p1;