[PATCH] Reflow overly long lines in subversion/ tree

Any body mind me committing the patch below? (with a somewhat more elaborate
Log message, ofcourse)

Note that the patch affects lines in the bindings and libsvn_fs_fs too.

I did not reflow lines of more than 80 characters in the (perl) native
bindings files and I was not sure how to reflow some of the C++ we have in
javahl.

Log:
[[[
Reflow overly long lines.

* <all changed files go here>
  Reflow lines with more than 80 characters

]]]

Index: subversion/svnadmin/main.c
===================================================================
--- subversion/svnadmin/main.c (revision 9374)
+++ subversion/svnadmin/main.c (working copy)
@@ -613,7 +613,8 @@
 
 /* This implements `svn_opt_subcommand_t'. */
 static svn_error_t *
-list_dblogs (apr_getopt_t *os, void *baton, svn_boolean_t only_unused,
apr_pool_t *pool)
+list_dblogs (apr_getopt_t *os, void *baton, svn_boolean_t only_unused,
+ apr_pool_t *pool)
 {
   struct svnadmin_opt_state *opt_state = baton;
   apr_array_header_t *logfiles;
Index: subversion/libsvn_diff/token.c
===================================================================
--- subversion/libsvn_diff/token.c (revision 9374)
+++ subversion/libsvn_diff/token.c (working copy)
@@ -157,7 +157,8 @@
   hash = 0; /* The callback fn doesn't need to touch it per se */
   while (1)
     {
- SVN_ERR(vtable->datasource_get_next_token(&hash, &token, diff_baton,
datasource));
+ SVN_ERR(vtable->datasource_get_next_token(&hash, &token,
+ diff_baton, datasource));
       if (token == NULL)
         break;
 
Index: subversion/libsvn_diff/diff_file.c
===================================================================
--- subversion/libsvn_diff/diff_file.c (revision 9374)
+++ subversion/libsvn_diff/diff_file.c (working copy)
@@ -301,7 +301,8 @@
 
       curp = endp = file_baton->buffer[idx];
       file_baton->chunk[idx]++;
- length = file_baton->chunk[idx] == last_chunk ?
offset_in_chunk(file_baton->size[idx]) : CHUNK_SIZE;
+ length = file_baton->chunk[idx] == last_chunk ?
+ offset_in_chunk(file_baton->size[idx]) : CHUNK_SIZE;
       endp += length;
       file_baton->endp[idx] = endp;
 
@@ -387,7 +388,8 @@
             {
               /* Read a chunk from disk into a buffer */
               bufp[i] = buffer[i];
- length[i] = total_length > COMPARE_CHUNK_SIZE ?
COMPARE_CHUNK_SIZE : total_length;
+ length[i] = total_length > COMPARE_CHUNK_SIZE ?
+ COMPARE_CHUNK_SIZE : total_length;
 
               SVN_ERR(read_chunk(file_baton->file[idx[i]],
                                  file_baton->path[idx[i]],
Index: subversion/libsvn_diff/diff.c
===================================================================
--- subversion/libsvn_diff/diff.c (revision 9374)
+++ subversion/libsvn_diff/diff.c (working copy)
@@ -47,9 +47,11 @@
 
           (*diff_ref)->type = svn_diff__type_diff_modified;
           (*diff_ref)->original_start = original_start - 1;
- (*diff_ref)->original_length = lcs->position[0]->offset -
original_start;
+ (*diff_ref)->original_length =
+ lcs->position[0]->offset - original_start;
           (*diff_ref)->modified_start = modified_start - 1;
- (*diff_ref)->modified_length = lcs->position[1]->offset -
modified_start;
+ (*diff_ref)->modified_length =
+ lcs->position[1]->offset - modified_start;
           (*diff_ref)->latest_start = 0;
           (*diff_ref)->latest_length = 0;
 
Index: subversion/libsvn_diff/diff4.c
===================================================================
--- subversion/libsvn_diff/diff4.c (revision 9374)
+++ subversion/libsvn_diff/diff4.c (working copy)
@@ -81,16 +81,17 @@
    5. Added line in affected text range in P: this is a dependency problem
       -- part of the change T:18-T:19 depends on changes introduced to T
after
       B branched. There are several possible behaviors, depending on what
the
- user wants. One is to generate an informative error, stating that
T:18-T:19
- depends on some other change (T:N-T:M, where N>=8, M<=18, and M-N ==
1);
- the exact revisions can be discovered automatically using the same
process
- as "cvs annotate", though it may take some time to do so. Another
option is
- to include the change in P, as an insertion of the "after" version of
the
- text, and adjust line numbers and mappings accordingly. (And if all
this
- isn't sounding a lot like a directory merge algorithm, try drinking
more of
- the Kool-Aid.) A third option is to include it as an insertion, but
with
- metadata (such as CVS-style conflict markers) indicating that the
line
- attempting to be patched does not exist in B.
+ user wants. One is to generate an informative error, stating that
+ T:18-T:19 depends on some other change (T:N-T:M, where N>=8, M<=18,
+ and M-N == 1); the exact revisions can be discovered automatically
using
+ the same process as "cvs annotate", though it may take some time to
do
+ so. Another option is to include the change in P, as an insertion of
the
+ "after" version of the text, and adjust line numbers and mappings
+ accordingly. (And if all this isn't sounding a lot like a directory
+ merge algorithm, try drinking more of the Kool-Aid.) A third option
is
+ to include it as an insertion, but with metadata (such as CVS-style
+ conflict markers) indicating that the line attempting to be patched
+ does not exist in B.
 
    6. Deleted line that is in-range in P: request another universe -- this
       situation can't happen in ours.
@@ -261,7 +262,8 @@
     {
       if (hunk->type == svn_diff__type_conflict)
         {
- svn_diff__resolve_conflict(hunk, &position_list[1],
&position_list[2], pool);
+ svn_diff__resolve_conflict(hunk, &position_list[1],
+ &position_list[2], pool);
         }
     }
 
Index: subversion/libsvn_subr/xml.c
===================================================================
--- subversion/libsvn_subr/xml.c (revision 9374)
+++ subversion/libsvn_subr/xml.c (working copy)
@@ -428,7 +428,8 @@
 {
   if (*str == NULL)
     *str = svn_stringbuf_create ("", pool);
- svn_stringbuf_appendcstr (*str, "<?xml version=\"1.0\"
encoding=\"utf-8\"?>\n");
+ svn_stringbuf_appendcstr (*str,
+ "<?xml version=\"1.0\"
encoding=\"utf-8\"?>\n");
 }
 
 
Index: subversion/libsvn_subr/config_file.c
===================================================================
--- subversion/libsvn_subr/config_file.c (revision 9374)
+++ subversion/libsvn_subr/config_file.c (working copy)
@@ -858,7 +858,8 @@
         APR_EOL_STR
         "### ssl-trust-default-ca Trust the system 'default' CAs"
         APR_EOL_STR
- "### ssl-client-cert-file PKCS#12 format client certificate
file"
+ "### ssl-client-cert-file PKCS#12 format client "
+ "certificate file"
         APR_EOL_STR
         "### ssl-client-cert-password Client Key password, if needed."
         APR_EOL_STR
Index: subversion/libsvn_client/resolved.c
===================================================================
--- subversion/libsvn_client/resolved.c (revision 9374)
+++ subversion/libsvn_client/resolved.c (working copy)
@@ -46,7 +46,8 @@
                                    recursive ? -1 : 0, pool));
 
   SVN_ERR (svn_wc_resolved_conflict (path, adm_access, TRUE, TRUE,
recursive,
- ctx->notify_func, ctx->notify_baton,
pool));
+ ctx->notify_func,
+ ctx->notify_baton, pool));
 
   SVN_ERR (svn_wc_adm_close (adm_access));
 
Index: subversion/bindings/java/javahl/native/JNIByteArray.h
===================================================================
--- subversion/bindings/java/javahl/native/JNIByteArray.h (revision 9374)
+++ subversion/bindings/java/javahl/native/JNIByteArray.h (working copy)
@@ -41,4 +41,5 @@
 
 };
 
-#endif //
!defined(AFX_JNIBYTEARRAY_H__FB74054F_CD5E_41D5_A4B0_25DE9A8574CF__INCLUDED_)
+#endif
+//!defined(AFX_JNIBYTEARRAY_H__FB74054F_CD5E_41D5_A4B0_25DE9A8574CF__INCLUDED_)
Index: subversion/bindings/java/javahl/native/Notify.h
===================================================================
--- subversion/bindings/java/javahl/native/Notify.h (revision 9374)
+++ subversion/bindings/java/javahl/native/Notify.h (working copy)
@@ -79,4 +79,5 @@
 
 };
 
-#endif //
!defined(AFX_NOTIFY_H__10E278E8_EA8C_4BD1_AF10_4DB1C0608F65__INCLUDED_)
+#endif
+// !defined(AFX_NOTIFY_H__10E278E8_EA8C_4BD1_AF10_4DB1C0608F65__INCLUDED_)
Index: subversion/bindings/java/javahl/native/MessageReceiver.h
===================================================================
--- subversion/bindings/java/javahl/native/MessageReceiver.h (revision 9374)
+++ subversion/bindings/java/javahl/native/MessageReceiver.h (working copy)
@@ -20,4 +20,5 @@
 
 };
 
-#endif //
!defined(AFX_MESSAGERECEIVER_H__D30A4B70_A630_45B3_AB3E_402A5AD7E6BA__INCLUDED_)
+#endif
+//
!defined(AFX_MESSAGERECEIVER_H__D30A4B70_A630_45B3_AB3E_402A5AD7E6BA__INCLUDED_)
Index: subversion/bindings/java/javahl/native/JNIUtil.h
===================================================================
--- subversion/bindings/java/javahl/native/JNIUtil.h (revision 9374)
+++ subversion/bindings/java/javahl/native/JNIUtil.h (working copy)
@@ -64,7 +64,9 @@
         enum { formatBufferSize = 2048 };
         enum { noLog, errorLog, exceptionLog, entryLog } LogLevel;
 private:
- static void assembleErrorMessage(svn_error_t *err, int depth, apr_status_t
parent_apr_err, std::string &buffer);
+ static void assembleErrorMessage(svn_error_t *err, int depth,
+ apr_status_t parent_apr_err,
+ std::string &buffer);
         static Pool * g_requestPool;
         static int g_logLevel;
         static void setExceptionThrown();
@@ -79,4 +81,5 @@
         static std::ofstream g_logStream;
 };
 
-#endif //
!defined(AFX_JNIUTIL_H__82301908_C6CB_4A77_8A28_899E72FBEEFF__INCLUDED_)
+#endif
+// !defined(AFX_JNIUTIL_H__82301908_C6CB_4A77_8A28_899E72FBEEFF__INCLUDED_)
Index: subversion/bindings/java/javahl/native/Outputer.h
===================================================================
--- subversion/bindings/java/javahl/native/Outputer.h (revision 9374)
+++ subversion/bindings/java/javahl/native/Outputer.h (working copy)
@@ -15,7 +15,8 @@
 class Outputer
 {
         jobject m_jthis;
- static svn_error_t *write(void *baton, const char *buffer, apr_size_t
*len);
+ static svn_error_t *write(void *baton,
+ const char *buffer, apr_size_t *len);
         static svn_error_t *close(void *baton);
 public:
         Outputer(jobject jthis);
@@ -24,4 +25,5 @@
 
 };
 
-#endif //
!defined(AFX_OUTPUTER_H__C4342EBB_BD8A_4DA3_A6B8_BC28CF9B3DF1__INCLUDED_)
+#endif
+//
!defined(AFX_OUTPUTER_H__C4342EBB_BD8A_4DA3_A6B8_BC28CF9B3DF1__INCLUDED_)
Index: subversion/bindings/java/javahl/native/BlameCallback.h
===================================================================
--- subversion/bindings/java/javahl/native/BlameCallback.h (revision 9374)
+++ subversion/bindings/java/javahl/native/BlameCallback.h (working copy)
@@ -33,7 +33,8 @@
 public:
         BlameCallback(jobject jcallback);
         virtual ~BlameCallback();
- void callback(svn_revnum_t revision, const char *author, const char *date,
const char *line, apr_pool_t *pool);
+ void callback(svn_revnum_t revision, const char *author,
+ const char *date, const char *line, apr_pool_t
*pool);
 private:
         jobject m_callback;
 };
Index: subversion/bindings/java/javahl/native/Revision.h
===================================================================
--- subversion/bindings/java/javahl/native/Revision.h (revision 9374)
+++ subversion/bindings/java/javahl/native/Revision.h (working copy)
@@ -36,11 +36,13 @@
 public:
     static const svn_opt_revision_kind START;
     static const svn_opt_revision_kind HEAD;
- Revision(jobject jthis, bool headIfUnspecified = false, bool
oneIfUnspecified = false);
- Revision (const svn_opt_revision_kind kind =
svn_opt_revision_unspecified);
- ~Revision();
+ Revision(jobject jthis, bool headIfUnspecified = false,
+ bool oneIfUnspecified = false);
+ Revision(const svn_opt_revision_kind kind =
svn_opt_revision_unspecified);
+ ~Revision();
     const svn_opt_revision_t *revision () const;
 
 };
 
-#endif //
!defined(AFX_REVISION_H__BEAA0788_C9D9_4A67_B94E_761ABC68ACFE__INCLUDED_)
+#endif
+//
!defined(AFX_REVISION_H__BEAA0788_C9D9_4A67_B94E_761ABC68ACFE__INCLUDED_)
Index: subversion/bindings/java/javahl/native/SVNBase.h
===================================================================
--- subversion/bindings/java/javahl/native/SVNBase.h (revision 9374)
+++ subversion/bindings/java/javahl/native/SVNBase.h (working copy)
@@ -17,4 +17,5 @@
 
 };
 
-#endif //
!defined(AFX_SVNBASE_H__ABF82C7E_0C50_40EA_8C88_2DFDF20B3A47__INCLUDED_)
+#endif
+// !defined(AFX_SVNBASE_H__ABF82C7E_0C50_40EA_8C88_2DFDF20B3A47__INCLUDED_)
Index: subversion/bindings/java/javahl/native/JNIMutex.h
===================================================================
--- subversion/bindings/java/javahl/native/JNIMutex.h (revision 9374)
+++ subversion/bindings/java/javahl/native/JNIMutex.h (working copy)
@@ -39,4 +39,5 @@
         apr_thread_mutex_t * f_mutex;
 };
 
-#endif //
!defined(AFX_JNIMUTEX_H__958B52A6_00A3_458F_981F_0A3095D39EE8__INCLUDED_)
+#endif
+//
!defined(AFX_JNIMUTEX_H__958B52A6_00A3_458F_981F_0A3095D39EE8__INCLUDED_)
Index: subversion/bindings/java/javahl/native/SVNClient.h
===================================================================
--- subversion/bindings/java/javahl/native/SVNClient.h (revision 9374)
+++ subversion/bindings/java/javahl/native/SVNClient.h (working copy)
@@ -42,42 +42,61 @@
 public:
         const char * getConfigDirectory();
         void setConfigDirectory(const char *configDir);
- jbyteArray blame(const char *path, Revision& revisionStart, Revision
&revisionEnd);
- void blame(const char *path, Revision &revisionStart, Revision
&revisionEnd, BlameCallback *callback);
- void relocate(const char *from, const char *to, const char *path, bool
recurse);
+ jbyteArray blame(const char *path, Revision& revisionStart,
+ Revision &revisionEnd);
+ void blame(const char *path, Revision &revisionStart,
+ Revision &revisionEnd, BlameCallback *callback);
+ void relocate(const char *from, const char *to, const char *path,
+ bool recurse);
         jbyteArray fileContent(const char *path, Revision &revision);
- void propertyCreate(const char *path, const char *name, JNIByteArray
&value, bool recurse);
- void propertyCreate(const char *path, const char *name, const char *value,
bool recurse);
+ void propertyCreate(const char *path, const char *name,
+ JNIByteArray &value, bool recurse);
+ void propertyCreate(const char *path, const char *name,
+ const char *value, bool recurse);
         void propertyRemove(const char *path, const char *name, bool recurse);
- void propertySet(const char *path, const char *name, JNIByteArray &value,
bool recurse);
- void propertySet(const char *path, const char *name, const char *value,
bool recurse);
+ void propertySet(const char *path, const char *name,
+ JNIByteArray &value, bool recurse);
+ void propertySet(const char *path, const char *name, const char *value,
+ bool recurse);
         jobjectArray properties(jobject jthis, const char *path);
- void merge(const char *path1, Revision &revision1, const char *path2,
Revision &revision2,const char *localPath, bool force, bool recurse);
- void doImport(const char *path, const char *url, const char *message, bool
recurse);
- jlong doSwitch(const char *path, const char *url, Revision &revision, bool
recurse);
+ void merge(const char *path1, Revision &revision1, const char *path2,
+ Revision &revision2, const char *localPath, bool force,
+ bool recurse);
+ void doImport(const char *path, const char *url, const char *message,
+ bool recurse);
+ jlong doSwitch(const char *path, const char *url, Revision &revision,
+ bool recurse);
         jlong doExport(const char *srcPath, const char *destPath, Revision
&revision, bool force);
         void resolved(const char *path, bool recurse);
         void cleanup(const char *path);
         void mkdir(Targets &targets, const char *message);
- void move(const char *srcPath, const char *destPath, const char *message,
Revision &revision, bool force);
- void copy(const char *srcPath, const char *destPath, const char *message,
Revision &revision);
+ void move(const char *srcPath, const char *destPath,
+ const char *message, Revision &revision, bool force);
+ void copy(const char *srcPath, const char *destPath,
+ const char *message, Revision &revision);
         jlong commit(Targets &targets, const char *message, bool recurse);
         jlong update(const char *path, Revision &revision, bool recurse);
         void add(const char *path, bool recurse);
         void revert(const char *path, bool recurse);
         void remove(Targets &targets, const char *message,bool force);
         void notification(Notify *notify);
- jlong checkout(const char *moduleName, const char *destPath, Revision
&revision, bool recurse);
- jobjectArray logMessages(const char *path, Revision &revisionStart,
Revision &revisionEnd);
+ jlong checkout(const char *moduleName, const char *destPath,
+ Revision &revision, bool recurse);
+ jobjectArray logMessages(const char *path, Revision &revisionStart,
+ Revision &revisionEnd);
         void setPrompt(Prompter *prompter);
         void password(const char *password);
         void username(const char *username);
         jobject singleStatus(const char *path, bool onServer);
- jobjectArray status(const char *path, bool descend, bool onServer, bool
getAll, bool noIgnore);
+ jobjectArray status(const char *path, bool descend, bool onServer,
+ bool getAll, bool noIgnore);
         jobjectArray list(const char *url, Revision &revision, bool recurse);
- jobject revProperty(jobject jthis, const char *path, const char *name,
Revision &rev);
+ jobject revProperty(jobject jthis, const char *path, const char *name,
+ Revision &rev);
         jobject propertyGet(jobject jthis, const char *path, const char *name);
- void diff(const char *target1, Revision &revision1, const char *target2,
Revision &revision2, const char *outfileName,bool recurse);
+ void diff(const char *target1, Revision &revision1,
+ const char *target2, Revision &revision2,
+ const char *outfileName,bool recurse);
 
         const char * getLastPath();
         void finalize();
@@ -87,26 +106,38 @@
         SVNClient();
         virtual ~SVNClient();
 private:
- void propertySet(const char *path, const char *name, svn_string_t *value,
bool recurse);
- jobject createJavaProperty(jobject jthis, const char *path, const char
*name, svn_string_t *value);
+ void propertySet(const char *path, const char *name,
+ svn_string_t *value, bool recurse);
+ jobject createJavaProperty(jobject jthis, const char *path,
+ const char *name, svn_string_t *value);
         jobject createJavaDirEntry(const char *path, svn_dirent_t *dirent);
         svn_client_ctx_t * getContext(const char *message);
         Notify *m_notify;
         Prompter *m_prompter;
     Path m_lastPath;
- static svn_error_t *getCommitMessage(const char **log_msg, const char
**tmp_file,
- apr_array_header_t *commit_items, void
*baton,
- apr_pool_t *pool);
- void *getCommitMessageBaton(const char *message, const char *baseDir =
NULL);
+ static svn_error_t *getCommitMessage(const char **log_msg,
+ const char **tmp_file,
+ apr_array_header_t
*commit_items,
+ void *baton,
+ apr_pool_t *pool);
+ void *getCommitMessageBaton(const char *message,
+ const char *baseDir = NULL);
     std::string m_userName;
     std::string m_passWord;
         std::string m_configDir;
- static jobject createJavaStatus(const char *path, svn_wc_status_t
*status);
+ static jobject createJavaStatus(const char *path,
+ svn_wc_status_t *status);
         static jint mapStatusKind(int svnKind);
- static svn_error_t *messageReceiver (void *baton, apr_hash_t *
changed_paths,
- svn_revnum_t rev, const char *author, const char *date,
- const char *msg, apr_pool_t * pool);
- static void statusReceiver(void *baton, const char *path, svn_wc_status_t
*status);
+ static svn_error_t *messageReceiver(void *baton,
+ apr_hash_t * changed_paths,
+ svn_revnum_t rev,
+ const char *author,
+ const char *date,
+ const char *msg,
+ apr_pool_t * pool);
+ static void statusReceiver(void *baton,
+ const char *path, svn_wc_status_t
*status);
 };
 
-#endif //
!defined(AFX_SVNCLIENT_H__B5A135CD_3D7C_4ABC_8D75_643B14507979__INCLUDED_)
+#endif
+//
!defined(AFX_SVNCLIENT_H__B5A135CD_3D7C_4ABC_8D75_643B14507979__INCLUDED_)
Index: subversion/bindings/java/javahl/native/Prompter.h
===================================================================
--- subversion/bindings/java/javahl/native/Prompter.h (revision 9374)
+++ subversion/bindings/java/javahl/native/Prompter.h (working copy)
@@ -38,26 +38,43 @@
         Prompter(jobject jprompter, bool v2, bool v3);
         bool prompt(const char *realm, const char *username, bool maySave);
         bool askYesNo(const char *realm, const char *question, bool yesIsDefault);
- const char *askQuestion(const char *realm, const char *question, bool
showAnswer, bool maySave);
+ const char *askQuestion(const char *realm, const char *question,
+ bool showAnswer, bool maySave);
         int askTrust(const char *question, bool maySave);
         jstring password();
         jstring username();
- static svn_error_t *simple_prompt(svn_auth_cred_simple_t **cred_p, void
*baton,
- const char *realm, const char *username,
- svn_boolean_t may_save, apr_pool_t *pool);
- static svn_error_t *username_prompt(svn_auth_cred_username_t **cred_p,
void *baton,
- const char *realm, svn_boolean_t may_save,
- apr_pool_t *pool);
- static svn_error_t
*ssl_server_trust_prompt(svn_auth_cred_ssl_server_trust_t **cred_p,
- void *baton,const char *realm, apr_uint32_t failures,
- const svn_auth_ssl_server_cert_info_t *cert_info,
- svn_boolean_t may_save,apr_pool_t *pool);
- static svn_error_t *ssl_client_cert_prompt(svn_auth_cred_ssl_client_cert_t
**cred_p,
- void *baton, const char *realm, svn_boolean_t may_save,
- apr_pool_t *pool);
- static svn_error_t
*ssl_client_cert_pw_prompt(svn_auth_cred_ssl_client_cert_pw_t **cred_p,
- void *baton, const char *realm, svn_boolean_t may_save,
- apr_pool_t *pool);
+ static
+ svn_error_t *simple_prompt(svn_auth_cred_simple_t **cred_p,
+ void *baton, const char *realm,
+ const char *username,
+ svn_boolean_t may_save,
+ apr_pool_t *pool);
+ static svn_error_t *username_prompt
+ (svn_auth_cred_username_t **cred_p,
+ void *baton,
+ const char *realm,
+ svn_boolean_t may_save,
+ apr_pool_t *pool);
+ static svn_error_t *ssl_server_trust_prompt
+ (svn_auth_cred_ssl_server_trust_t **cred_p,
+ void *baton,
+ const char *realm,
+ apr_uint32_t failures,
+ const svn_auth_ssl_server_cert_info_t *cert_info,
+ svn_boolean_t may_save,
+ apr_pool_t *pool);
+ static svn_error_t *ssl_client_cert_prompt
+ (svn_auth_cred_ssl_client_cert_t **cred_p,
+ void *baton,
+ const char *realm,
+ svn_boolean_t may_save,
+ apr_pool_t *pool);
+ static svn_error_t *ssl_client_cert_pw_prompt
+ (svn_auth_cred_ssl_client_cert_pw_t **cred_p,
+ void *baton,
+ const char *realm,
+ svn_boolean_t may_save,
+ apr_pool_t *pool);
         std::string m_answer;
         bool m_maySave;
 public:
@@ -70,4 +87,5 @@
         svn_auth_provider_object_t *getProviderClientSSLPassword();
 };
 
-#endif //
!defined(AFX_PROMPTER_H__6833BB77_DDCC_4BF8_A995_5A5CBC48DF4C__INCLUDED_)
+#endif
+//
!defined(AFX_PROMPTER_H__6833BB77_DDCC_4BF8_A995_5A5CBC48DF4C__INCLUDED_)
Index: subversion/bindings/java/javahl/native/Targets.h
===================================================================
--- subversion/bindings/java/javahl/native/Targets.h (revision 9374)
+++ subversion/bindings/java/javahl/native/Targets.h (working copy)
@@ -46,4 +46,5 @@
 
 };
 
-#endif //
!defined(AFX_TARGETS_H__61202731_41A4_43FF_97C4_7E26DC255BF1__INCLUDED_)
+#endif
+// !defined(AFX_TARGETS_H__61202731_41A4_43FF_97C4_7E26DC255BF1__INCLUDED_)
Index: subversion/bindings/java/javahl/native/SVNAdmin.h
===================================================================
--- subversion/bindings/java/javahl/native/SVNAdmin.h (revision 9374)
+++ subversion/bindings/java/javahl/native/SVNAdmin.h (working copy)
@@ -19,18 +19,25 @@
 class SVNAdmin : public SVNBase
 {
 public:
- void verify(const char *path, Outputer &messageOut, Revision
&revisionStart, Revision &revisionEnd);
- void setLog(const char *path, Revision &revision, const char *message,
bool bypassHooks);
+ void verify(const char *path, Outputer &messageOut,
+ Revision &revisionStart, Revision &revisionEnd);
+ void setLog(const char *path, Revision &revision,
+ const char *message, bool bypassHooks);
         void rmtxns(const char *path, Targets &transactions);
         jlong recover(const char *path);
         void lstxns(const char *path, MessageReceiver &messageReceiver);
- void load(const char *path, Inputer &dataIn, Outputer &messageOut, bool
ignoreUUID, bool forceUUID, const char *relativePath);
- void listUnusedDBLogs(const char *path, MessageReceiver &messageReceiver);
+ void load(const char *path, Inputer &dataIn, Outputer &messageOut,
+ bool ignoreUUID, bool forceUUID, const char
*relativePath);
+ void listUnusedDBLogs(const char *path,
+ MessageReceiver &messageReceiver);
         void listDBLogs(const char *path, MessageReceiver &messageReceiver);
         void hotcopy(const char *path, const char *targetPath, bool cleanLogs);
- void dump(const char *path, Outputer &dataOut, Outputer &messageOut,
Revision &revsionStart, Revision &RevisionEnd, bool incremental);
+ void dump(const char *path, Outputer &dataOut, Outputer &messageOut,
+ Revision &revsionStart, Revision &RevisionEnd,
+ bool incremental);
         void deltify(const char *path, Revision &start, Revision &end);
- void create(const char *path, bool ignoreUUID, bool forceUUID, const char
*configPath);
+ void create(const char *path, bool ignoreUUID, bool forceUUID,
+ const char *configPath);
         SVNAdmin();
         virtual ~SVNAdmin();
         jlong getCppAddr();
@@ -40,4 +47,5 @@
 
 };
 
-#endif //
!defined(AFX_SVNADMIN_H__9AD95B26_47BF_4430_8217_20B87ACCE87B__INCLUDED_)
+#endif
+//
!defined(AFX_SVNADMIN_H__9AD95B26_47BF_4430_8217_20B87ACCE87B__INCLUDED_)
Index: subversion/bindings/java/javahl/native/JNIStackElement.h
===================================================================
--- subversion/bindings/java/javahl/native/JNIStackElement.h (revision 9374)
+++ subversion/bindings/java/javahl/native/JNIStackElement.h (working copy)
@@ -34,7 +34,8 @@
 class JNIStackElement
 {
 public:
- JNIStackElement(JNIEnv *env, const char *clazz, const char *method,
jobject jthis);
+ JNIStackElement(JNIEnv *env, const char *clazz,
+ const char *method, jobject jthis);
         virtual ~JNIStackElement();
 
 private:
Index: subversion/bindings/java/javahl/native/version.h
===================================================================
--- subversion/bindings/java/javahl/native/version.h (revision 9374)
+++ subversion/bindings/java/javahl/native/version.h (working copy)
@@ -19,7 +19,8 @@
 #define JNI_VER_MINOR 8
 #define JNI_VER_MICRO 0
 
-#define JNI_VER_NUM APR_STRINGIFY(JNI_VER_MAJOR) "."
APR_STRINGIFY(JNI_VER_MINOR) "." APR_STRINGIFY(JNI_VER_MICRO)
+#define JNI_VER_NUM APR_STRINGIFY(JNI_VER_MAJOR) "." \
+ APR_STRINGIFY(JNI_VER_MINOR) "." APR_STRINGIFY(JNI_VER_MICRO)
 
 /** Version number with tag (contains no whitespace) */
 #define JNI_VER_NUMBER JNI_VER_NUM
Index: subversion/bindings/java/javahl/native/Inputer.h
===================================================================
--- subversion/bindings/java/javahl/native/Inputer.h (revision 9374)
+++ subversion/bindings/java/javahl/native/Inputer.h (working copy)
@@ -23,4 +23,5 @@
         svn_stream_t *getStream(const Pool & pool);
 };
 
-#endif //
!defined(AFX_INPUTER_H__6896EB42_07D2_406B_A4A5_F2908AFF4815__INCLUDED_)
+#endif
+// !defined(AFX_INPUTER_H__6896EB42_07D2_406B_A4A5_F2908AFF4815__INCLUDED_)
Index: subversion/bindings/swig/java/libsvn_swig_java/swigutil_java_cache.h
===================================================================

---
subversion/bindings/swig/java/libsvn_swig_java/swigutil_java_cache.h	(revision
9374)
+++
subversion/bindings/swig/java/libsvn_swig_java/swigutil_java_cache.h	(working
copy)
@@ -19,7 +19,9 @@
  * @brief Caching of Java class references and method IDs.
  */
 
-#if defined(SVN_SWIG_JAVA_DEFINE_CACHE) ||
defined(SVN_SWIG_JAVA_INIT_CACHE) || defined(SVN_SWIG_JAVA_TERM_CACHE) ||
!defined(SVN_SWIG_JAVACACHE_INCLUDED)
+#if defined(SVN_SWIG_JAVA_DEFINE_CACHE) ||
defined(SVN_SWIG_JAVA_INIT_CACHE) \
+    || defined(SVN_SWIG_JAVA_TERM_CACHE) || \
+    !defined(SVN_SWIG_JAVACACHE_INCLUDED)
 
 #ifdef __cplusplus
 extern "C" {
@@ -94,20 +96,34 @@
 
 SVN_SWIG_JAVA_CACHE_CLASS_DEF(jenv,svn_swig_java_cls_long,"java/lang/Long")
SVN_SWIG_JAVA_CACHE_CLASS_DEF(jenv,svn_swig_java_cls_string,"java/lang/String")
-SVN_SWIG_JAVA_CACHE_CLASS_DEF(jenv,svn_swig_java_cls_outofmemoryerror,"java/lang/OutOfMemoryError")
-SVN_SWIG_JAVA_CACHE_CLASS_DEF(jenv,svn_swig_java_cls_outputstream,"java/io/OutputStream")
-SVN_SWIG_JAVA_CACHE_CLASS_DEF(jenv,svn_swig_java_cls_inputstream,"java/io/InputStream")
-SVN_SWIG_JAVA_CACHE_CLASS_DEF(jenv,svn_swig_java_cls_list,"java/util/ArrayList")
+SVN_SWIG_JAVA_CACHE_CLASS_DEF(jenv,svn_swig_java_cls_outofmemoryerror,
+                              "java/lang/OutOfMemoryError")
+SVN_SWIG_JAVA_CACHE_CLASS_DEF(jenv,svn_swig_java_cls_outputstream,
+                              "java/io/OutputStream")
+SVN_SWIG_JAVA_CACHE_CLASS_DEF(jenv,svn_swig_java_cls_inputstream,
+                              "java/io/InputStream")
+SVN_SWIG_JAVA_CACHE_CLASS_DEF(jenv,svn_swig_java_cls_list,
+                              "java/util/ArrayList")
 SVN_SWIG_JAVA_CACHE_CLASS_DEF(jenv,svn_swig_java_cls_list,"java/util/List")
SVN_SWIG_JAVA_CACHE_CLASS_DEF(jenv,svn_swig_java_cls_list,"java/util/Map")
-SVN_SWIG_JAVA_CACHE_CLASS_DEF(jenv,svn_swig_java_cls_subversionexception,"org/tigris/subversion/SubversionException")
-SVN_SWIG_JAVA_CACHE_CLASS_DEF(jenv,svn_swig_java_cls_clientprompt,"org/tigris/subversion/client/ClientPrompt")
+SVN_SWIG_JAVA_CACHE_CLASS_DEF(jenv,svn_swig_java_cls_subversionexception,
+                              "org/tigris/subversion/SubversionException")
+SVN_SWIG_JAVA_CACHE_CLASS_DEF(jenv,svn_swig_java_cls_clientprompt,
+                              "org/tigris/subversion/client/ClientPrompt")
-SVN_SWIG_JAVA_CACHE_METHOD_DEF(jenv,svn_swig_java_mid_long_longvalue,svn_swig_java_cls_long,"longValue","()J")
-SVN_SWIG_JAVA_CACHE_METHOD_DEF(jenv,svn_swig_java_mid_outputstream_write,svn_swig_java_cls_outputstream,"write","([B)V")
-SVN_SWIG_JAVA_CACHE_METHOD_DEF(jenv,svn_swig_java_mid_inputstream_read,svn_swig_java_cls_inputstream,"read","([B)I")
-SVN_SWIG_JAVA_CACHE_METHOD_DEF(jenv,svn_swig_java_mid_subversionexception_init,svn_swig_java_cls_subversionexception,"<init>","(Ljava/lang/String;Ljava/lang/Throwable;JLjava/lang/String;J)V")
-SVN_SWIG_JAVA_CACHE_METHOD_DEF(jenv,svn_swig_java_mid_clientprompt_prompt,svn_swig_java_cls_clientprompt,"prompt","(Ljava/lang/String;Z)Ljava/lang/String;")
+SVN_SWIG_JAVA_CACHE_METHOD_DEF(jenv,svn_swig_java_mid_long_longvalue,
+                               svn_swig_java_cls_long,"longValue","()J")
+SVN_SWIG_JAVA_CACHE_METHOD_DEF(jenv,svn_swig_java_mid_outputstream_write,
+                              
svn_swig_java_cls_outputstream,"write","([B)V")
+SVN_SWIG_JAVA_CACHE_METHOD_DEF(jenv,svn_swig_java_mid_inputstream_read,
+                              
svn_swig_java_cls_inputstream,"read","([B)I")
+SVN_SWIG_JAVA_CACHE_METHOD_DEF(jenv,svn_swig_java_mid_subversionexception_init,
+                              
svn_swig_java_cls_subversionexception,"<init>",
+                               "(Ljava/lang/String;Ljava/lang/Throwable;"
+                               "JLjava/lang/String;J)V")
+SVN_SWIG_JAVA_CACHE_METHOD_DEF(jenv,svn_swig_java_mid_clientprompt_prompt,
+                               svn_swig_java_cls_clientprompt,"prompt",
+                               "(Ljava/lang/String;Z)Ljava/lang/String;")
 
 SVN_SWIG_JAVA_CACHE_END
 
Index: subversion/bindings/swig/java/libsvn_swig_java/swigutil_java.c
===================================================================
--- subversion/bindings/swig/java/libsvn_swig_java/swigutil_java.c	(revision
9374)
+++ subversion/bindings/swig/java/libsvn_swig_java/swigutil_java.c	(working
copy)
@@ -39,15 +39,19 @@
 #   define JCALL1(func, jenv, ar1) jenv->func(ar1)
 #   define JCALL2(func, jenv, ar1, ar2) jenv->func(ar1, ar2)
 #   define JCALL3(func, jenv, ar1, ar2, ar3) jenv->func(ar1, ar2, ar3)
-#   define JCALL4(func, jenv, ar1, ar2, ar3, ar4) jenv->func(ar1, ar2, ar3,
ar4)
-#   define JCALL7(func, jenv, ar1, ar2, ar3, ar4, ar5, ar6, ar7)
jenv->func(ar1, ar2, ar3, ar4, ar5, ar6, ar7)
+#   define JCALL4(func, jenv, ar1, ar2, ar3, ar4) \
+                      jenv->func(ar1, ar2, ar3, ar4)
+#   define JCALL7(func, jenv, ar1, ar2, ar3, ar4, ar5, ar6, ar7) \
+                      jenv->func(ar1, ar2, ar3, ar4, ar5, ar6, ar7)
 #else
 #   define JCALL0(func, jenv) (*jenv)->func(jenv)
 #   define JCALL1(func, jenv, ar1) (*jenv)->func(jenv, ar1)
 #   define JCALL2(func, jenv, ar1, ar2) (*jenv)->func(jenv, ar1, ar2)
 #   define JCALL3(func, jenv, ar1, ar2, ar3) (*jenv)->func(jenv, ar1, ar2,
ar3)
-#   define JCALL4(func, jenv, ar1, ar2, ar3, ar4) (*jenv)->func(jenv, ar1,
ar2, ar3, ar4)
-#   define JCALL7(func, jenv, ar1, ar2, ar3, ar4, ar5, ar6, ar7)
(*jenv)->func(jenv, ar1, ar2, ar3, ar4, ar5, ar6, ar7)
+#   define JCALL4(func, jenv, ar1, ar2, ar3, ar4) \
+                      (*jenv)->func(jenv, ar1, ar2, ar3, ar4)
+#   define JCALL7(func, jenv, ar1, ar2, ar3, ar4, ar5, ar6, ar7) \
+                      (*jenv)->func(jenv, ar1, ar2, ar3, ar4, ar5, ar6,
ar7)
 #endif
 #endif
 
@@ -205,7 +209,8 @@
   jclass cls = JCALL1(FindClass, jenv, "java/util/ArrayList");
   jobject list = JCALL2(NewObject, jenv, cls,
                         JCALL3(GetMethodID, jenv, cls, "<init>", "()V"));
-  jmethodID add = JCALL3(GetMethodID, jenv, cls, "add",
"(Ljava/lang/Object;)Z");
+  jmethodID add = JCALL3(GetMethodID, jenv, cls, "add", 
+                         "(Ljava/lang/Object;)Z");
   char *s;
   jobject obj;
   while ((s = *strings++) != NULL)
@@ -883,7 +888,9 @@
       const char *message,
       apr_pool_t *pool)
 {
-    return svn_error_create(APR_EGENERAL, NULL, "TODO:
svn_swig_java_get_commit_log_func is not implemented yet");
+    return svn_error_create
+      (APR_EGENERAL, NULL, 
+       "TODO: svn_swig_java_get_commit_log_func is not implemented yet");
 }
 
 /* Prompt for username */
@@ -995,9 +1002,9 @@
                                       char *buffer,
                                       apr_size_t *len)
 {
-  svn_error_t *svn_error = svn_error_create(SVN_ERR_STREAM_UNEXPECTED_EOF, 
-                                            NULL,
-                                            "Can't read from write only
stream");
+  svn_error_t *svn_error = svn_error_create
+    (SVN_ERR_STREAM_UNEXPECTED_EOF, NULL,
+     "Can't read from write only stream");
   return svn_error;                   
 } 
 
@@ -1027,7 +1034,8 @@
       goto error;
     }
 
-  JCALL3(CallVoidMethod, jenv, stream_baton->stream,
svn_swig_java_mid_outputstream_write, bytearray);
+  JCALL3(CallVoidMethod, jenv, stream_baton->stream,
+         svn_swig_java_mid_outputstream_write, bytearray);
   exc = JCALL0(ExceptionOccurred, jenv);
   if (exc)
     {
Index: subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
===================================================================
--- subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c	(revision
9374)
+++ subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c	(working
copy)
@@ -32,7 +32,8 @@
 #include "swigutil_pl.h"
 
 /* element convertors for perl -> c */
-typedef void *(*pl_element_converter_t)(SV *value, void *ctx, apr_pool_t
*pool);
+typedef void *(*pl_element_converter_t)(SV *value, void *ctx, 
+                                        apr_pool_t *pool);
 
 static void *convert_pl_string (SV *value, void *dummy, apr_pool_t *pool)
 {
@@ -41,7 +42,8 @@
     return *result;
 }
 
-static void *convert_pl_obj (SV *value, swig_type_info *tinfo, apr_pool_t
*pool)
+static void *convert_pl_obj (SV *value, swig_type_info *tinfo, 
+                             apr_pool_t *pool)
 {
     void **result = apr_palloc(pool, sizeof(void *));
     if (SWIG_ConvertPtr(value, result, tinfo, 0) < 0) {
@@ -100,9 +102,10 @@
 }
 
 /* perl -> c array convertors */
-static const apr_array_header_t *svn_swig_pl_to_array (SV *source,
-                                                      
pl_element_converter_t cv,
-                                                       void *ctx,
apr_pool_t *pool)
+static const 
+apr_array_header_t *svn_swig_pl_to_array (SV *source,
+                                          pl_element_converter_t cv,
+                                          void *ctx, apr_pool_t *pool)
 {
     int targlen;
     apr_array_header_t *temp;
@@ -642,7 +645,9 @@
 					 base_checksum, pool, poolinfo));
     if (SvOK(result)) {
 	if (SvROK(result) && SvTYPE(SvRV(result)) == SVt_PVAV) {
-	    swig_type_info *handler_info =
SWIG_TypeQuery("svn_txdelta_window_handler_t"), *void_info =
SWIG_TypeQuery("void *");
+	    swig_type_info *handler_info = 
+              SWIG_TypeQuery("svn_txdelta_window_handler_t");
+            swig_type_info *void_info = SWIG_TypeQuery("void *");
 	    AV *array = (AV *)SvRV(result);
 
 	    if (SWIG_ConvertPtr(*av_fetch (array, 0, 0),
@@ -907,7 +912,8 @@
     (*cb)->invalidate_wc_props = NULL;
     auth_baton = *hv_fetch((HV *)SvRV(perl_callbacks), "auth", 4, 0);
 
-    if (SWIG_ConvertPtr(auth_baton, (void **)&(*cb)->auth_baton, tinfo,0) <
0) {
+    if (SWIG_ConvertPtr(auth_baton, 
+                        (void **)&(*cb)->auth_baton, tinfo,0) < 0) {
 	croak("Unable to convert from SWIG Type");
     }
     *c_baton = perl_callbacks;
@@ -1122,7 +1128,8 @@
     } else if (SvPOK(SvRV(tmp_file_sv))) {
 	*tmp_file = apr_pstrdup(pool, SvPV_nolen(SvRV(tmp_file_sv)));
     } else {
-        croak("Invalid value in tmp_file reference, must be undef or a
string");    
+        croak("Invalid value in tmp_file reference, "
+              "must be undef or a string");    
     }
 
     if (sv_derived_from (result, "_p_svn_error_t")) {
@@ -1154,9 +1161,11 @@
 	    croak("Unable to convert from SWIG Type");
 	}
     } else if (SvIOK(result) && SvIV(result)) {
-        ret_val = svn_error_create(SVN_ERR_CANCELLED, NULL,"By cancel
callback");
+        ret_val = svn_error_create(SVN_ERR_CANCELLED, NULL,
+                                   "By cancel callback");
     } else if (SvTRUE(result) && SvPOK(result)) {
-        ret_val = svn_error_create(SVN_ERR_CANCELLED, NULL,
SvPV_nolen(result));
+        ret_val = svn_error_create(SVN_ERR_CANCELLED, NULL, 
+                                   SvPV_nolen(result));
     } else {
         ret_val = SVN_NO_ERROR;
     }
@@ -1379,7 +1388,8 @@
     } else if (SvROK(file) && SvTYPE(SvRV(file)) == SVt_PVGV) {
         apr_status_t status;
         apr_os_file_t osfile = PerlIO_fileno(IoIFP(sv_2io(file)));
-        status = apr_os_file_put (&apr_file, &osfile, O_CREAT | O_WRONLY,
pool);
+        status = apr_os_file_put (&apr_file, &osfile, 
+                                  O_CREAT | O_WRONLY, pool);
         if (status)
             return NULL;
     }
Index: subversion/bindings/com/StdAfx.h
===================================================================
--- subversion/bindings/com/StdAfx.h	(revision 9374)
+++ subversion/bindings/com/StdAfx.h	(working copy)
@@ -59,6 +59,7 @@
 
 
 //{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately
before the previous line.
+// Microsoft Visual C++ will insert additional declarations 
+// immediately before the previous line.
 
-#endif //
!defined(AFX_STDAFX_H__C6D9D561_DBA4_4B5F_B745_EEE2067A9253__INCLUDED)
+#endif
//!defined(AFX_STDAFX_H__C6D9D561_DBA4_4B5F_B745_EEE2067A9253__INCLUDED)
Index: subversion/bindings/com/dlldatax.h
===================================================================
--- subversion/bindings/com/dlldatax.h	(revision 9374)
+++ subversion/bindings/com/dlldatax.h	(working copy)
@@ -36,6 +36,8 @@
 #endif
 
 //{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately
before the previous line.
+// Microsoft Visual C++ will insert additional declarations
+// immediately before the previous line.
 
-#endif //
!defined(AFX_DLLDATAX_H__281C69AC_6B7B_4FA8_9B5A_84546EFB391A__INCLUDED_)
+#endif 
+//
!defined(AFX_DLLDATAX_H__281C69AC_6B7B_4FA8_9B5A_84546EFB391A__INCLUDED_)
Index: subversion/bindings/com/SVN.h
===================================================================
--- subversion/bindings/com/SVN.h	(revision 9374)
+++ subversion/bindings/com/SVN.h	(working copy)
@@ -30,7 +30,8 @@
         public CComCoClass<CSVNWorkingCopy, &CLSID_SVNWorkingCopy>,
         public ISupportErrorInfo,
         public IConnectionPointContainerImpl<CSVNWorkingCopy>,
-        public IDispatchImpl<ISVNWorkingCopy, &IID_ISVNWorkingCopy,
&LIBID_SVNCOMLib>,
+        public IDispatchImpl<ISVNWorkingCopy, &IID_ISVNWorkingCopy, 
+                             &LIBID_SVNCOMLib>,
         public CProxy_ISVNEvents< CSVNWorkingCopy >
 {
 public:
@@ -96,9 +97,12 @@
 
 // ISVNWorkingCopy
 public:
-        STDMETHOD(wc_statuses)(/*[in]*/ BSTR bstrPath, /*[in]*/
VARIANT_BOOL getAll, /*[out]*/ SAFEARRAY **ppsa);
+        STDMETHOD(wc_statuses)(/*[in]*/ BSTR bstrPath, 
+                               /*[in]*/ VARIANT_BOOL getAll, 
+                               /*[out]*/ SAFEARRAY **ppsa);
         STDMETHOD(watch_dir)(/*[in]*/ BSTR bstrDir);
-        STDMETHOD(check_wc)(/*[in]*/ BSTR bstrDir, /*[out, retval]*/
VARIANT_BOOL *pfIsValid); 
+        STDMETHOD(check_wc)(/*[in]*/ BSTR bstrDir, 
+                            /*[out, retval]*/ VARIANT_BOOL *pfIsValid); 
 private:
         static void FileNotificationThreadProc(void *);
 };
Index: subversion/bindings/com/MarshalArray.h
===================================================================
--- subversion/bindings/com/MarshalArray.h	(revision 9374)
+++ subversion/bindings/com/MarshalArray.h	(working copy)
@@ -154,7 +154,8 @@
         else if (m_nSize == 1)
         {
                 // create array
-                pp =
(IUnknown**)malloc(sizeof(IUnknown*)*_DEFAULT_VECTORLENGTH);
+                pp = (IUnknown**)malloc(sizeof(IUnknown*) *
+                                        _DEFAULT_VECTORLENGTH);
                 if (pp == NULL)
                         return 0;
                 memset(pp, 0, sizeof(IUnknown*)*_DEFAULT_VECTORLENGTH);
Index: subversion/clients/cmdline/util.c
===================================================================
--- subversion/clients/cmdline/util.c	(revision 9374)
+++ subversion/clients/cmdline/util.c	(working copy)
@@ -167,7 +167,8 @@
   /* Make sure the whole CONTENTS were written, else return an error. */
   if (apr_err)
     {
-      err = svn_error_wrap_apr (apr_err, _("Can't write to '%s'"),
tmpfile_name);
+      err = svn_error_wrap_apr (apr_err, _("Can't write to '%s'"), 
+                                tmpfile_name);
       goto cleanup;
     }
 
@@ -348,7 +349,8 @@
      svn_error_create (commit_err->apr_err,
                        svn_error_createf (commit_err->apr_err, NULL,
                                           "   '%s'", lmb->tmpfile_left),
-                       _("Your commit message was left in a temporary
file:")));
+                       _("Your commit message was left in "
+                         "a temporary file:")));
   return commit_err;
 }
 
Index: subversion/clients/cmdline/update-cmd.c
===================================================================
--- subversion/clients/cmdline/update-cmd.c	(revision 9374)
+++ subversion/clients/cmdline/update-cmd.c	(working copy)
@@ -70,8 +70,8 @@
       SVN_ERR (svn_cl__check_cancel (ctx->cancel_baton));
 
       if (! opt_state->quiet)
-        svn_cl__get_notifier (&ctx->notify_func, &ctx->notify_baton, FALSE,
FALSE,
-                              FALSE, subpool);
+        svn_cl__get_notifier (&ctx->notify_func, &ctx->notify_baton, 
+                              FALSE, FALSE, FALSE, subpool);
 
       err = svn_client_update (NULL, target,
                                &(opt_state->start_revision),
Index: subversion/clients/cmdline/switch-cmd.c
===================================================================
--- subversion/clients/cmdline/switch-cmd.c	(revision 9374)
+++ subversion/clients/cmdline/switch-cmd.c	(working copy)
@@ -62,7 +62,8 @@
       for (i = 2; i < targets->nelts; i++)
         {
           const char *target = ((const char **) (targets->elts))[i];
-          SVN_ERR (svn_client_relocate (target, from, to, recurse, ctx,
subpool));
+          SVN_ERR (svn_client_relocate (target, from, to, recurse, 
+                                        ctx, subpool));
           svn_pool_clear (subpool);
         }
     }
Index: subversion/tests/libsvn_diff/diff3-test.c
===================================================================
--- subversion/tests/libsvn_diff/diff3-test.c	(revision 9374)
+++ subversion/tests/libsvn_diff/diff3-test.c	(working copy)
@@ -69,7 +69,8 @@
     {
       svn_boolean_t has_changes;
 
-      svn_err = do_diff3(ostream, argv[2], argv[1], argv[3], &has_changes,
pool);
+      svn_err = do_diff3(ostream, argv[2], argv[1], argv[3], 
+                         &has_changes, pool);
       if (svn_err == NULL)
         {
           rc = has_changes ? 1 : 0;
Index: subversion/tests/libsvn_fs/changes-test.c
===================================================================
--- subversion/tests/libsvn_fs/changes-test.c	(revision 9374)
+++ subversion/tests/libsvn_fs/changes-test.c	(working copy)
@@ -131,7 +131,8 @@
 txn_body_changes_fetch_raw (void *baton, trail_t *trail)
 {
   struct changes_args *b = baton;
-  return svn_fs__bdb_changes_fetch_raw (&(b->raw_changes), b->fs, b->key,
trail);
+  return svn_fs__bdb_changes_fetch_raw (&(b->raw_changes), b->fs, b->key, 
+                                        trail);
 }
 
 
Index: subversion/tests/libsvn_fs/skel-test.c
===================================================================
--- subversion/tests/libsvn_fs/skel-test.c	(revision 9374)
+++ subversion/tests/libsvn_fs/skel-test.c	(working copy)
@@ -303,7 +303,8 @@
    bytes at DATA, in explicit-length form, using SEP as the separator
    between the length and the data.  */
 static void
-put_explicit_length (svn_stringbuf_t *str, const char *data, apr_size_t
len, char sep)
+put_explicit_length (svn_stringbuf_t *str, const char *data, apr_size_t
len, 
+                     char sep)
 {
   char *buf = malloc (len + 100);
   apr_size_t length_len;
@@ -559,7 +560,9 @@
 
                         put_list_start (str,  (apr_byte_t)sep, sep_count);
                         for (i = 0; i < list_len; i++)
-                          put_implicit_length_byte (str, 
(apr_byte_t)atom_byte,  (apr_byte_t)sep);
+                          put_implicit_length_byte (str,
+                                                    (apr_byte_t)atom_byte,
+                                                    (apr_byte_t)sep);
                         put_list_end (str,  (apr_byte_t)sep, sep_count);
 
                         skel = parse_str (str, pool);
@@ -568,8 +571,10 @@
                         for (child = skel->children;
                              child;
                              child = child->next)
-                          if (! check_implicit_length_byte (child, 
(apr_byte_t)atom_byte))
-                            return fail (pool, "list was reparsed
incorrectly");
+                          if (! check_implicit_length_byte 
+                                 (child, (apr_byte_t)atom_byte))
+                            return fail (pool, 
+                                         "list was reparsed incorrectly");
                       }
 
                   /* Try the atom containing every character that's
Index: subversion/tests/libsvn_wc/translate-test.c
===================================================================
--- subversion/tests/libsvn_wc/translate-test.c	(revision 9374)
+++ subversion/tests/libsvn_wc/translate-test.c	(working copy)
@@ -619,12 +619,14 @@
       if (contents->len < idx)
         return svn_error_createf
           (SVN_ERR_MALFORMED_FILE, NULL,
-           "'%s' has short contents at line %" APR_SIZE_T_FMT, dst_fname, i
+ 1);
+           "'%s' has short contents at line %" APR_SIZE_T_FMT, 
+           dst_fname, i + 1);
 
       if (strncmp (contents->data + idx, expect[i], strlen (expect[i])) !=
0)
         return svn_error_createf
           (SVN_ERR_MALFORMED_FILE, NULL, 
-           "'%s' has wrong contents at line %" APR_SIZE_T_FMT, dst_fname, i
+ 1);
+           "'%s' has wrong contents at line %" APR_SIZE_T_FMT, 
+           dst_fname, i + 1);
 
       /* Else, the data is correct, at least up to the next eol. */
 
Index: subversion/tests/libsvn_subr/time-test.c
===================================================================
--- subversion/tests/libsvn_subr/time-test.c	(revision 9374)
+++ subversion/tests/libsvn_subr/time-test.c	(working copy)
@@ -132,7 +132,8 @@
     {
       return svn_error_createf
         (SVN_ERR_TEST_FAILED, NULL,
-         "svn_time_from_cstring ( svn_time_to_cstring (n) ) returned time
'%" APR_TIME_T_FMT
+         "svn_time_from_cstring ( svn_time_to_cstring (n) ) returned time
'%" 
+         APR_TIME_T_FMT
          "' instead of '%" APR_TIME_T_FMT "'",
          timestamp,current_timestamp);
     }
Index: subversion/libsvn_repos/dump.c
===================================================================
--- subversion/libsvn_repos/dump.c	(revision 9374)
+++ subversion/libsvn_repos/dump.c	(working copy)
@@ -495,7 +495,8 @@
                                          pool));
           if (eb->stream)
             SVN_ERR (svn_stream_printf (eb->stream, pool,
-                                        SVN_REPOS_DUMPFILE_PROP_DELTA ":
true\n"));
+                                        SVN_REPOS_DUMPFILE_PROP_DELTA 
+                                        ": true\n"));
         }
       write_hash_to_stringbuf (prophash, oldhash, &propstring, pool);
       proplen = propstring->len;
Index: subversion/libsvn_repos/repos.c
===================================================================
--- subversion/libsvn_repos/repos.c	(revision 9374)
+++ subversion/libsvn_repos/repos.c	(working copy)
@@ -759,7 +759,8 @@
       "PROPNAME=\"$4\""
       APR_EOL_STR
       APR_EOL_STR
-      "propchange-email.pl \"$REPOS\" \"$REV\" \"$USER\" \"$PROPNAME\"
watchers@example.org"
+      "propchange-email.pl \"$REPOS\" \"$REV\" \"$USER\" \"$PROPNAME\" "
+      "watchers@example.org"
       APR_EOL_STR;
 
     SVN_ERR_W (svn_io_file_create (this_path, contents, pool),
@@ -1221,12 +1222,13 @@
       /* Check if we are inside db directory and if so skip it */
       if (svn_path_compare_paths(
             svn_path_get_longest_ancestor (SVN_REPOS__DB_DIR, sub_path,
pool), 
-                                           SVN_REPOS__DB_DIR) == 0)
+            SVN_REPOS__DB_DIR) == 0)
         return SVN_NO_ERROR;
 
       if (svn_path_compare_paths(
-            svn_path_get_longest_ancestor (SVN_REPOS__LOCK_DIR, sub_path,
pool),
-                                           SVN_REPOS__LOCK_DIR) == 0)
+            svn_path_get_longest_ancestor (SVN_REPOS__LOCK_DIR, 
+                                           sub_path, pool),
+            SVN_REPOS__LOCK_DIR) == 0)
         return SVN_NO_ERROR;
     }
 
Index: subversion/libsvn_delta/delta.h
===================================================================
--- subversion/libsvn_delta/delta.h	(revision 9374)
+++ subversion/libsvn_delta/delta.h	(working copy)
@@ -51,7 +51,7 @@
 /* Context for composing windows. */
 typedef struct svn_txdelta__compose_ctx_t
 {
-  svn_filesize_t sview_offset;       /* Source view offset in the combined
window */
+  svn_filesize_t sview_offset;  /* Source view offset in the combined
window */
   apr_size_t sview_len;         /* Source view length in the combined
window */
   svn_boolean_t use_second;     /* TRUE if window_B is the composite. */
 } svn_txdelta__compose_ctx_t;
Index: subversion/libsvn_fs_fs/fs_fs.c
===================================================================
--- subversion/libsvn_fs_fs/fs_fs.c	(revision 9374)
+++ subversion/libsvn_fs_fs/fs_fs.c	(working copy)
@@ -832,8 +832,8 @@
   b->is_delta = FALSE;
 
   /* Open the revision file. */
-  SVN_ERR (open_and_seek_revision (&b->rep_file, fs, rep->revision,
rep->offset,
-                                   pool));
+  SVN_ERR (open_and_seek_revision (&b->rep_file, fs, rep->revision, 
+                                   rep->offset, pool));
 
   /* Read in the REP line. */
   SVN_ERR (read_rep_line (&rep_args, b->rep_file, pool));
@@ -858,7 +858,8 @@
 
       /* Create a writable stream that will call our handler when svndiff
          data is written to it. */
-      b->wstream = svn_txdelta_parse_svndiff (handler, handler_baton,
FALSE, pool);
+      b->wstream = svn_txdelta_parse_svndiff (handler, handler_baton, 
+                                              FALSE, pool);
 
       b->is_delta = TRUE;
     }
@@ -1076,7 +1077,8 @@
 
   proplist = apr_hash_make (pool);
 
-  SVN_ERR (get_representation_at_offset (&stream, fs, noderev->prop_rep,
pool));
+  SVN_ERR (get_representation_at_offset (&stream, fs, 
+                                         noderev->prop_rep, pool));
   
   SVN_ERR (hash_read (proplist, stream, pool));
 
Index: subversion/libsvn_fs_fs/dag.c
===================================================================
--- subversion/libsvn_fs_fs/dag.c	(revision 9374)
+++ subversion/libsvn_fs_fs/dag.c	(working copy)
@@ -938,8 +938,9 @@
 
   /* Compare contents keys. */
   if (contents_changed != NULL)
-    *contents_changed = (! svn_fs__fs_noderev_same_rep_key
(noderev1->data_rep,
-                                                           
noderev2->data_rep));
+    *contents_changed = 
+      (! svn_fs__fs_noderev_same_rep_key (noderev1->data_rep,
+                                          noderev2->data_rep));
   
   return SVN_NO_ERROR;
 }
-- 
NEU : GMX Internet.FreeDSL
Ab sofort DSL-Tarif ohne Grundgebühr: http://www.gmx.net/info
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org