[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r35213 - in trunk/subversion: include libsvn_client

From: Greg Stein <gstein_at_gmail.com>
Date: Tue, 13 Jan 2009 10:03:23 -0800

It does kind of suck that the field names end in 64. The undecorated
form is preferable, but (sigh) used by the incorrect stuff...

On Tue, Jan 13, 2009 at 09:35, Bert Huijben <rhuijben_at_sharpsvn.net> wrote:
> Author: rhuijben
> Date: Tue Jan 13 09:35:23 2009
> New Revision: 35213
>
> Log:
> Following up on r35191 and r35207, use svn_filesize_t for the 64 bit filesizes
> in svn_info_t.
>
> * subversion/include/svn_client.h
> (SVN_INFO_SIZE64_UNKNOWN): Remove unused macro.
> (svn_info_t): Use svn_filesize_t for filesizes and document the unavailable
> value as SVN_INVALID_FILESIZE.
> * subversion/libsvn_client/info.c
> (build_info_from_dirent, build_info_from_entry, build_info_for_unversioned):
> Use SVN_INVALID_FILESIZE for unavailable svn_filesize_t values.
>
> Suggested by: gstein
>
> Modified:
> trunk/subversion/include/svn_client.h
> trunk/subversion/libsvn_client/info.c
>
> Modified: trunk/subversion/include/svn_client.h
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/include/svn_client.h?pathrev=35213&r1=35212&r2=35213
> ==============================================================================
> --- trunk/subversion/include/svn_client.h Tue Jan 13 08:48:18 2009 (r35212)
> +++ trunk/subversion/include/svn_client.h Tue Jan 13 09:35:23 2009 (r35213)
> @@ -4305,13 +4305,6 @@ svn_client_unlock(const apr_array_header
> */
> #define SVN_INFO_SIZE_UNKNOWN ((apr_size_t) -1)
>
> -/** The size of the file is unknown.
> - * Used as value in fields of type @c apr_off_t.
> - *
> - * @since New in 1.6
> - */
> -#define SVN_INFO_SIZE64_UNKNOWN ((apr_off_t) -1)
> -
> /**
> * A structure which describes various system-generated metadata about
> * a working-copy path or URL.
> @@ -4399,20 +4392,20 @@ typedef struct svn_info_t
> * The size of the file in the repository (untranslated,
> * e.g. without adjustment of line endings and keyword
> * expansion). Only applicable for file -- not directory -- URLs.
> - * For working copy paths, size64 will be @c SVN_INFO_SIZE64_UNKNOWN.
> + * For working copy paths, size64 will be @c SVN_INVALID_FILESIZE.
> * @since New in 1.6.
> */
> - apr_off_t size64;
> + svn_filesize_t size64;
>
> /**
> * The size of the file after being translated into its local
> - * representation, or @c SVN_INFO_SIZE64_UNKNOWN if
> - * unknown. Not applicable for directories.
> + * representation, or @c SVN_INVALID_FILESIZE if unknown.
> + * Not applicable for directories.
> * @since New in 1.6.
> * @name Working-copy path fields
> * @{
> */
> - apr_off_t working_size64;
> + svn_filesize_t working_size64;
>
> /**
> * Info on any tree conflict of which this node is a victim. Otherwise NULL.
>
> Modified: trunk/subversion/libsvn_client/info.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/info.c?pathrev=35213&r1=35212&r2=35213
> ==============================================================================
> --- trunk/subversion/libsvn_client/info.c Tue Jan 13 08:48:18 2009 (r35212)
> +++ trunk/subversion/libsvn_client/info.c Tue Jan 13 09:35:23 2009 (r35213)
> @@ -64,7 +64,7 @@ build_info_from_dirent(svn_info_t **info
> tmpinfo->size = SVN_INFO_SIZE_UNKNOWN;
>
> tmpinfo->size64 = dirent->size;
> - tmpinfo->working_size = SVN_INFO_SIZE64_UNKNOWN;
> + tmpinfo->working_size = SVN_INVALID_FILESIZE;
> tmpinfo->tree_conflict = NULL;
>
> *info = tmpinfo;
> @@ -113,7 +113,7 @@ build_info_from_entry(svn_info_t **info,
> tmpinfo->working_size = SVN_INFO_SIZE_UNKNOWN;
>
> tmpinfo->size = SVN_INFO_SIZE_UNKNOWN;
> - tmpinfo->size64 = SVN_INFO_SIZE64_UNKNOWN;
> + tmpinfo->size64 = SVN_INVALID_FILESIZE;
>
> tmpinfo->working_size64 = entry->working_size;
>
> @@ -154,8 +154,8 @@ build_info_for_unversioned(svn_info_t **
> tmpinfo->lock = NULL;
> tmpinfo->working_size = SVN_INFO_SIZE_UNKNOWN;
> tmpinfo->size = SVN_INFO_SIZE_UNKNOWN;
> - tmpinfo->size64 = SVN_INFO_SIZE64_UNKNOWN;
> - tmpinfo->working_size64 = SVN_INFO_SIZE64_UNKNOWN;
> + tmpinfo->size64 = SVN_INVALID_FILESIZE;
> + tmpinfo->working_size64 = SVN_INVALID_FILESIZE;
> tmpinfo->tree_conflict = NULL;
>
> *info = tmpinfo;
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=1022501
>
Received on 2009-01-13 19:03:42 CET

This is an archived mail posted to the Subversion Dev mailing list.