You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2011/08/23 11:59:42 UTC
svn commit: r1160601 - /subversion/trunk/subversion/libsvn_subr/magic.c
Author: stsp
Date: Tue Aug 23 09:59:42 2011
New Revision: 1160601
URL: http://svn.apache.org/viewvc?rev=1160601&view=rev
Log:
* subversion/libsvn_subr/magic.c
(svn_magic__cookie_t): Put a dummy byte into this structure only
if libmagic support is disabled.
Modified:
subversion/trunk/subversion/libsvn_subr/magic.c
Modified: subversion/trunk/subversion/libsvn_subr/magic.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/magic.c?rev=1160601&r1=1160600&r2=1160601&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/magic.c (original)
+++ subversion/trunk/subversion/libsvn_subr/magic.c Tue Aug 23 09:59:42 2011
@@ -45,8 +45,9 @@
struct svn_magic__cookie_t {
#ifdef SVN_HAVE_LIBMAGIC
magic_t magic;
-#endif
+#else
char dummy;
+#endif
};
#ifdef SVN_HAVE_LIBMAGIC
Re: svn commit: r1160601 -
/subversion/trunk/subversion/libsvn_subr/magic.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Stefan Sperling wrote on Tue, Aug 23, 2011 at 14:26:43 +0200:
> On Tue, Aug 23, 2011 at 01:32:38PM +0300, Daniel Shahaf wrote:
> > Backport?
>
> This shaves one byte off a struct. I don't think it's very important.
>
*shaves*. Sorry, I misread the diff.
> > stsp@apache.org wrote on Tue, Aug 23, 2011 at 09:59:42 -0000:
> > > Author: stsp
> > > Date: Tue Aug 23 09:59:42 2011
> > > New Revision: 1160601
> > >
> > > URL: http://svn.apache.org/viewvc?rev=1160601&view=rev
> > > Log:
> > > * subversion/libsvn_subr/magic.c
> > > (svn_magic__cookie_t): Put a dummy byte into this structure only
> > > if libmagic support is disabled.
> > >
> > > Modified:
> > > subversion/trunk/subversion/libsvn_subr/magic.c
> > >
> > > Modified: subversion/trunk/subversion/libsvn_subr/magic.c
> > > URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/magic.c?rev=1160601&r1=1160600&r2=1160601&view=diff
> > > ==============================================================================
> > > --- subversion/trunk/subversion/libsvn_subr/magic.c (original)
> > > +++ subversion/trunk/subversion/libsvn_subr/magic.c Tue Aug 23 09:59:42 2011
> > > @@ -45,8 +45,9 @@
> > > struct svn_magic__cookie_t {
> > > #ifdef SVN_HAVE_LIBMAGIC
> > > magic_t magic;
> > > -#endif
> > > +#else
> > > char dummy;
> > > +#endif
> > > };
> > >
> > > #ifdef SVN_HAVE_LIBMAGIC
> > >
> > >
Re: svn commit: r1160601 -
/subversion/trunk/subversion/libsvn_subr/magic.c
Posted by Stefan Sperling <st...@elego.de>.
On Tue, Aug 23, 2011 at 01:32:38PM +0300, Daniel Shahaf wrote:
> Backport?
This shaves one byte off a struct. I don't think it's very important.
> stsp@apache.org wrote on Tue, Aug 23, 2011 at 09:59:42 -0000:
> > Author: stsp
> > Date: Tue Aug 23 09:59:42 2011
> > New Revision: 1160601
> >
> > URL: http://svn.apache.org/viewvc?rev=1160601&view=rev
> > Log:
> > * subversion/libsvn_subr/magic.c
> > (svn_magic__cookie_t): Put a dummy byte into this structure only
> > if libmagic support is disabled.
> >
> > Modified:
> > subversion/trunk/subversion/libsvn_subr/magic.c
> >
> > Modified: subversion/trunk/subversion/libsvn_subr/magic.c
> > URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/magic.c?rev=1160601&r1=1160600&r2=1160601&view=diff
> > ==============================================================================
> > --- subversion/trunk/subversion/libsvn_subr/magic.c (original)
> > +++ subversion/trunk/subversion/libsvn_subr/magic.c Tue Aug 23 09:59:42 2011
> > @@ -45,8 +45,9 @@
> > struct svn_magic__cookie_t {
> > #ifdef SVN_HAVE_LIBMAGIC
> > magic_t magic;
> > -#endif
> > +#else
> > char dummy;
> > +#endif
> > };
> >
> > #ifdef SVN_HAVE_LIBMAGIC
> >
> >
Re: svn commit: r1160601 -
/subversion/trunk/subversion/libsvn_subr/magic.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Backport?
stsp@apache.org wrote on Tue, Aug 23, 2011 at 09:59:42 -0000:
> Author: stsp
> Date: Tue Aug 23 09:59:42 2011
> New Revision: 1160601
>
> URL: http://svn.apache.org/viewvc?rev=1160601&view=rev
> Log:
> * subversion/libsvn_subr/magic.c
> (svn_magic__cookie_t): Put a dummy byte into this structure only
> if libmagic support is disabled.
>
> Modified:
> subversion/trunk/subversion/libsvn_subr/magic.c
>
> Modified: subversion/trunk/subversion/libsvn_subr/magic.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/magic.c?rev=1160601&r1=1160600&r2=1160601&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_subr/magic.c (original)
> +++ subversion/trunk/subversion/libsvn_subr/magic.c Tue Aug 23 09:59:42 2011
> @@ -45,8 +45,9 @@
> struct svn_magic__cookie_t {
> #ifdef SVN_HAVE_LIBMAGIC
> magic_t magic;
> -#endif
> +#else
> char dummy;
> +#endif
> };
>
> #ifdef SVN_HAVE_LIBMAGIC
>
>
Re: svn commit: r1160601 -
/subversion/trunk/subversion/libsvn_subr/magic.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Backport?
stsp@apache.org wrote on Tue, Aug 23, 2011 at 09:59:42 -0000:
> Author: stsp
> Date: Tue Aug 23 09:59:42 2011
> New Revision: 1160601
>
> URL: http://svn.apache.org/viewvc?rev=1160601&view=rev
> Log:
> * subversion/libsvn_subr/magic.c
> (svn_magic__cookie_t): Put a dummy byte into this structure only
> if libmagic support is disabled.
>
> Modified:
> subversion/trunk/subversion/libsvn_subr/magic.c
>
> Modified: subversion/trunk/subversion/libsvn_subr/magic.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/magic.c?rev=1160601&r1=1160600&r2=1160601&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_subr/magic.c (original)
> +++ subversion/trunk/subversion/libsvn_subr/magic.c Tue Aug 23 09:59:42 2011
> @@ -45,8 +45,9 @@
> struct svn_magic__cookie_t {
> #ifdef SVN_HAVE_LIBMAGIC
> magic_t magic;
> -#endif
> +#else
> char dummy;
> +#endif
> };
>
> #ifdef SVN_HAVE_LIBMAGIC
>
>