subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bl...@apache.org
Subject svn commit: r1145707 - in /subversion/trunk: ./ subversion/include/ subversion/libsvn_delta/ subversion/libsvn_fs_fs/ subversion/libsvn_subr/ subversion/libsvn_wc/ subversion/mod_dav_svn/reports/ subversion/svnadmin/ subversion/tests/cmdline/ tools/dist/
Date Tue, 12 Jul 2011 18:30:27 GMT
Author: blair
Date: Tue Jul 12 18:30:27 2011
New Revision: 1145707

URL: http://svn.apache.org/viewvc?rev=1145707&view=rev
Log:
Pre-branch trailing whitespace cleanup.

* subversion/include/svn_client.h,
* subversion/include/svn_types.h,
* subversion/libsvn_delta/svndiff.c,
* subversion/libsvn_fs_fs/caching.c,
* subversion/libsvn_subr/cache-membuffer.c,
* subversion/libsvn_subr/hash.c,
* subversion/libsvn_subr/svn_base64.c,
* subversion/libsvn_wc/adm_crawler.c,
* subversion/libsvn_wc/status.c,
* subversion/libsvn_wc/workqueue.c,
* subversion/mod_dav_svn/reports/update.c,
* subversion/svnadmin/main.c,
* subversion/tests/cmdline/info_tests.py,
* tools/dist/release.py,
* win-tests.py:
  Trim trailing whitespace.

Modified:
    subversion/trunk/subversion/include/svn_client.h
    subversion/trunk/subversion/include/svn_types.h
    subversion/trunk/subversion/libsvn_delta/svndiff.c
    subversion/trunk/subversion/libsvn_fs_fs/caching.c
    subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
    subversion/trunk/subversion/libsvn_subr/hash.c
    subversion/trunk/subversion/libsvn_subr/svn_base64.c
    subversion/trunk/subversion/libsvn_wc/adm_crawler.c
    subversion/trunk/subversion/libsvn_wc/status.c
    subversion/trunk/subversion/libsvn_wc/workqueue.c
    subversion/trunk/subversion/mod_dav_svn/reports/update.c
    subversion/trunk/subversion/svnadmin/main.c
    subversion/trunk/subversion/tests/cmdline/info_tests.py
    subversion/trunk/tools/dist/release.py
    subversion/trunk/win-tests.py

Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1145707&r1=1145706&r2=1145707&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Tue Jul 12 18:30:27 2011
@@ -2283,7 +2283,7 @@ typedef svn_error_t *(*svn_client_status
  *
  * If @a path is an absolute path then the @c path parameter passed in each
  * call to @a status_func will be an absolute path.
- * 
+ *
  * All temporary allocations are performed in @a scratch_pool.
  *
  * @since New in 1.7.

Modified: subversion/trunk/subversion/include/svn_types.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_types.h?rev=1145707&r1=1145706&r2=1145707&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_types.h (original)
+++ subversion/trunk/subversion/include/svn_types.h Tue Jul 12 18:30:27 2011
@@ -131,7 +131,7 @@ typedef struct svn_error_t
 
 } svn_error_t;
 
-/* See svn_version.h. 
+/* See svn_version.h.
    Defined here to avoid including svn_version.h from all public headers. */
 typedef struct svn_version_t svn_version_t;
 

Modified: subversion/trunk/subversion/libsvn_delta/svndiff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/svndiff.c?rev=1145707&r1=1145706&r2=1145707&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/svndiff.c (original)
+++ subversion/trunk/subversion/libsvn_delta/svndiff.c Tue Jul 12 18:30:27 2011
@@ -149,7 +149,7 @@ zlib_encode(const char *data,
      ZLIB will produce an output no shorter than the input.  Hence,
      the DATA would directly appended to OUT, so we can do that directly
      without calling ZLIB before. */
-  if (   (len < MIN_COMPRESS_SIZE) 
+  if (   (len < MIN_COMPRESS_SIZE)
       || (compression_level == SVN_DELTA_COMPRESSION_LEVEL_NONE))
     {
       svn_stringbuf_appendbytes(out, data, len);

Modified: subversion/trunk/subversion/libsvn_fs_fs/caching.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/caching.c?rev=1145707&r1=1145706&r2=1145707&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/caching.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/caching.c Tue Jul 12 18:30:27 2011
@@ -225,9 +225,9 @@ create_cache(svn_cache__t **cache_p,
       {
         SVN_ERR(svn_cache__create_inprocess(
                   cache_p, serializer, deserializer, klen, pages,
-                  items_per_page, FALSE, prefix, pool)); 
+                  items_per_page, FALSE, prefix, pool));
       }
-    else 
+    else
     {
       *cache_p = NULL;
     }

Modified: subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache-membuffer.c?rev=1145707&r1=1145706&r2=1145707&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cache-membuffer.c Tue Jul 12 18:30:27 2011
@@ -283,10 +283,10 @@ static svn_error_t* assert_equal_tags(co
 
 #endif /* SVN_DEBUG_CACHE_MEMBUFFER */
 
-/* A single dictionary entry. Since all entries will be allocated once 
- * during cache creation, those entries might be either used or unused. 
- * An entry is used if and only if it is contained in the doubly-linked 
- * list of used entries. An entry is unused if and only if its OFFSET 
+/* A single dictionary entry. Since all entries will be allocated once
+ * during cache creation, those entries might be either used or unused.
+ * An entry is used if and only if it is contained in the doubly-linked
+ * list of used entries. An entry is unused if and only if its OFFSET
  * member is NO_OFFSET.
  */
 typedef struct entry_t

Modified: subversion/trunk/subversion/libsvn_subr/hash.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/hash.c?rev=1145707&r1=1145706&r2=1145707&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/hash.c (original)
+++ subversion/trunk/subversion/libsvn_subr/hash.c Tue Jul 12 18:30:27 2011
@@ -112,7 +112,7 @@ hash_read(apr_hash_t *hash, svn_stream_t
 
       /* Check for unexpected end of stream */
       if (eof)
-        return svn_error_create(SVN_ERR_MALFORMED_FILE, NULL, 
+        return svn_error_create(SVN_ERR_MALFORMED_FILE, NULL,
                                 _("Serialized hash missing terminator"));
 
       if ((buf->len >= 3) && (buf->data[0] == 'K') && (buf->data[1]
== ' '))
@@ -120,7 +120,7 @@ hash_read(apr_hash_t *hash, svn_stream_t
           /* Get the length of the key */
           keylen = (size_t) strtoul(buf->data + 2, &end, 10);
           if (keylen == (size_t) ULONG_MAX || *end != '\0')
-            return svn_error_create(SVN_ERR_MALFORMED_FILE, NULL, 
+            return svn_error_create(SVN_ERR_MALFORMED_FILE, NULL,
                                     _("Serialized hash malformed"));
 
           /* Now read that much into a buffer. */
@@ -132,7 +132,7 @@ hash_read(apr_hash_t *hash, svn_stream_t
           len = 1;
           SVN_ERR(svn_stream_read(stream, &c, &len));
           if (c != '\n')
-            return svn_error_create(SVN_ERR_MALFORMED_FILE, NULL, 
+            return svn_error_create(SVN_ERR_MALFORMED_FILE, NULL,
                                     _("Serialized hash malformed"));
 
           /* Read a val length line */

Modified: subversion/trunk/subversion/libsvn_subr/svn_base64.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/svn_base64.c?rev=1145707&r1=1145706&r2=1145707&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/svn_base64.c (original)
+++ subversion/trunk/subversion/libsvn_subr/svn_base64.c Tue Jul 12 18:30:27 2011
@@ -35,10 +35,10 @@
 #include "svn_base64.h"
 #include "private/svn_string_private.h"
 
-/* When asked to format the the base64-encoded output as multiple lines, 
+/* When asked to format the the base64-encoded output as multiple lines,
    we put this many chars in each line (plus one new line char) unless
    we run out of data.
-   It is vital for some of the optimizations below that this value is 
+   It is vital for some of the optimizations below that this value is
    a multiple of 4. */
 #define BASE64_LINELEN 76
 
@@ -73,7 +73,7 @@ encode_group(const unsigned char *in, ch
   apr_size_t part0 = in[0];
   apr_size_t part1 = in[1];
   apr_size_t part2 = in[2];
-  
+
   /* ... to prevent these arithmetic operations from being limited to
      byte size.  This saves non-zero cost conversions of the result when
      calculating the addresses within base64tab. */
@@ -88,7 +88,7 @@ encode_group(const unsigned char *in, ch
    a new line char will be appended, though.
    The code in this function will simply transform the data without
    performing any boundary checks.  Therefore, DATA must have at least
-   BYTES_PER_LINE left and space for at least another BASE64_LINELEN 
+   BYTES_PER_LINE left and space for at least another BASE64_LINELEN
    chars must have been pre-allocated in STR before calling this
    function. */
 static void
@@ -99,11 +99,11 @@ encode_line(svn_stringbuf_t *str, const 
   char *out = str->data + str->len;
   char *end = out + BASE64_LINELEN;
 
-  /* We assume that BYTES_PER_LINE is a multiple of 3 and BASE64_LINELEN 
+  /* We assume that BYTES_PER_LINE is a multiple of 3 and BASE64_LINELEN
      a multiple of 4. */
   for ( ; out != end; in += 3, out += 4)
     encode_group(in, out);
-  
+
   /* Expand and terminate the string. */
   *out = '\0';
   str->len += BASE64_LINELEN;
@@ -127,7 +127,7 @@ encode_bytes(svn_stringbuf_t *str, const
   apr_size_t buflen;
 
   /* Resize the stringbuf to make room for the (approximate) size of
-     output, to avoid repeated resizes later. 
+     output, to avoid repeated resizes later.
      Please note that our optimized code relies on the fact that STR
      never needs to be resized until we leave this function. */
   buflen = len * 4 / 3 + 4;
@@ -144,7 +144,7 @@ encode_bytes(svn_stringbuf_t *str, const
       /* May we encode BYTES_PER_LINE bytes without caring about
          line breaks, data in the temporary INBUF or running out
          of data? */
-      if (   *inbuflen == 0 
+      if (   *inbuflen == 0
           && (*linelen == 0 || !break_lines)
           && (end - p >= BYTES_PER_LINE))
         {
@@ -155,7 +155,7 @@ encode_bytes(svn_stringbuf_t *str, const
         }
       else
         {
-          /* No, this is one of a number of special cases. 
+          /* No, this is one of a number of special cases.
              Encode the data byte by byte. */
           memcpy(inbuf + *inbuflen, p, 3 - *inbuflen);
           p += (3 - *inbuflen);
@@ -361,7 +361,7 @@ decode_group_directly(const unsigned cha
    in between.
    The code in this function will simply transform the data without
    performing any boundary checks.  Therefore, DATA must have at least
-   BASE64_LINELEN left and space for at least another BYTES_PER_LINE 
+   BASE64_LINELEN left and space for at least another BYTES_PER_LINE
    chars must have been pre-allocated in STR before calling this
    function. */
 static svn_boolean_t
@@ -372,7 +372,7 @@ decode_line(svn_stringbuf_t *str, const 
   char *out = str->data + str->len;
   char *end = out + BYTES_PER_LINE;
 
-  /* We assume that BYTES_PER_LINE is a multiple of 3 and BASE64_LINELEN 
+  /* We assume that BYTES_PER_LINE is a multiple of 3 and BASE64_LINELEN
      a multiple of 4.  Stop translation as soon as we encounter a special
      char.  Leave the entire group untouched in that case. */
   for (; out < end; p += 4, out += 3)
@@ -383,7 +383,7 @@ decode_line(svn_stringbuf_t *str, const 
   str->len = out - str->data;
   *out = '\0';
   *data = (const char *)p;
-  
+
   /* Return FALSE, if the caller should continue the decoding process
      using the slow standard method. */
   return out == end;
@@ -408,7 +408,7 @@ decode_bytes(svn_stringbuf_t *str, const
   const char *end = data + len;
 
   /* Resize the stringbuf to make room for the (approximate) size of
-     output, to avoid repeated resizes later. 
+     output, to avoid repeated resizes later.
      The optimizations in decode_line rely on no resizes being necessary! */
   svn_stringbuf_ensure(str, str->len + (len / 4) * 3 + 3);
 
@@ -420,7 +420,7 @@ decode_bytes(svn_stringbuf_t *str, const
       if ((*inbuflen == 0) && (p + BASE64_LINELEN <= end))
         if (decode_line(str, &p))
           continue;
-        
+
       /* A special case or decode_line encountered a special char. */
       if (*p == '=')
         {

Modified: subversion/trunk/subversion/libsvn_wc/adm_crawler.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_crawler.c?rev=1145707&r1=1145706&r2=1145707&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Tue Jul 12 18:30:27 2011
@@ -745,7 +745,7 @@ svn_wc_crawl_revisions5(svn_wc_context_t
           || wrk_status == svn_wc__db_status_moved_here
           || (wrk_kind == svn_wc__db_kind_dir
               && (wrk_status == svn_wc__db_status_added
-                  || wrk_status == svn_wc__db_status_incomplete))) 
+                  || wrk_status == svn_wc__db_status_incomplete)))
         {
           SVN_ERR(restore_node(wc_ctx->db, local_abspath,
                                wrk_kind, use_commit_times,

Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1145707&r1=1145706&r2=1145707&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Tue Jul 12 18:30:27 2011
@@ -2259,7 +2259,7 @@ svn_wc_get_status_editor5(const svn_delt
   inner_editor = tree_editor;
   inner_baton = eb;
 
-  if (!server_performs_filtering 
+  if (!server_performs_filtering
       && !depth_as_sticky)
     SVN_ERR(svn_wc__ambient_depth_filter_editor(&inner_editor,
                                                 &inner_baton,

Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1145707&r1=1145706&r2=1145707&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Tue Jul 12 18:30:27 2011
@@ -753,14 +753,14 @@ run_file_install(svn_wc__db_t *db,
         err2 = svn_io_make_dir_recursively(svn_dirent_dirname(dst_abspath,
                                                               scratch_pool),
                                            scratch_pool);
-      
+
         if (err2)
           /* Creating directory didn't work: Return all errors */
           return svn_error_trace(svn_error_compose_create(err, err2));
         else
           /* We could create a directory: retry install */
           svn_error_clear(err);
-      
+
         SVN_ERR(svn_io_file_rename(dst_abspath, local_abspath, scratch_pool));
       }
     else

Modified: subversion/trunk/subversion/mod_dav_svn/reports/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/reports/update.c?rev=1145707&r1=1145706&r2=1145707&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/reports/update.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/reports/update.c Tue Jul 12 18:30:27 2011
@@ -333,7 +333,7 @@ add_helper(svn_boolean_t is_dir,
               apr_psprintf(pool, " sha1-checksum=\"%s\"",
                            svn_checksum_to_cstring(sha1_checksum, pool));
         }
-          
+
       if (bc_url)
         bc_url_str = apr_psprintf(pool, " bc-url=\"%s\"", bc_url);
 

Modified: subversion/trunk/subversion/svnadmin/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/main.c?rev=1145707&r1=1145706&r2=1145707&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/main.c (original)
+++ subversion/trunk/subversion/svnadmin/main.c Tue Jul 12 18:30:27 2011
@@ -1394,7 +1394,7 @@ subcommand_lslocks(apr_getopt_t *os, voi
                                                        sizeof(const char *)),
                                         pool));
   if (targets->nelts > 1)
-    return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, 0, 
+    return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, 0,
                             _("Too many arguments given"));
   if (targets->nelts)
     fs_path = APR_ARRAY_IDX(targets, 0, const char *);

Modified: subversion/trunk/subversion/tests/cmdline/info_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/info_tests.py?rev=1145707&r1=1145706&r2=1145707&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/info_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/info_tests.py Tue Jul 12 18:30:27 2011
@@ -423,7 +423,7 @@ def info_show_exclude(sbox):
   iota = os.path.join(wc_dir, 'iota')
   svntest.main.run_svn(None, 'up', '--set-depth', 'exclude', A_path)
   wc_uuid = svntest.actions.get_wc_uuid(wc_dir)
-  
+
   expected_info = [{
       'Path' : re.escape(wc_dir),
       'Repository Root' : sbox.repo_url,

Modified: subversion/trunk/tools/dist/release.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1145707&r1=1145706&r2=1145707&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Tue Jul 12 18:30:27 2011
@@ -439,7 +439,7 @@ def write_announcement(args):
 
     data = { 'version'              : args.version,
              'sha1info'             : sha1info,
-             'siginfo'              : open('getsigs-output', 'r').read(), 
+             'siginfo'              : open('getsigs-output', 'r').read(),
              'major-minor'          : version_base[:3],
              'major-minor-patch'    : version_base,
            }

Modified: subversion/trunk/win-tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/win-tests.py?rev=1145707&r1=1145706&r2=1145707&view=diff
==============================================================================
--- subversion/trunk/win-tests.py (original)
+++ subversion/trunk/win-tests.py Tue Jul 12 18:30:27 2011
@@ -437,7 +437,7 @@ class Httpd:
       self.httpv2_option = 'on'
     else:
       self.httpv2_option = 'off'
-      
+
     if bulk_updates:
       self.bulkupdates_option = 'on'
     else:



Mime
View raw message