aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-15 10:01:44 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-15 10:01:44 +0000
commit4e75b2e8b871346f9a36779a1135a3029a610277 (patch)
tree4ab6fb376833f095844026ca33bb996f982faafe
parentsvn merge -r 614:615 $SO/patches/openvpn-2-1_alpha3a-tcpbind (diff)
downloadopenvpn-4e75b2e8b871346f9a36779a1135a3029a610277.tar.xz
Minor style cleanup for --enable-pedantic.
Still need some pedantic cleanup in pkcs11.c. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@624 e7ae566f-a301-0410-adde-c780ea21d3b5
-rw-r--r--forward.c4
-rw-r--r--manage.c2
-rw-r--r--pkcs11.c10
-rw-r--r--plugin.h2
-rw-r--r--socket.c2
-rw-r--r--socket.h4
6 files changed, 12 insertions, 12 deletions
diff --git a/forward.c b/forward.c
index 11d6d28..a6b8923 100644
--- a/forward.c
+++ b/forward.c
@@ -772,7 +772,7 @@ process_incoming_link (struct context *c)
#endif
#ifdef PACKET_TRUNCATION_CHECK
- //if (c->c2.buf.len > 1) --c->c2.buf.len; // JYFIXME
+ /* if (c->c2.buf.len > 1) --c->c2.buf.len; JYFIXME */
ipv4_packet_size_verify (BPTR (&c->c2.buf),
BLEN (&c->c2.buf),
TUNNEL_TYPE (c->c1.tuntap),
@@ -913,7 +913,7 @@ process_incoming_tun (struct context *c)
process_ipv4_header (c, PIPV4_PASSTOS|PIPV4_MSSFIX, &c->c2.buf);
#ifdef PACKET_TRUNCATION_CHECK
- //if (c->c2.buf.len > 1) --c->c2.buf.len; // JYFIXME
+ /* if (c->c2.buf.len > 1) --c->c2.buf.len; JYFIXME */
ipv4_packet_size_verify (BPTR (&c->c2.buf),
BLEN (&c->c2.buf),
TUNNEL_TYPE (c->c1.tuntap),
diff --git a/manage.c b/manage.c
index 2d1bcbb..ddded80 100644
--- a/manage.c
+++ b/manage.c
@@ -43,7 +43,7 @@
#include "memdbg.h"
-#define MANAGEMENT_ECHO_PULL_INFO 0 // JYFIXME
+#define MANAGEMENT_ECHO_PULL_INFO 0 /* JYFIXME */
#if MANAGEMENT_ECHO_PULL_INFO
#define MANAGEMENT_ECHO_FLAGS LOG_PRINT_INTVAL
diff --git a/pkcs11.c b/pkcs11.c
index d0bdbbe..7352e8f 100644
--- a/pkcs11.c
+++ b/pkcs11.c
@@ -119,8 +119,8 @@ static
void
_fixupFixedString (
IN const char * const szSource,
- OUT char * const szTarget, // MUST BE >= nLength+1
- IN const int nLength // FIXED STRING LENGTH
+ OUT char * const szTarget, /* MUST BE >= nLength+1 */
+ IN const int nLength /* FIXED STRING LENGTH */
);
static
void
@@ -273,8 +273,8 @@ static
void
_fixupFixedString (
IN const char * const szSource,
- OUT char * const szTarget, // MUST BE >= nLength+1
- IN const int nLength // FIXED STRING LENGTH
+ OUT char * const szTarget, /* MUST BE >= nLength+1 */
+ IN const int nLength /* FIXED STRING LENGTH */
) {
char *p;
@@ -1865,7 +1865,7 @@ SSL_CTX_use_pkcs11 (
RSA_set_method (rsa, openssl_pkcs11_get_rsa_method (rsa));
rsa->flags |= RSA_FLAG_SIGN_VER;
- // it will be freed when rsa usage count will be zero
+ /* it will be freed when rsa usage count will be zero */
fShouldFreeOpenSSLSession = false;
}
diff --git a/plugin.h b/plugin.h
index bf569d3..1d564a7 100644
--- a/plugin.h
+++ b/plugin.h
@@ -75,7 +75,7 @@ struct plugin {
struct plugin_per_client
{
- //bool initialized; JYFIXME
+ /* bool initialized; JYFIXME */
void *per_client_context[MAX_PLUGINS];
};
diff --git a/socket.c b/socket.c
index ce54cb8..75ae615 100644
--- a/socket.c
+++ b/socket.c
@@ -620,7 +620,7 @@ socket_listen_accept (socket_descriptor_t sd,
volatile int *signal_received)
{
struct gc_arena gc = gc_new ();
- //struct openvpn_sockaddr *remote = &act->dest;
+ /* struct openvpn_sockaddr *remote = &act->dest; */
struct openvpn_sockaddr remote_verify = act->dest;
int new_sd = SOCKET_UNDEFINED;
diff --git a/socket.h b/socket.h
index b73f763..5b7980a 100644
--- a/socket.h
+++ b/socket.h
@@ -80,14 +80,14 @@ typedef uint16_t packet_size_type;
/* OpenVPN sockaddr struct */
struct openvpn_sockaddr
{
- int dummy; // JYFIXME
+ int dummy; /* JYFIXME */
struct sockaddr_in sa;
};
/* actual address of remote, based on source address of received packets */
struct link_socket_actual
{
- int dummy; // JYFIXME
+ int dummy; /* JYFIXME */
struct openvpn_sockaddr dest;
#if ENABLE_IP_PKTINFO
struct in_pktinfo pi;