Author: tjansen Date: Tue Oct 27 16:22:42 2009 New Revision: 1340 Log: Cosmetics: Moved cdconf_read_basic_confs() to the end of the file. Saves all forward declarations. Modified: trunk/pisacd/cdconf.c Modified: trunk/pisacd/cdconf.c ============================================================================== --- trunk/pisacd/cdconf.c Tue Oct 27 16:20:46 2009 (r1339) +++ trunk/pisacd/cdconf.c Tue Oct 27 16:22:42 2009 (r1340) @@ -27,16 +27,6 @@ extern config_t cfg; /* in libpisa/config.c */ -/* prototypes of static functions */ -static void cdconf_read_debuglevel(cd_conf *cdconf); -static void cdconf_read_debugtypemask(cd_conf *cdconf); -static void cdconf_read_port_control(cd_conf *cdconf); -static void cdconf_read_port_data(cd_conf *cdconf); -static void cdconf_read_idle_disconnect_delay(cd_conf *cdconf); -static void cdconf_read_local_ipv4(cd_conf *cdconf); -static void cdconf_read_local_netmask(cd_conf *cdconf); -void cdconf_set_wlaninfos(cd_conf *cdconf); - /** * Initialize general configuration of neighbor daemon. * @@ -86,21 +76,6 @@ } /** - * Read basic settings from the configuration file - */ -void cdconf_read_basic_confs(cd_conf *cdconf) -{ - /* Read several configuration from pisacd.conf. */ - cdconf_read_debuglevel(cdconf); - cdconf_read_debugtypemask(cdconf); - cdconf_read_port_control(cdconf); - cdconf_read_port_data(cdconf); - cdconf_read_idle_disconnect_delay(cdconf); - cdconf_read_local_ipv4(cdconf); - cdconf_read_local_netmask(cdconf); -} - -/** * Read the debug level from the configuration file. * * @param cdconf cd_conf structure where conf settings are stored @@ -248,3 +223,18 @@ fprintf(stderr, "WARNING: Cannot set log level as debugging\n"); } } + +/** + * Read basic settings from the configuration file + */ +void cdconf_read_basic_confs(cd_conf *cdconf) +{ + /* Read several configuration from pisacd.conf. */ + cdconf_read_debuglevel(cdconf); + cdconf_read_debugtypemask(cdconf); + cdconf_read_port_control(cdconf); + cdconf_read_port_data(cdconf); + cdconf_read_idle_disconnect_delay(cdconf); + cdconf_read_local_ipv4(cdconf); + cdconf_read_local_netmask(cdconf); +}