hipl-core team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4896
committer: Diego Biurrun <diego@xxxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-08-18 19:47:04 +0200
message:
  Drop unnecessary '!= NULL' checks in if/while conditions.
modified:
  firewall/cache.c
  lib/core/conf.c


--
lp:hipl
https://code.launchpad.net/~hipl-core/hipl/trunk

Your team HIPL core team is subscribed to branch lp:hipl.
To unsubscribe from this branch go to https://code.launchpad.net/~hipl-core/hipl/trunk/+edit-subscription

=== modified file 'firewall/cache.c'
--- firewall/cache.c	2010-07-19 16:15:46 +0000
+++ firewall/cache.c	2010-08-18 17:47:04 +0000
@@ -132,7 +132,7 @@
     HIP_IFEL(hip_send_recv_daemon_info(msg, 0, hip_fw_sock),
              -1, "send recv daemon info\n");
 
-    while ((current_param = hip_get_next_param(msg, current_param)) != NULL) {
+    while ((current_param = hip_get_next_param(msg, current_param))) {
         ha_curr = hip_get_param_contents_direct(current_param);
 
         if (type == FW_CACHE_HIT &&

=== modified file 'lib/core/conf.c'
--- lib/core/conf.c	2010-08-18 16:34:37 +0000
+++ lib/core/conf.c	2010-08-18 17:47:04 +0000
@@ -266,8 +266,7 @@
         HIP_IFE(hip_send_recv_daemon_info(msg, send_only, 0), -ECOMM);
 
         /* Loop through all the parameters in the message just filled. */
-        while ((current_param =
-                    hip_get_next_param(msg, current_param)) != NULL) {
+        while ((current_param = hip_get_next_param(msg, current_param))) {
             param_type = hip_get_param_type(current_param);
 
             if (param_type == HIP_PARAM_HIT_INFO) {
@@ -308,8 +307,7 @@
         HIP_IFE(hip_send_recv_daemon_info(msg, send_only, 0), -ECOMM);
 
         /* Loop through all the parameters in the message just filled. */
-        while ((current_param =
-                    hip_get_next_param(msg, current_param)) != NULL) {
+        while ((current_param = hip_get_next_param(msg, current_param))) {
             param_type = hip_get_param_type(current_param);
 
             if (param_type == HIP_PARAM_HIT) {
@@ -371,7 +369,7 @@
     HIP_IFEL(hip_send_recv_daemon_info(msg_tmp, send_only, 0), -1,
              "Sending msg failed.\n");
 
-    while ((param = hip_get_next_param(msg_tmp, param)) != NULL) {
+    while ((param = hip_get_next_param(msg_tmp, param))) {
         data = hip_get_param_contents_direct(param);
         HIP_IFEL(hip_build_user_hdr(msg, HIP_MSG_DEL_LOCAL_HI, 0),
                  -1, "Failed to build user message header\n");
@@ -1061,7 +1059,7 @@
                  opt[index_of_ip]);
     }
 out_err:
-    if (reg_types != NULL) {
+    if (reg_types) {
         free(reg_types);
     }
 
@@ -1756,7 +1754,7 @@
         HIP_IFE(hip_send_recv_daemon_info(msg, send_only, 0), -ECOMM);
 
         /* Loop through all the parameters in the message just filled. */
-        while ((current_param = hip_get_next_param(msg, current_param)) != NULL) {
+        while ((current_param = hip_get_next_param(msg, current_param))) {
             param_type = hip_get_param_type(current_param);
             if (param_type == HIP_PARAM_HIT) {
                 //no need to get the hit from msg
@@ -2057,7 +2055,7 @@
     HIP_IFEL(hip_send_recv_daemon_info(msg, send_only, 0), -1,
              "send recv daemon info\n");
 
-    while ((current_param = hip_get_next_param(msg, current_param)) != NULL) {
+    while ((current_param = hip_get_next_param(msg, current_param))) {
         struct hip_hadb_user_info_state *ha =
             hip_get_param_contents_direct(current_param);
 
@@ -2173,7 +2171,7 @@
     char *lib_aux = lib_all;
     const char *prefix  = HIPL_DEFAULT_PREFIX; /* translates to "/usr/local" etc */
 
-    while (*libs != NULL) {
+    while (*libs) {
         /* Copying prefix to lib_all */
         HIP_IFEL(c_count < strlen(prefix), -1, "Overflow in string lib_all\n");
         strncpy(lib_aux, prefix, c_count);
@@ -2563,7 +2561,7 @@
     HIP_IFEL(!(hip_config = fopen(fname, "r")), -1,
              "Error: can't open config file %s.\n", fname);
 
-    while (err == 0 && fgets(line, sizeof(line), hip_config) != NULL) {
+    while (err == 0 && fgets(line, sizeof(line), hip_config)) {
         /* Remove whitespace */
         c = line;
         while (*c == ' ' || *c == '\t') {
@@ -2765,7 +2763,7 @@
     HIP_INFO("User message was sent successfully to the HIP daemon.\n");
 
 out_err:
-    if (msg != NULL) {
+    if (msg) {
         free(msg);
     }