Named all parameters in headers' function prototypes.

diff --git a/src/config.h b/src/config.h
index aecb0f8..4489ab7 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -41,20 +41,19 @@ private:
     std::string WebcheckIpUrl;
     std::string WebcheckIpUrlAlt;
 
-    Service::Ptr create_service(const std::string&,const std::string&,const std::string&,const std::string&, const int, const int);
-    int load_main_config_file(const std::string&);
-    int load_service_config_file(const std::string&);
-    std::string to_lower(std::string) const;
+    Service::Ptr create_service(const std::string &protocol,const std::string &hostname, const std::string &login, const std::string &password, const int update_interval, const int max_updates_within_interval);
+    int load_main_config_file(const std::string& full_filename);
+    int load_service_config_file(const std::string& full_filename);
 
 public:
 
     typedef boost::shared_ptr<Config> Ptr;
 
-    Config(Logger::Ptr, Serviceholder::Ptr);
+    Config(Logger::Ptr _log, Serviceholder::Ptr _serviceholder);
 
     ~Config();
 
-    int parse_cmd_line(int, char **);
+    int parse_cmd_line(int argc, char *argv[]);
 
     int load_config_from_files();
 

diff --git a/src/dhs.h b/src/dhs.h
index 6250937..c91e2bf 100644 (file)
--- a/src/dhs.h
+++ b/src/dhs.h
@@ -26,7 +26,7 @@ private:
 
     friend class boost::serialization::access;
     template<class Archive>
-    void serialize(Archive &, const unsigned int);
+    void serialize(Archive & ar, const unsigned int version);
 
 public:
 
@@ -34,13 +34,13 @@ public:
 
     DHS();
 
-    DHS(const std::string&, const std::string&, const std::string&, const std::string&, const Logger::Ptr&, const int, const int);
+    DHS(const std::string& _protocol, const std::string& _hostname, const std::string& _login, const std::string& _password, const Logger::Ptr& _logger, const int _update_interval, const int _max_updates_within_interval);
 
     ~DHS();
 
-    void update(const std::string&);
+    void update(const std::string& ip);
 
-    int perform_update(const std::string&);
+    int perform_update(const std::string& ip);
 };
 
 #endif

diff --git a/src/iphelper.h b/src/iphelper.h
index 98622fd..be61154 100644 (file)
--- a/src/iphelper.h
+++ b/src/iphelper.h
@@ -35,7 +35,7 @@ public:
 
     IPHelper();
 
-    IPHelper(const Logger::Ptr, const std::string&, const std::string&, const bool);
+    IPHelper(const Logger::Ptr _log, const std::string& _webcheck_url, const std::string& _webcheck_url_alt, const bool _use_ipv6);
 
     ~IPHelper();
 
@@ -46,15 +46,15 @@ public:
     std::string webcheck_ip() const;
 
     // libcurl is a C library, so we have to make the callback member function static :-(
-    static int http_receive( char *, size_t, size_t, std::string* );
+    static int http_receive(char *inBuffer, size_t size, size_t nmemb, std::string *outBuffer);
 
-    CURL * init_curl(std::string&, char*) const;
+    CURL * init_curl(std::string& curl_writedata_buff, char* curl_err_buff) const;
 
-    void set_curl_url(CURL *, const std::string&) const;
+    void set_curl_url(CURL * curl_easy_handle, const std::string& url) const;
 
-    int perform_curl_operation(CURL *, char*, const std::string&) const;
+    int perform_curl_operation(CURL * curl_easy_handle, char* curl_err_buff, const std::string& actual_url) const;
 
-    std::string parse_ip(const std::string&) const;
+    std::string parse_ip(const std::string& data) const;
 };
 
 #endif

diff --git a/src/logger.cpp b/src/logger.cpp
index 0f68ff5..1e5178c 100644 (file)
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -650,7 +650,7 @@ void Logger::print_exception_serialize(const string& exception) const
  * Caught exception while de-serialize.
  * @param exception Exception message.
  */
-void Logger::print_exception_deserialize(const std::string& exception) const
+void Logger::print_exception_deserialize(const string& exception) const
 {
     if ( 0 <= Loglevel )
     {
@@ -695,7 +695,7 @@ void Logger::print_child_killed(const int pid) const
  * There is no object file.
  * @param object_file The object file.
  */
-void Logger::print_no_object_file(const std::string& object_file) const
+void Logger::print_no_object_file(const string& object_file) const
 {
     if ( 1 <= Loglevel )
     {
@@ -710,7 +710,7 @@ void Logger::print_no_object_file(const std::string& object_file) const
  * Prints out the given hostname
  * @param hostname Hostname as string.
  */
-void Logger::print_hostname(const std::string& hostname) const
+void Logger::print_hostname(const string& hostname) const
 {
     if ( 1 <= Loglevel )
     {
@@ -725,7 +725,7 @@ void Logger::print_hostname(const std::string& hostname) const
  * Prints out the detected own ipv4 address
  * @param ip_addr String representation of the detected ip.
  */
-void Logger::print_own_ipv4(const std::string& ip_addr_v4) const
+void Logger::print_own_ipv4(const string& ip_addr_v4) const
 {
     if ( 1 <= Loglevel )
     {
@@ -740,7 +740,7 @@ void Logger::print_own_ipv4(const std::string& ip_addr_v4) const
  * Prints out the detected own ipv5 address
  * @param ip_addr String representation of the detected ip.
  */
-void Logger::print_own_ipv6(const std::string& ip_addr_v6) const
+void Logger::print_own_ipv6(const string& ip_addr_v6) const
 {
     if ( 1 <= Loglevel )
     {
@@ -910,7 +910,7 @@ void Logger::print_update_not_allowed(const int current_time, const int old_time
  * Failure while running update for service.
  * @param service Services' name.
  */
-void Logger::print_update_service_failure(const std::string& service) const
+void Logger::print_update_service_failure(const string& service) const
 {
     if ( 0 <= Loglevel )
     {

diff --git a/src/logger.h b/src/logger.h
index d9bf65b..078021f 100644 (file)
--- a/src/logger.h
+++ b/src/logger.h
@@ -33,23 +33,23 @@ public:
 
     ~Logger();
 
-    void log_notice(const std::string&) const;
+    void log_notice(const std::string& msg) const;
 
-    void log_warning(const std::string&) const;
+    void log_warning(const std::string& msg) const;
 
-    void log_error(const std::string&) const;
+    void log_error(const std::string& msg) const;
 
-    void set_loglevel(const int);
+    void set_loglevel(const int _loglevel);
 
     int get_loglevel() const;
 
-    void set_syslog(const bool);
+    void set_syslog(const bool _syslog);
 
     bool get_syslog() const;
 
-    void set_log_facility(const int, const bool);
+    void set_log_facility(const int _loglevel, const bool _syslog);
 
-    void print_usage(const Options_descriptionPtr) const;
+    void print_usage(const Options_descriptionPtr opt_desc) const;
 
     void print_version() const;
 
@@ -57,45 +57,45 @@ public:
 
     void print_conf_files_parsed() const;
 
-    void print_destructor_call(const std::string&) const;
+    void print_destructor_call(const std::string& _class) const;
 
-    void print_constructor_call(const std::string&) const;
+    void print_constructor_call(const std::string& _class) const;
 
-    void print_update_service(const std::string&) const;
+    void print_update_service(const std::string& service) const;
 
-    void print_unknown_cmd_option(const std::string&) const;
+    void print_unknown_cmd_option(const std::string& unknown_option) const;
 
-    void print_unknown_protocol(const std::string&) const;
+    void print_unknown_protocol(const std::string& protocol) const;
 
-    void print_load_service_conf(const std::string&) const;
+    void print_load_service_conf(const std::string& filename) const;
 
-    void print_load_main_conf(const std::string&) const;
+    void print_load_main_conf(const std::string& filename) const;
 
-    void print_unknown_service_conf_option(const std::string&) const;
+    void print_unknown_service_conf_option(const std::string& unknown_option) const;
 
-    void print_unknown_main_conf_option(const std::string&) const;
+    void print_unknown_main_conf_option(const std::string& unknown_option) const;
 
-    void print_error_opening_r(const std::string&) const;
+    void print_error_opening_r(const std::string& filename) const;
 
-    void print_error_opening_rw(const std::string&) const;
+    void print_error_opening_rw(const std::string& filename) const;
 
-    void print_error_config_path(const std::string&) const;
+    void print_error_config_path(const std::string& config_path) const;
 
-    void print_conf_loaded(const std::string&) const;
+    void print_conf_loaded(const std::string& config_path) const;
 
-    void print_conf_not_loaded(const std::string&) const;
+    void print_conf_not_loaded(const std::string& config_path) const;
 
     void print_missing_cmd_service_option() const;
 
-    void print_runnig_as_daemon(const int) const;
+    void print_runnig_as_daemon(const int pid) const;
 
-    void print_daemon_mode(const bool) const;
+    void print_daemon_mode(const bool daemon_mode) const;
 
     void print_error_fork() const;
 
-    void print_pid_found(const int) const;
+    void print_pid_found(const int pid) const;
 
-    void print_process_already_running(const int) const;
+    void print_process_already_running(const int pid) const;
 
     void print_caught_sigterm() const;
 
@@ -103,7 +103,7 @@ public:
 
     void print_caught_sighup() const;
 
-    void print_error_setting_signal(const std::string&) const;
+    void print_error_setting_signal(const std::string& signal) const;
 
     void print_init_log_facility() const;
 
@@ -113,41 +113,41 @@ public:
 
     void print_deserialized_objects_success() const;
 
-    void print_service_object(const std::string&, const std::string&, const std::string&, const std::string&, const std::string&, const int, const int, const std::string&, std::list<int>*) const;
+    void print_service_object(const std::string& message, const std::string& protocol, const std::string& hostname, const std::string& login, const std::string& password, const int update_interval, const int max_updates_within_interval, const std::string& actual_ip, std::list<int>* lastupdated) const;
 
-    void print_exception_serialize(const std::string&) const;
+    void print_exception_serialize(const std::string& exception) const;
 
-    void print_exception_deserialize(const std::string&) const;
+    void print_exception_deserialize(const std::string& exception) const;
 
-    void print_error_kill_child(const int) const;
+    void print_error_kill_child(const int pid) const;
 
-    void print_child_killed(const int) const;
+    void print_child_killed(const int pid) const;
 
-    void print_no_object_file(const std::string&) const;
+    void print_no_object_file(const std::string& object_file) const;
 
-    void print_hostname(const std::string&) const;
+    void print_hostname(const std::string& hostname) const;
 
-    void print_own_ipv4(const std::string&) const;
+    void print_own_ipv4(const std::string& ip_addr_v4) const;
 
-    void print_own_ipv6(const std::string&) const;
+    void print_own_ipv6(const std::string& ip_addr_v6) const;
 
-    void print_error_hostname_to_ip(const std::string&, const std::string&) const;
+    void print_error_hostname_to_ip(const std::string& exception, const std::string& hostname) const;
 
-    void print_update_service_successful(const std::string&) const;
+    void print_update_service_successful(const std::string& service) const;
 
     void print_webcheck_no_ip() const;
 
-    void print_webcheck_url_connection_problem(const char *, const std::string&) const;
+    void print_webcheck_url_connection_problem(const char * curl_err_buff, const std::string& url) const;
 
-    void print_webcheck_error(const char *, const std::string&) const;
+    void print_webcheck_error(const char * curl_err_buff, const std::string& url) const;
 
-    void print_received_curl_data(const std::string&) const;
+    void print_received_curl_data(const std::string& curl_data) const;
 
-    void print_regex_found_ip(const std::string&) const;
+    void print_regex_found_ip(const std::string& ip) const;
 
-    void print_regex_ip_not_found(const std::string&) const;
+    void print_regex_ip_not_found(const std::string& data) const;
 
-    void print_multiple_cmd_option(const std::string&) const;
+    void print_multiple_cmd_option(const std::string& message) const;
 
     void print_update_not_allowed(const int current_time, const int old_time, const int MaxUpdatesWithinInterval, const std::string& service) const;
 

diff --git a/src/ods.h b/src/ods.h
index 96f1b26..c74329e 100644 (file)
--- a/src/ods.h
+++ b/src/ods.h
@@ -26,7 +26,7 @@ private:
 
     friend class boost::serialization::access;
     template<class Archive>
-    void serialize(Archive &, const unsigned int);
+    void serialize(Archive & ar, const unsigned int version);
 
 public:
 
@@ -34,13 +34,13 @@ public:
 
     ODS();
 
-    ODS(const std::string&, const std::string&, const std::string&, const std::string&, const Logger::Ptr&, const int, const int);
+    ODS(const std::string& _protocol, const std::string& _hostname, const std::string& _login, const std::string& _password, const Logger::Ptr& _logger, const int _update_interval, const int _max_updates_within_interval);
 
     ~ODS();
 
-    void update(const std::string&);
+    void update(const std::string& ip);
 
-    int perform_update(const std::string&);
+    int perform_update(const std::string& ip);
 };
 
 #endif

diff --git a/src/serializeservicecontainer.h b/src/serializeservicecontainer.h
index 4c3747e..ab450d9 100644 (file)
--- a/src/serializeservicecontainer.h
+++ b/src/serializeservicecontainer.h
@@ -27,7 +27,7 @@ private:
 
     friend class boost::serialization::access;
     template<class Archive>
-    void serialize(Archive &, const unsigned int);
+    void serialize(Archive & ar, const unsigned int version);
 
 public:
 

diff --git a/src/service.h b/src/service.h
index effe53c..9b5c184 100644 (file)
--- a/src/service.h
+++ b/src/service.h
@@ -37,7 +37,7 @@ private:
 
     friend class boost::serialization::access;
     template<class Archive>
-    void serialize(Archive &, const unsigned int);
+    void serialize(Archive & ar, const unsigned int version);
 
     Logger::Ptr Log;
 
@@ -49,39 +49,39 @@ public:
 
     virtual ~Service();
 
-    virtual void update(const std::string&) = 0;
+    virtual void update(const std::string& ip) = 0;
 
     int get_update_interval()const;
-    void set_update_interval(const int);
+    void set_update_interval(const int _update_interval);
 
     int get_max_updates_within_interval() const;
-    void set_max_updates_within_interval(const int);
+    void set_max_updates_within_interval(const int _max_updates_within_interval);
 
-    void set_protocol(const std::string&);
+    void set_protocol(const std::string& _protocol);
     std::string get_protocol() const;
 
-    void set_hostname(const std::string&);
+    void set_hostname(const std::string& _hostname);
     std::string get_hostname() const;
 
-    void set_login(const std::string&);
+    void set_login(const std::string& _login);
     std::string get_login() const;
 
-    void set_password(const std::string&);
+    void set_password(const std::string& _password);
     std::string get_password() const;
 
-    void set_last_updates(std::list<int>*);
+    void set_last_updates(std::list<int>* _last_updates);
     std::list<int>* get_last_updates();
 
-    void set_actual_ip(const std::string&);
+    void set_actual_ip(const std::string& _actual_ip);
     std::string get_actual_ip() const;
 
-    void set_logger(const Logger::Ptr&);
+    void set_logger(const Logger::Ptr& _log);
     Logger::Ptr get_logger() const;
 
     bool update_allowed(const int current_time);
 
-    bool operator== (const Service&) const;
-    bool operator!= (const Service&) const;
+    bool operator== (const Service& other) const;
+    bool operator!= (const Service& other) const;
 };
 
 #endif

diff --git a/src/serviceholder.h b/src/serviceholder.h
index f37592f..a103cf2 100644 (file)
--- a/src/serviceholder.h
+++ b/src/serviceholder.h
@@ -31,7 +31,7 @@ public:
 
     typedef boost::shared_ptr<Serviceholder> Ptr;
 
-    Serviceholder(Logger::Ptr);
+    Serviceholder(Logger::Ptr _log);
 
     ~Serviceholder();
 

diff --git a/src/updater.h b/src/updater.h
index 65e86ce..d7cea0e 100644 (file)
--- a/src/updater.h
+++ b/src/updater.h
@@ -38,7 +38,7 @@ public:
 
     void update_services();
 
-    int init_config_from_cmd(int, char **);
+    int init_config_from_cmd(int argc, char *argv[]);
 
     int init_config_from_files();