Author: stsp
Date: Thu Sep 9 11:31:12 2010
New Revision: 995383
URL: http://svn.apache.org/viewvc?rev=995383&view=rev
Log:
* subversion/libsvn_fs_fs/fs_fs.c
(read_rep_line): Properly indent the body of various if-statements.
Use "error" instead of "err" as a goto label, because "err" is the
conventional name for variables of type svn_error_t*.
Use svn_error_return() when returning errors.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=995383&r1=995382&r2=995383&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Thu Sep 9 11:31:12 2010
@@ -2528,26 +2528,31 @@ read_rep_line(struct rep_args **rep_args
/* We have hopefully a DELTA vs. a non-empty base revision. */
str = apr_strtok(buffer, " ", &last_str);
- if (! str || (strcmp(str, REP_DELTA) != 0)) goto err;
+ if (! str || (strcmp(str, REP_DELTA) != 0))
+ goto error;
str = apr_strtok(NULL, " ", &last_str);
- if (! str) goto err;
+ if (! str)
+ goto error;
rep_args->base_revision = SVN_STR_TO_REV(str);
str = apr_strtok(NULL, " ", &last_str);
- if (! str) goto err;
+ if (! str)
+ goto error;
rep_args->base_offset = (apr_off_t) apr_atoi64(str);
str = apr_strtok(NULL, " ", &last_str);
- if (! str) goto err;
+ if (! str)
+ goto error;
rep_args->base_length = (apr_size_t) apr_atoi64(str);
*rep_args_p = rep_args;
return SVN_NO_ERROR;
- err:
- return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
- _("Malformed representation header"));
+ error:
+ return svn_error_return(
+ svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
+ _("Malformed representation header")));
}
/* Given a revision file REV_FILE, opened to REV in FS, find the Node-ID
