Fix compilation warning, indentation, and added EUCA_FREE()

EUCA-5285 Squashed commit of the following: commit 17947a9ea924e04dcf9da74fb3a6f162953ebe53 Author: chuck <chuck@eucalyptus.com> Date: Fri Mar 1 13:00:34 2013 -0800 Fix buffer overflow issue EUCA-5285 commit 29a5ec1eb5cc29e0682c1dc2b9c22a726e8480a9 Author: chuck <chuck@eucalyptus.com> Date: Fri Mar 1 12:44:39 2013 -0800 Fix compilation warning, indentation, and added EUCA_FREE() EUCA-5285
eucalyptus · Mar 4, 2013 · 786194f · 786194f
1 parent 4bf2d4d
commit 786194f
Show file tree

Hide file tree

Showing 40 changed files with 1,829 additions and 2,349 deletions.
diff --git a/cluster/cc-client-policy.xml b/cluster/cc-client-policy.xml
diff --git a/cluster/handlers-state.c b/cluster/handlers-state.c
@@ -586,8 +586,7 @@ int clean_network_state(void)
             if (rc && rc != 2) {
                 logprintfl(EUCAERROR, "running cmd '%s' failed: cannot remove ip %s\n", cmd, SP(ipstr));
             }
-            if (ipstr)
+            EUCA_FREE(ipstr);
-                free(ipstr);
         }
     }
     //  logprintfl(EUCADEBUG, "clean_network_state(): finished clearing public IPs\n");
@@ -602,7 +601,7 @@ int clean_network_state(void)
             if (rc) {
                 logprintfl(EUCAERROR, "could not terminate dhcpd (%s)\n", tmpvnetconfig->dhcpdaemon);
             }
-            free(pidstr);
+            EUCA_FREE(pidstr);
         }
     }
 
@@ -645,7 +644,6 @@ int clean_network_state(void)
        }
      */
 
-    if (tmpvnetconfig)
+    EUCA_FREE(tmpvnetconfig);
-        free(tmpvnetconfig);
     return (0);
 }