Skip to contentSkip to conversation

cleanup: remove C++ comments

PATCH In review Alon Bar-Lev 4 participants 5 messages Apr 7, 2012 – May 7, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cleanup: remove C++ comments

---
 src/openvpnserv/openvpnserv.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
src/openvpnserv/openvpnserv.c +3 -3
index a9a9441..56f5a02 100755
@@ -87,9 +87,9 @@ static HANDLE exit_event = NULL;
 /*
  * Message handling
  */
-#define M_INFO    (0)                                  // informational
-#define M_SYSERR  (MSG_FLAGS_ERROR|MSG_FLAGS_SYS_CODE) // error + system code
-#define M_ERR     (MSG_FLAGS_ERROR)                    // error
+#define M_INFO    (0)                                  /* informational */
+#define M_SYSERR  (MSG_FLAGS_ERROR|MSG_FLAGS_SYS_CODE) /* error + system code */
+#define M_ERR     (MSG_FLAGS_ERROR)                    /* error */
 
 /* write error to event log */
 #define MSG(flags, ...) \
Signature · 1 line
1.7.3.4
#1 lore raw

Hi Alon,

2012/4/7 Alon Bar-Lev <[email protected]...>:

Quoted 12 lines

---
 src/openvpnserv/openvpnserv.c |    6 +++---

 1 files changed, 3 insertions(+), 3 deletions(-)
src/openvpnserv/openvpnserv.c +0 -0
index a9a9441..56f5a02 100755
@@ -87,9 +87,9 @@ static HANDLE exit_event = NULL;
  /*
  * Message handling

src/openvpnserv/openvpnserv.c static HANDLE exit_event = NULL; · line 95

Quoted 10 lines
src/openvpnserv/openvpnserv.c +3 -3
  */
-#define M_INFO    (0)                                  // informational
-#define M_SYSERR  (MSG_FLAGS_ERROR|MSG_FLAGS_SYS_CODE) // error + system code
-#define M_ERR     (MSG_FLAGS_ERROR)                    // error
+#define M_INFO    (0)                                  /* informational */
+#define M_SYSERR  (MSG_FLAGS_ERROR|MSG_FLAGS_SYS_CODE) /* error + system code */
+#define M_ERR     (MSG_FLAGS_ERROR)                    /* error */
 
  /* write error to event log */
  #define MSG(flags, ...) \

ACK. Doesn't hurt to be consistent. Are those the only remaining C++-style comments?

(Does someone know what C standard we aim at? "C++ comments" would be just fine for C99.)

Cheers
Fabian

#2 lore raw
Quoted 23 lines · Fabian Knittel

Hi Alon,

2012/4/7 Alon Bar-Lev <[email protected]...>:

Quoted 20 lines

---
 src/openvpnserv/openvpnserv.c |    6 +++---

 1 files changed, 3 insertions(+), 3 deletions(-)
src/openvpnserv/openvpnserv.c +3 -3
index a9a9441..56f5a02 100755
@@ -87,9 +87,9 @@ static HANDLE exit_event = NULL;
  /*
  * Message handling
  */
-#define M_INFO    (0)                                  // informational
-#define M_SYSERR  (MSG_FLAGS_ERROR|MSG_FLAGS_SYS_CODE) // error + system code
-#define M_ERR     (MSG_FLAGS_ERROR)                    // error
+#define M_INFO    (0)                                  /* informational */
+#define M_SYSERR  (MSG_FLAGS_ERROR|MSG_FLAGS_SYS_CODE) /* error + system code */
+#define M_ERR     (MSG_FLAGS_ERROR)                    /* error */
 
Quoted 5 lines

src/openvpnserv/openvpnserv.c static HANDLE exit_event = NULL; · line 95

Quoted 2 lines
src/openvpnserv/openvpnserv.c +0 -0
  /* write error to event log */
  #define MSG(flags, ...) \

ACK. Doesn't hurt to be consistent. Are those the only remaining C++-style comments?

there is one more place I chose to ignore, the service implementation is taken from Microsoft SDK sample, and has C++ comments... to remain close to the original I left this intact.

Quoted 2 lines

(Does someone know what C standard we aim at? "C++ comments" would be just fine for C99.)

Currently openvpn should support C89 based on supported configurations.

Alon.

#3 lore raw

Am 26.04.2012 18:06, schrieb Alon Bar-Lev:

Quoted 31 lines
Quoted 23 lines · Fabian Knittel

Hi Alon,

2012/4/7 Alon Bar-Lev <[email protected]...>:

Quoted 20 lines
---
 src/openvpnserv/openvpnserv.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
src/openvpnserv/openvpnserv.c +3 -3
index a9a9441..56f5a02 100755
@@ -87,9 +87,9 @@ static HANDLE exit_event = NULL;
 /*
 * Message handling
 */
-#define M_INFO    (0)                                  // informational
-#define M_SYSERR  (MSG_FLAGS_ERROR|MSG_FLAGS_SYS_CODE) // error + system code
-#define M_ERR     (MSG_FLAGS_ERROR)                    // error
+#define M_INFO    (0)                                  /* informational */
+#define M_SYSERR  (MSG_FLAGS_ERROR|MSG_FLAGS_SYS_CODE) /* error + system code */
+#define M_ERR     (MSG_FLAGS_ERROR)                    /* error */
 
Quoted 5 lines

src/openvpnserv/openvpnserv.c static HANDLE exit_event = NULL; · line 95

Quoted 2 lines
src/openvpnserv/openvpnserv.c +0 -0
 /* write error to event log */
 #define MSG(flags, ...) \

ACK. Doesn't hurt to be consistent. Are those the only remaining C++-style comments?

Quoted 8 lines

there is one more place I chose to ignore, the service implementation is taken from Microsoft SDK sample, and has C++ comments... to remain close to the original I left this intact.

Quoted 2 lines

(Does someone know what C standard we aim at? "C++ comments" would be just fine for C99.)

Currently openvpn should support C89 based on supported configurations.

Uh, if you rely on recent POSIX revisions you'll need C99 anyways (Solaris 10 used to enforce that, but I've quit looking at Solaris now that Oracle locked it up.)

#4 lore raw
In reply to Alon Bar-Lev

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 3 lines · Alon Bar-Lev

src/openvpnserv/openvpnserv.c | 6 +++--- 1 files changed, 3
insertions(+), 3 deletions(-)

Applied to master on -testing and -stable trees.

commit a9da960dc178a11bdb9de240237f22c646437a46

Author: Alon Bar-Lev <[email protected]...>
Date:   Sat Apr 7 20:42:27 2012 +0300
    cleanup: remove C++ comments

    Signed-off-by: Alon Bar-Lev <[email protected]...>
    Acked-by: Fabian Knittel <[email protected]...>
    Signed-off-by: David Sommerseth <[email protected]...>

kind regards,

David Sommerseth
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk+ZnxAACgkQDC186MBRfrr0OQCdFxQcRiR5AaKX6jFGNLJRODha qvMAnR2PtM/bIYK7S47ym2dgrVt8/WIa
=b4ek
-----END PGP SIGNATURE-----