← Back to team overview

hipl-core team mailing list archive

[Branch ~hipl-core/hipl/trunk] Rev 4932: Fix "if(" to "if (", alignment and brace placement.

 

------------------------------------------------------------
revno: 4932
committer: Christof Mroz <christof.mroz@xxxxxxxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-09-13 22:11:23 +0200
message:
  Fix "if(" to "if (", alignment and brace placement.
modified:
  firewall/cache_port.c
  firewall/cache_port.h
  firewall/firewall.c
  firewall/lsi.c
  hipd/hipd.c
  lib/core/builder.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_port.c'
--- firewall/cache_port.c	2010-09-09 00:54:32 +0000
+++ firewall/cache_port.c	2010-09-13 20:11:23 +0000
@@ -174,7 +174,7 @@
  * @return the cache entry if found or NULL otherwise
  */
 struct firewall_port_cache_hl *hip_firewall_port_cache_db_match(in_port_t port,
-                                                           int proto)
+                                                                int proto)
 {
     struct firewall_port_cache_hl *found_entry = NULL;
     char key[FIREWALL_PORT_CACHE_KEY_LENGTH];

=== modified file 'firewall/cache_port.h'
--- firewall/cache_port.h	2010-09-09 00:54:32 +0000
+++ firewall/cache_port.h	2010-09-13 20:11:23 +0000
@@ -34,7 +34,7 @@
 
 void hip_firewall_port_cache_init_hldb(void);
 struct firewall_port_cache_hl *hip_firewall_port_cache_db_match(in_port_t port,
-                                                           int proto);
+                                                                int proto);
 void hip_firewall_port_cache_uninit_hldb(void);
 
 #endif /* HIP_CACHE_H */

=== modified file 'firewall/firewall.c'
--- firewall/firewall.c	2010-09-09 01:45:27 +0000
+++ firewall/firewall.c	2010-09-13 20:11:23 +0000
@@ -2169,8 +2169,7 @@
         // get handle with queued packet and process
         /* @todo: using HIPD_SELECT blocks hipfw with R1 */
         if ((err = select((highest_descriptor + 1), &read_fdset,
-                          NULL, NULL, &timeout)) < 0)
-        {
+                          NULL, NULL, &timeout)) < 0) {
             HIP_PERROR("select error, ignoring\n");
             continue;
         }
@@ -2259,10 +2258,10 @@
     }
 
 out_err:
-    if(h4) {
+    if (h4) {
         ipq_destroy_handle(h4);
     }
-    if(h6) {
+    if (h6) {
         ipq_destroy_handle(h6);
     }
     if (hip_fw_async_sock) {

=== modified file 'firewall/lsi.c'
--- firewall/lsi.c	2010-09-09 00:54:32 +0000
+++ firewall/lsi.c	2010-09-13 20:11:23 +0000
@@ -348,8 +348,7 @@
 
     if (port_cache_entry &&
         (port_cache_entry->traffic_type ==
-         FIREWALL_PORT_CACHE_IPV6_TRAFFIC))
-    {
+         FIREWALL_PORT_CACHE_IPV6_TRAFFIC)) {
         verdict = 1;
         HIP_DEBUG("Cached port, accepting\n");
         goto out_err;

=== modified file 'hipd/hipd.c'
--- hipd/hipd.c	2010-09-09 01:12:24 +0000
+++ hipd/hipd.c	2010-09-13 20:11:23 +0000
@@ -429,10 +429,10 @@
     /* free allocated resources */
     hip_exit();
 
-    if(ctx.input_msg) {
+    if (ctx.input_msg) {
         free(ctx.input_msg);
     }
-    if(ctx.output_msg) {
+    if (ctx.output_msg) {
         free(ctx.output_msg);
     }
 

=== modified file 'lib/core/builder.c'
--- lib/core/builder.c	2010-08-29 16:24:14 +0000
+++ lib/core/builder.c	2010-09-13 20:11:23 +0000
@@ -3964,7 +3964,7 @@
     int amount                  = 0;
     uint8_t type;
 
-    while(address_pointer <
+    while (address_pointer <
           ((const char *) locator) + hip_get_param_contents_len(locator)) {
         type = ((const struct hip_locator_info_addr_item *)
                address_pointer)->locator_type;

=== modified file 'lib/core/conf.c'
--- lib/core/conf.c	2010-08-25 11:43:43 +0000
+++ lib/core/conf.c	2010-09-13 20:11:23 +0000
@@ -2229,7 +2229,7 @@
                 free(libs[i]);
         }
         for (k = 0; 0 < argc; k++) {
-            if(argv_new[k]) {
+            if (argv_new[k]) {
                 free(argv_new[k]);
             }
         }