[nagiosplug] Abbreviate function name

Nagios Plugin Development nagios-plugins at users.sourceforge.net
Sun Aug 18 23:20:36 CEST 2013


 Module: nagiosplug
 Branch: master
 Commit: 64b4d1fb665005c9442361094e02cfd25aa15f43
 Author: Holger Weiss <holger at zedat.fu-berlin.de>
   Date: Sun Aug 18 23:11:11 2013 +0200
    URL: http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=commit;h=64b4d1f

Abbreviate function name

Make a very long function name at least a little bit shorter.

---

 plugins/check_http.c |    2 +-
 plugins/netutils.h   |    2 +-
 plugins/sslutils.c   |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/check_http.c b/plugins/check_http.c
index 46c0c13..7e3f82a 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -879,7 +879,7 @@ check_http (void)
   elapsed_time_connect = (double)microsec_connect / 1.0e6;
   if (use_ssl == TRUE) {
     gettimeofday (&tv_temp, NULL);
-    result = np_net_ssl_init_with_hostname_version_and_certificate(sd, (use_sni ? host_name : NULL), ssl_version, client_cert, client_privkey);
+    result = np_net_ssl_init_with_hostname_version_and_cert(sd, (use_sni ? host_name : NULL), ssl_version, client_cert, client_privkey);
     if (result != STATE_OK)
       return result;
     microsec_ssl = deltime (tv_temp);
diff --git a/plugins/netutils.h b/plugins/netutils.h
index 765b3d5..5a495c9 100644
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
@@ -101,7 +101,7 @@ extern int address_family;
 int np_net_ssl_init(int sd);
 int np_net_ssl_init_with_hostname(int sd, char *host_name);
 int np_net_ssl_init_with_hostname_and_version(int sd, char *host_name, int version);
-int np_net_ssl_init_with_hostname_version_and_certificate(int sd, char *host_name, int version, char *cert, char *privkey);
+int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int version, char *cert, char *privkey);
 void np_net_ssl_cleanup();
 int np_net_ssl_write(const void *buf, int num);
 int np_net_ssl_read(void *buf, int num);
diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index 4927e36..78317f8 100644
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
@@ -45,10 +45,10 @@ int np_net_ssl_init_with_hostname(int sd, char *host_name) {
 }
 
 int np_net_ssl_init_with_hostname_and_version(int sd, char *host_name, int version) {
-	return np_net_ssl_init_with_hostname_version_and_certificate(sd, host_name, version, NULL, NULL);
+	return np_net_ssl_init_with_hostname_version_and_cert(sd, host_name, version, NULL, NULL);
 }
 
-int np_net_ssl_init_with_hostname_version_and_certificate(int sd, char *host_name, int version, char *cert, char *privkey) {
+int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int version, char *cert, char *privkey) {
 	const SSL_METHOD *method = NULL;
 
 	switch (version) {





More information about the Commits mailing list