Re: [Openvpn-devel] [PATCH] Fix non-C89 comments

2009-01-28 Thread Matthias Andree 
On Tue, 27 Jan 2009, Alon Bar-Lev wrote:

> > Perhaps the choice of version control system used for OpenVPN could
> >  deserve a second thought -- Mercurial or better Git might support such
> >  models or merge queues much better than Subversion does.
> >
> 
> Nope.
> subversion is the simplest one to use.

That's a moot point and depending on requirement no longer true (seems
to me this assertion has always been untrue WRT Mercurial that prints
helpful usage hints all along the way) -- let me state just three points
where I find Mercurial (Hg) or GIT superior to SVN, and that the basic
day-to-day operation is done with the usual set of checkout, diff,
branch, merge, commit, log commands in either of the systems.

(1) selective (partial/interactive) commits of hunks (built-in with Git,
try git commit -i or -p; for Mercurial, there's the record extension
that ships with the tarball proper)

(2) "properties" (svn propedit ... eek) and

(3) cheap & fast & really lightweight tags and branches. No need to
remember URLs and type three lines even for basic operations such as
tagging or branching. SVN is lightweight on the server's repository
database, but heavy on my fingers and local file system...

Further advocacy, comparisons, and tutorials are for other places of the
Internet than this list; let me just point towards Mercurial + MQ, Git
or StGit if you want patch queue handling.

Historical note: If you've last looked at an early Mercurial 0.X
version (current is 1.1.X), or a Git version before 1.5 (current is
beyond 1.6.1), you might want to know that lots of things have improved,
particularly usability and documentation. Git has evolved into a real
version control system that's usable.

-- 
Matthias Andree

Re: [Openvpn-devel] [PATCH] Fix non-C89 comments

2009-01-27 Thread James Yonan 

Matthias Andree wrote:

On Tue, 27 Jan 2009, Alon Bar-Lev wrote:


Sent this to James.
Did not apply.

My queue is at:
http://svn.openvpn.net/projects/openvpn/contrib/alon


Perhaps the choice of version control system used for OpenVPN could
deserve a second thought -- Mercurial or better Git might support such
models or merge queues much better than Subversion does.


I'm on top of this -- Alon's queue including Jos Vos's [PATCH] Fix 
non-C89 comments has been merged:



r3899 | james | 2009-01-27 12:22:42 -0700 (Tue, 27 Jan 2009) | 2 lines
Changed paths:
   M /branches/BETA21/openvpn/proto.h
   M /branches/BETA21/openvpn/route.c

Fixed some issues with C++ style comments that leaked into the code.


r3900 | james | 2009-01-27 12:32:46 -0700 (Tue, 27 Jan 2009) | 2 lines
Changed paths:
   M /branches/BETA21/openvpn/error.c
   M /branches/BETA21/openvpn/ntlm.c
   M /branches/BETA21/openvpn/pkcs11.c
   M /branches/BETA21/openvpn/win32.h

Fixed some compile-time warnings.


r3901 | james | 2009-01-27 13:05:48 -0700 (Tue, 27 Jan 2009) | 2 lines
Changed paths:
   M /branches/BETA21/openvpn/configure.ac

Updated configure.ac to work on MinGW.


r3902 | james | 2009-01-27 13:10:49 -0700 (Tue, 27 Jan 2009) | 2 lines
Changed paths:
   M /branches/BETA21/openvpn/common.h

Updated common.h types for _WIN64.


r3903 | james | 2009-01-27 14:18:51 -0700 (Tue, 27 Jan 2009) | 3 lines
Changed paths:
   M /branches/BETA21/openvpn/ssl.c

Fixed issue involving an #ifdef in a macro reference that breaks early gcc
compilers.




James

Re: [Openvpn-devel] [PATCH] Fix non-C89 comments

2009-01-27 Thread David Sommerseth 



Alon Bar-Lev wrote:

On 1/27/09, Matthias Andree  wrote:

On Tue, 27 Jan 2009, Alon Bar-Lev wrote:

 > Sent this to James.
 > Did not apply.
 >
 > My queue is at:
 > http://svn.openvpn.net/projects/openvpn/contrib/alon


Perhaps the choice of version control system used for OpenVPN could
 deserve a second thought -- Mercurial or better Git might support such
 models or merge queues much better than Subversion does.



Nope.
subversion is the simplest one to use.

Alon.


Luckily for us who find git a lot easier than svn, there is always git-svn 
... even though it's slow to do the fetching, it's a lot more comfortable 
to use.  But once the fetching is done, it's as quick as a SCM should be.


I really do not intend to start a flame war over what's best or not - 
respect that there are different opinions ... but I have used both svn and 
git, and I am of a complete different opinion regarding what is the 
simplest one.



kind regards,

David Sommerseth

Re: [Openvpn-devel] [PATCH] Fix non-C89 comments

2009-01-27 Thread Alon Bar-Lev 
On 1/27/09, Matthias Andree  wrote:
> On Tue, 27 Jan 2009, Alon Bar-Lev wrote:
>
>  > Sent this to James.
>  > Did not apply.
>  >
>  > My queue is at:
>  > http://svn.openvpn.net/projects/openvpn/contrib/alon
>
>
> Perhaps the choice of version control system used for OpenVPN could
>  deserve a second thought -- Mercurial or better Git might support such
>  models or merge queues much better than Subversion does.
>

Nope.
subversion is the simplest one to use.

Alon.

Re: [Openvpn-devel] [PATCH] Fix non-C89 comments

2009-01-27 Thread Matthias Andree 
On Tue, 27 Jan 2009, Alon Bar-Lev wrote:

> Sent this to James.
> Did not apply.
> 
> My queue is at:
> http://svn.openvpn.net/projects/openvpn/contrib/alon

Perhaps the choice of version control system used for OpenVPN could
deserve a second thought -- Mercurial or better Git might support such
models or merge queues much better than Subversion does.

-- 
Matthias Andree

Re: [Openvpn-devel] [PATCH] Fix non-C89 comments

2009-01-27 Thread Alon Bar-Lev 
Sent this to James.
Did not apply.

My queue is at:
http://svn.openvpn.net/projects/openvpn/contrib/alon

On 1/27/09, Matthias Andree  wrote:
> Hi,
>
>  openvpn uses non-C89 //-style comments in two places. Patch to convert
>  these to /* ... */ style comments attached.
>
>  Best
>
>  --
>
> Matthias Andree
>
> --
>  This SF.net email is sponsored by:
>  SourcForge Community
>  SourceForge wants to tell your story.
>  http://p.sf.net/sfu/sf-spreadtheword
> ___
>  Openvpn-devel mailing list
>  Openvpn-devel@lists.sourceforge.net
>  https://lists.sourceforge.net/lists/listinfo/openvpn-devel
>
>
>

[Openvpn-devel] [PATCH] Fix non-C89 comments

2009-01-27 Thread Matthias Andree 
Hi,

openvpn uses non-C89 //-style comments in two places. Patch to convert
these to /* ... */ style comments attached.

Best

-- 
Matthias Andree
Index: proto.h
===
--- proto.h	(Revision 3896)
+++ proto.h	(Arbeitskopie)
@@ -66,15 +66,15 @@

 struct openvpn_arp {
 # define ARP_MAC_ADDR_TYPE 0x0001
-  uint16_t mac_addr_type;   // 0x0001
+  uint16_t mac_addr_type;   /* 0x0001 */

-  uint16_t proto_addr_type; // 0x0800
-  uint8_t  mac_addr_size;   // 0x06
-  uint8_t  proto_addr_size; // 0x04
+  uint16_t proto_addr_type; /* 0x0800 */
+  uint8_t  mac_addr_size;   /* 0x06 */
+  uint8_t  proto_addr_size; /* 0x04 */

 # define ARP_REQUEST 0x0001
 # define ARP_REPLY   0x0002
-  uint16_t arp_command; // 0x0001 for ARP request, 0x0002 for ARP reply
+  uint16_t arp_command; /* 0x0001 for ARP request, 0x0002 for ARP reply */

   uint8_t   mac_src[OPENVPN_ETH_ALEN];
   in_addr_t ip_src;
Index: route.c
===
--- route.c	(Revision 3896)
+++ route.c	(Arbeitskopie)
@@ -1694,7 +1694,7 @@

   if (netmask)
 	{
-	  *netmask = 0xFF00; // FIXME -- get the real netmask of the adapter containing the default gateway
+	  *netmask = 0xFF00; /* FIXME -- get the real netmask of the adapter containing the default gateway */
 	}

   gc_free ();