[Openvas-commits] r3110 - in trunk/openvas-libraries: . libopenvas

[scm-commit@wald.intevation.org]

Author: jan
Date: 2009-04-16 16:37:27 +0200 (Thu, 16 Apr 2009)
New Revision: 3110

Modified:
   trunk/openvas-libraries/ChangeLog
   trunk/openvas-libraries/libopenvas/openvas_server.c
   trunk/openvas-libraries/libopenvas/openvas_server.h
Log:
* libopenvas/openvas_server.h, libopenvas/openvas_server.c
(openvas_server_connect_to_server): Renamed to openvas_server_open.
(openvas_server_close_server_connection): Renamed to openvas_server_close.
(openvas_server_send_to_server): Renamed to openvas_server_send.
(openvas_server_sendf_to_server): Renamed to openvas_server_sendf.



Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog	2009-04-16 14:01:19 UTC (rev 3109)
+++ trunk/openvas-libraries/ChangeLog	2009-04-16 14:37:27 UTC (rev 3110)
@@ -1,3 +1,11 @@
+2009-04-16  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+
+	* libopenvas/openvas_server.h, libopenvas/openvas_server.c
+	(openvas_server_connect_to_server): Renamed to openvas_server_open.
+	(openvas_server_close_server_connection): Renamed to openvas_server_close.
+	(openvas_server_send_to_server): Renamed to openvas_server_send.
+	(openvas_server_sendf_to_server): Renamed to openvas_server_sendf.
+
 2009-04-15  Michael Wiegand <michael.wiegand at intevation.de>
 
 	* libopenvas/openvas_server.c: Made function names more intuitive,

Modified: trunk/openvas-libraries/libopenvas/openvas_server.c
===================================================================
--- trunk/openvas-libraries/libopenvas/openvas_server.c	2009-04-16 14:01:19 UTC (rev 3109)
+++ trunk/openvas-libraries/libopenvas/openvas_server.c	2009-04-16 14:37:27 UTC (rev 3110)
@@ -53,8 +53,8 @@
  * @return 0 on success, -1 on error.
  */
 int
-openvas_server_connect_to_server (gnutls_session_t * session,
-                                  char *host, int port)
+openvas_server_open (gnutls_session_t * session,
+                     char *host, int port)
 {
   // TODO: Ensure that host and port have sane values.
   // TODO: Improve logging.
@@ -189,7 +189,7 @@
  * @return 0 on success, -1 on error.
  */
 int
-openvas_server_close_server_connection (int socket, gnutls_session_t session)
+openvas_server_close (int socket, gnutls_session_t session)
 {
   /* Turn off blocking. */
   if (fcntl (socket, F_SETFL, O_NONBLOCK) == -1) return -1;
@@ -208,7 +208,7 @@
  * @return 0 on success, -1 on error.
  */
 int
-openvas_server_send_to_server (gnutls_session_t* session, const char* string)
+openvas_server_send (gnutls_session_t* session, const char* string)
 {
   size_t left = strlen (string);
   while (left)
@@ -249,7 +249,7 @@
  * @return 0 on success, -1 on error.
  */
 int
-openvas_server_sendf_to_server (gnutls_session_t* session, const char* format, ...)
+openvas_server_sendf (gnutls_session_t* session, const char* format, ...)
 {
   va_list args;
   va_start (args, format);
@@ -259,5 +259,3 @@
   va_end (args);
   return ret;
 }
-
-

Modified: trunk/openvas-libraries/libopenvas/openvas_server.h
===================================================================
--- trunk/openvas-libraries/libopenvas/openvas_server.h	2009-04-16 14:01:19 UTC (rev 3109)
+++ trunk/openvas-libraries/libopenvas/openvas_server.h	2009-04-16 14:37:27 UTC (rev 3110)
@@ -34,13 +34,13 @@
 #include <gnutls/gnutls.h>
 
 int
-openvas_server_connect_to_server (gnutls_session_t *, char*, int);
+openvas_server_open (gnutls_session_t *, char*, int);
 
 int
-openvas_server_close_server_connection (int, gnutls_session_t);
+openvas_server_close (int, gnutls_session_t);
 
 int
-openvas_server_send_to_server (gnutls_session_t*, const char*);
+openvas_server_send (gnutls_session_t*, const char*);
 
 int
-openvas_server_sendf_to_server (gnutls_session_t*, const char*, ...);
+openvas_server_sendf (gnutls_session_t*, const char*, ...);