[pisa-src] r1674 - trunk/pisasd/sdconf.c

From: Thomas Jansen <mithi@xxxxxxxxx>
To: pisa-src@xxxxxxxxxxxxx
Date: Thu, 12 Nov 2009 16:07:07 +0100
Author: tjansen
Date: Thu Nov 12 16:07:07 2009
New Revision: 1674

Log:
Cosmetics:

Spaces between arguments,
K&R style opening braces,
indentation level fixes

Modified:
   trunk/pisasd/sdconf.c

Modified: trunk/pisasd/sdconf.c
==============================================================================
--- trunk/pisasd/sdconf.c       Thu Nov 12 15:50:31 2009        (r1673)
+++ trunk/pisasd/sdconf.c       Thu Nov 12 16:07:07 2009        (r1674)
@@ -68,8 +68,8 @@
 {
        /* Use default path if no config file was given per commandline 
argument */
        if (sd_cfg.conffile[0] == '\0') {
-                       pisa_check_and_create_dir(PISA_CONFDIR_PATH, 
DEFAULT_CONFIG_DIR_MODE);
-                       strncpy(sd_cfg.conffile, PISASD_CONFFILE_FULLPATH, 
sizeof(sd_cfg.conffile));
+               pisa_check_and_create_dir(PISA_CONFDIR_PATH, 
DEFAULT_CONFIG_DIR_MODE);
+               strncpy(sd_cfg.conffile, PISASD_CONFFILE_FULLPATH, 
sizeof(sd_cfg.conffile));
        }
 
        if (pisa_cfg_setup_file(sd_cfg.conffile) <= 0) {
@@ -82,7 +82,7 @@
 
 static void sdconf_read_is_relay(void)
 {
-        pisa_cfg_get_bool_value("is_relay",&sd_cfg.is_relay);
+        pisa_cfg_get_bool_value("is_relay", &sd_cfg.is_relay);
 }
 
 /**
@@ -197,8 +197,8 @@
        /* Use default path if no config file was given per commandline argument
         */
        if (authorized_cfg_file[0] == '\0') {
-                       pisa_check_and_create_dir(PISA_CONFDIR_PATH, 
DEFAULT_CONFIG_DIR_MODE);
-                       strncpy(authorized_cfg_file, 
PISA_AUTHORIZED_HOSTS_CONFFILE_FULLPATH, sizeof(authorized_cfg_file));
+               pisa_check_and_create_dir(PISA_CONFDIR_PATH, 
DEFAULT_CONFIG_DIR_MODE);
+               strncpy(authorized_cfg_file, 
PISA_AUTHORIZED_HOSTS_CONFFILE_FULLPATH, sizeof(authorized_cfg_file));
        }
 
        if (pisa_cfg_authorized_hosts_setup_file(authorized_cfg_file) <= 0) {
@@ -214,16 +214,11 @@
 {
        char ip_tmp[INET_ADDRSTRLEN];
 
-       
if(!pisa_cfg_get_string_value("server_ipaddress",ip_tmp,INET_ADDRSTRLEN))
-       {
+       if (!pisa_cfg_get_string_value("server_ipaddress", ip_tmp, 
INET_ADDRSTRLEN)) {
                PISA_ERROR("Error: Reading server ip address failed.\n");
-       }
-       else
-       {
-               if(inet_pton(AF_INET, ip_tmp, &sd_cfg.ipaddr) != 1)
-               {
+       } else {
+               if (inet_pton(AF_INET, ip_tmp, &sd_cfg.ipaddr) != 1)
                        PISA_ERROR("Error: Reading server ip address 
failed.\n");
-               }
        }
 }
 
@@ -234,16 +229,11 @@
 {
        char ip_tmp[INET_ADDRSTRLEN];
 
-       
if(!pisa_cfg_get_string_value("dynamic_ip_range_minimum",ip_tmp,INET_ADDRSTRLEN))
-       {
+       if (!pisa_cfg_get_string_value("dynamic_ip_range_minimum", ip_tmp, 
INET_ADDRSTRLEN)) {
                PISA_ERROR("Error: Reading minimum ip address failed.\n");
-       }
-       else
-       {
-               if(inet_pton(AF_INET, ip_tmp, &sd_cfg.dyn_min) != 1)
-               {
+       } else {
+               if (inet_pton(AF_INET, ip_tmp, &sd_cfg.dyn_min) != 1)
                        PISA_ERROR("Error: Minumum ip address is not an IPv4 
address.\n");
-               }
        }
 }
 
@@ -254,16 +244,11 @@
 {
        char ip_tmp[INET_ADDRSTRLEN];
 
-       
if(!pisa_cfg_get_string_value("dynamic_ip_range_maximum",ip_tmp,INET_ADDRSTRLEN))
-       {
+       if (!pisa_cfg_get_string_value("dynamic_ip_range_maximum", ip_tmp, 
INET_ADDRSTRLEN)) {
                PISA_ERROR("Error: Reading maximum ip address failed.\n");
-       }
-       else
-       {
-               if(inet_pton(AF_INET, ip_tmp, &sd_cfg.dyn_max) != 1)
-               {
+       } else {
+               if (inet_pton(AF_INET, ip_tmp, &sd_cfg.dyn_max) != 1)
                        PISA_ERROR("Error: Maximum ip address is not an IPv4 
address.\n");
-               }
        }
 }
 
@@ -274,16 +259,12 @@
 {
        char ip_tmp[INET_ADDRSTRLEN];
 
-       
if(!pisa_cfg_get_string_value("dynamic_ip_range_netmask",ip_tmp,INET_ADDRSTRLEN))
+       if (!pisa_cfg_get_string_value("dynamic_ip_range_netmask", ip_tmp, 
INET_ADDRSTRLEN))
        {
                PISA_ERROR("Error: Reading netmask failed.\n");
-       }
-       else
-       {
-               if(inet_pton(AF_INET, ip_tmp, &sd_cfg.dyn_mask) != 1)
-               {
+       } else {
+               if (inet_pton(AF_INET, ip_tmp, &sd_cfg.dyn_mask) != 1)
                        PISA_ERROR("Error: Not a valid netmask.\n");
-               }
        }
 }
 
@@ -305,8 +286,8 @@
 
        sdconf_read_is_relay();
        /* NAT commands */
-       pisa_cfg_get_string_value("nat_up",sd_cfg.nat_up,NAT_STRING_MAX);
-       pisa_cfg_get_string_value("nat_down",sd_cfg.nat_down,NAT_STRING_MAX);
+       pisa_cfg_get_string_value("nat_up", sd_cfg.nat_up, NAT_STRING_MAX);
+       pisa_cfg_get_string_value("nat_down", sd_cfg.nat_down, NAT_STRING_MAX);
        /* Read a list of allowed HITs from authorized_hosts.cfg. */
        sd_cfg.hit_allowed = pisa_hitlist_build("allowed_hosts");
 }
[pisa-src] r1674 - trunk/pisasd/sdconf.c

Other related posts:
