Re: [PATCH] Add include of "svn_dirent_uri.h" to mod_authz_svn.c

[Stefan Sperling]

On Wed, Jan 12, 2011 at 07:50:11PM +, Piper, Nick wrote:
> This is a follow up to a previously submitted patch which was applied, see 
> http://mail-archives.apache.org/mod_mbox/subversion-dev/201011.mbox/%3c87fwvigwgr@stat.home.lan%3e
>  and r1030536 r1030540.
> 
> It seems that patch was missing:
> 
> #include "svn_dirent_uri.h"
> 
> Without this, we get a warning:
> 
> subversion/mod_authz_svn/mod_authz_svn.c:161: warning: assignment makes 
> pointer from integer without a cast
> 
> and subsequent breakage on 64-bit platforms where the return pointer is 
> truncated.
> 
> I'm sorry for this oversight in the original patch.
> 
> Patch against trunk:
> 
> Index: subversion/mod_authz_svn/mod_authz_svn.c
> ===
> --- subversion/mod_authz_svn/mod_authz_svn.c  (revision 1058279)
> +++ subversion/mod_authz_svn/mod_authz_svn.c  (working copy)
> @@ -42,6 +42,7 @@
>  #include "svn_config.h"
>  #include "svn_string.h"
>  #include "svn_repos.h"
> +#include "svn_dirent_uri.h"
>  
>  
>  extern module AP_MODULE_DECLARE_DATA authz_svn_module;

Applied, thanks!

Stefan

[PATCH] Add include of "svn_dirent_uri.h" to mod_authz_svn.c

[Piper, Nick]

This is a follow up to a previously submitted patch which was applied, see 
http://mail-archives.apache.org/mod_mbox/subversion-dev/201011.mbox/%3c87fwvigwgr@stat.home.lan%3e
 and r1030536 r1030540.

It seems that patch was missing:

#include "svn_dirent_uri.h"

Without this, we get a warning:

subversion/mod_authz_svn/mod_authz_svn.c:161: warning: assignment makes pointer 
from integer without a cast

and subsequent breakage on 64-bit platforms where the return pointer is 
truncated.

I'm sorry for this oversight in the original patch.

Patch against trunk:

Index: subversion/mod_authz_svn/mod_authz_svn.c
===
--- subversion/mod_authz_svn/mod_authz_svn.c(revision 1058279)
+++ subversion/mod_authz_svn/mod_authz_svn.c(working copy)
@@ -42,6 +42,7 @@
 #include "svn_config.h"
 #include "svn_string.h"
 #include "svn_repos.h"
+#include "svn_dirent_uri.h"
 
 
 extern module AP_MODULE_DECLARE_DATA authz_svn_module;

-- 
Nick Piper MEng MIET RHCE| #define Joint Lead Architect
250 Brook Drive, Green Park, Reading RG2 6UA | United Kingdom
nick.pi...@logica.com | www.logica.com 
Logica UK Limited, registered in England & Wales (registered number 947968)
Registered Office: 250 Brook Drive, Green Park, Reading RG2 6UA, United Kingdom 


Think green - keep it on the screen.
This e-mail and any attachment is for authorised use by the intended 
recipient(s) only. It may contain proprietary material, confidential 
information and/or be subject to legal privilege. It should not be copied, 
disclosed to, retained or used by, any other party. If you are not an intended 
recipient then please promptly delete this e-mail and any attachment and all 
copies and inform the sender. Thank you.