You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ja...@apache.org on 2020/03/31 23:07:08 UTC
svn commit: r1875971 [2/2] - in /subversion/trunk/subversion: libsvn_client/
libsvn_delta/ libsvn_diff/ libsvn_fs/ libsvn_fs_base/ libsvn_fs_base/bdb/
libsvn_fs_base/notes/ libsvn_fs_fs/ libsvn_fs_x/ libsvn_ra/
libsvn_ra_local/ libsvn_ra_serf/ libsvn_r...
Modified: subversion/trunk/subversion/libsvn_subr/config_file.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/config_file.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/config_file.c (original)
+++ subversion/trunk/subversion/libsvn_subr/config_file.c Tue Mar 31 23:07:06 2020
@@ -550,7 +550,7 @@ parse_option(int *pch, parse_context_t *
}
-/* Read chars until enounter ']', then skip everything to the end of
+/* Read chars until encounter ']', then skip everything to the end of
* the line. Set *PCH to the character that ended the line (either
* newline or EOF), and set CTX->section to the string of characters
* seen before ']'.
Modified: subversion/trunk/subversion/libsvn_subr/date.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/date.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/date.c (original)
+++ subversion/trunk/subversion/libsvn_subr/date.c Tue Mar 31 23:07:06 2020
@@ -37,7 +37,7 @@ enum rule_action {
if the next template character matches the current
value character, continue processing as normal.
Otherwise, attempt to complete matching starting
- immediately after the first subsequent occurrance of
+ immediately after the first subsequent occurrence of
']' in the template. */
SKIP, /* Ignore this template character */
ACCEPT /* Accept the value */
Modified: subversion/trunk/subversion/libsvn_subr/gpg_agent.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/gpg_agent.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/gpg_agent.c (original)
+++ subversion/trunk/subversion/libsvn_subr/gpg_agent.c Tue Mar 31 23:07:06 2020
@@ -680,9 +680,9 @@ simple_gpg_agent_next_creds(void **crede
/* TODO: This attempt limit hard codes it at 3 attempts (or 2 retries)
* which matches svn command line client's retry_limit as set in
* svn_cmdline_create_auth_baton(). It would be nice to have that
- * limit reflected here but that violates the boundry between the
+ * limit reflected here but that violates the boundary between the
* prompt provider and the cache provider. gpg-agent is acting as
- * both here due to the peculiarties of their design so we'll have to
+ * both here due to the peculiarities of their design so we'll have to
* live with this for now. Note that when these failures get exceeded
* it'll eventually fall back on the retry limits of whatever prompt
* provider is in effect, so this effectively doubles the limit. */
Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Tue Mar 31 23:07:06 2020
@@ -2797,7 +2797,7 @@ stringbuf_from_aprfile(svn_stringbuf_t *
correct, for instance, because the underlying handle could be
pointing to a pipe. We don't know that in advance, so attempt
to read *one more* byte than necessary. If we get an EOF, then
- we're done and we have succesfully avoided reading the file chunk-
+ we're done and we have successfully avoided reading the file chunk-
by-chunk. If we don't, we fall through and do so to read the
remaining part of the file. */
svn_boolean_t eof;
Modified: subversion/trunk/subversion/libsvn_subr/object_pool.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/object_pool.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/object_pool.c (original)
+++ subversion/trunk/subversion/libsvn_subr/object_pool.c Tue Mar 31 23:07:06 2020
@@ -174,7 +174,7 @@ add_object_ref(object_ref_t *object_ref,
/* Make sure the reference gets released automatically.
Since POOL might be a parent pool of OBJECT_REF->OBJECT_POOL,
- to the reference counting update before destroing any of the
+ to the reference counting update before destroying any of the
pool hierarchy. */
apr_pool_pre_cleanup_register(pool, object_ref, object_ref_cleanup);
}
Modified: subversion/trunk/subversion/libsvn_subr/path.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/path.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/path.c (original)
+++ subversion/trunk/subversion/libsvn_subr/path.c Tue Mar 31 23:07:06 2020
@@ -590,7 +590,7 @@ svn_path_is_ancestor(const char *path1,
{
apr_size_t path1_len = strlen(path1);
- /* If path1 is empty and path2 is not absoulte, then path1 is an ancestor. */
+ /* If path1 is empty and path2 is not absolute, then path1 is an ancestor. */
if (SVN_PATH_IS_EMPTY(path1))
return *path2 != '/';
Modified: subversion/trunk/subversion/libsvn_subr/prompt.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/prompt.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/prompt.c (original)
+++ subversion/trunk/subversion/libsvn_subr/prompt.c Tue Mar 31 23:07:06 2020
@@ -262,7 +262,7 @@ terminal_puts(const char *string, termin
/* These codes can be returned from terminal_getc instead of a character. */
#define TERMINAL_NONE 0x80000 /* no character read, retry */
-#define TERMINAL_DEL (TERMINAL_NONE + 1) /* the input was a deleteion */
+#define TERMINAL_DEL (TERMINAL_NONE + 1) /* the input was a deletion */
#define TERMINAL_EOL (TERMINAL_NONE + 2) /* end of input/end of line */
#define TERMINAL_EOF (TERMINAL_NONE + 3) /* end of file during input */
Modified: subversion/trunk/subversion/libsvn_subr/string.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/string.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/string.c (original)
+++ subversion/trunk/subversion/libsvn_subr/string.c Tue Mar 31 23:07:06 2020
@@ -65,7 +65,7 @@ membuf_create(void **data, apr_size_t *s
* this function does nothing.
*
* If *SIZE is 0, the allocated buffer size will be MINIMUM_SIZE
- * rounded up to the nearest APR alignment boundary. Otherwse, *SIZE
+ * rounded up to the nearest APR alignment boundary. Otherwise, *SIZE
* will be multiplied by a power of two such that the result is
* greater or equal to MINIMUM_SIZE. The pointer to the new buffer
* will be returned in *DATA, and its size in *SIZE.
Modified: subversion/trunk/subversion/libsvn_subr/sysinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sysinfo.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sysinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sysinfo.c Tue Mar 31 23:07:06 2020
@@ -1077,7 +1077,7 @@ win32_release_name(apr_pool_t *pool)
/* Get a list of handles of shared libs loaded by the current
- process. Returns a NULL-terminated array alocated from POOL. */
+ process. Returns a NULL-terminated array allocated from POOL. */
static HMODULE *
enum_loaded_modules(apr_pool_t *pool)
{
Modified: subversion/trunk/subversion/libsvn_subr/temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/temp_serializer.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/temp_serializer.c (original)
+++ subversion/trunk/subversion/libsvn_subr/temp_serializer.c Tue Mar 31 23:07:06 2020
@@ -143,7 +143,7 @@ svn_temp_serializer__init(const void *so
* been serialized to BUFFER but contains references to new objects yet to
* serialize. The current size of the serialized data is given in
* CURRENTLY_USED. If the allocated data buffer is actually larger, you may
- * specifiy that in CURRENTLY_ALLOCATED to prevent unnecessary allocations.
+ * specify that in CURRENTLY_ALLOCATED to prevent unnecessary allocations.
* Otherwise, set it to 0. All allocations will be made from POOl.
*/
svn_temp_serializer__context_t *
@@ -261,7 +261,7 @@ svn_temp_serializer__push(svn_temp_seria
svn_stringbuf_appendbytes(context->buffer, source, struct_size);
}
-/* Remove the lastest structure from the stack.
+/* Remove the latest structure from the stack.
*/
void
svn_temp_serializer__pop(svn_temp_serializer__context_t *context)
Modified: subversion/trunk/subversion/libsvn_subr/utf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/utf.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/utf.c (original)
+++ subversion/trunk/subversion/libsvn_subr/utf.c Tue Mar 31 23:07:06 2020
@@ -72,7 +72,7 @@ typedef apr_xlate_t xlate_handle_t;
* If there is no handle for a particular key when needed, a new is
* handle is created and put in the cache after use.
* This means that there will be at most N handles open for a key, where N
- * is the number of simultanous handles in use for that key. */
+ * is the number of simultaneous handles in use for that key. */
typedef struct xlate_handle_node_t {
xlate_handle_t *handle;
Modified: subversion/trunk/subversion/libsvn_subr/utf8proc.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/utf8proc.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/utf8proc.c (original)
+++ subversion/trunk/subversion/libsvn_subr/utf8proc.c Tue Mar 31 23:07:06 2020
@@ -335,7 +335,7 @@ svn_utf__glob(svn_boolean_t *match,
_("Cannot use a custom escape token"
" in glob matching mode"));
- /* Convert the patern to NFD UTF-8. We can't use the UCS-4 result
+ /* Convert the pattern to NFD UTF-8. We can't use the UCS-4 result
because apr_fnmatch can't handle it.*/
SVN_ERR(decompose_normalized(&tempbuf_len, pattern, pattern_len, temp_buf));
if (!sql_like)
Modified: subversion/trunk/subversion/libsvn_subr/version.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/version.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/version.c (original)
+++ subversion/trunk/subversion/libsvn_subr/version.c Tue Mar 31 23:07:06 2020
@@ -41,7 +41,7 @@ svn_boolean_t svn_ver_compatible(const s
const svn_version_t *lib_version)
{
/* With normal development builds the matching rules are stricter
- that for release builds, to avoid inadvertantly using the wrong
+ that for release builds, to avoid inadvertently using the wrong
libraries. For backward compatibility testing of development
builds one can use --disable-full-version-match to cause a
development build to use the release build rules. This allows
Modified: subversion/trunk/subversion/libsvn_subr/win32_xlate.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/win32_xlate.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/win32_xlate.c (original)
+++ subversion/trunk/subversion/libsvn_subr/win32_xlate.c Tue Mar 31 23:07:06 2020
@@ -65,8 +65,8 @@ initialize_com(void *baton, apr_pool_t*
if (hr == RPC_E_CHANGED_MODE)
{
- /* COM already initalized for multi-threaded object concurrency. We are
- neutral to object concurrency so try to initalize it in the same way
+ /* COM already initialized for multi-threaded object concurrency. We are
+ neutral to object concurrency so try to initialize it in the same way
for us, to keep an handle open. */
hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
}
Modified: subversion/trunk/subversion/libsvn_subr/x509parse.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/x509parse.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/x509parse.c (original)
+++ subversion/trunk/subversion/libsvn_subr/x509parse.c Tue Mar 31 23:07:06 2020
@@ -882,7 +882,7 @@ x509name_to_utf8_string(const x509_name
/* Both BMP and UNIVERSAL should always be in Big Endian (aka
* network byte order). But rumor has it that there are certs
- * out there with other endianess and even Byte Order Marks.
+ * out there with other endianness and even Byte Order Marks.
* If we actually run into these, we might need to do something
* about it. */
@@ -916,7 +916,7 @@ x509name_to_utf8_string(const x509_name
/* This leaves two types out there in the wild. PrintableString,
* which is just a subset of ASCII and IA5 which is ASCII (though
- * 0x24 '$' and 0x23 '#' may be defined with differnet symbols
+ * 0x24 '$' and 0x23 '#' may be defined with different symbols
* depending on the location, in practice it seems everyone just
* treats it as ASCII). Since these are just ASCII run through
* the fuzzy_escape code to deal with anything that isn't actually
@@ -979,7 +979,7 @@ is_hostname(const char *str)
if (i + 1 != len)
{
if (str[i + 1] == '.')
- return FALSE; /* '-' preceeds a '.' */
+ return FALSE; /* '-' precedes a '.' */
}
else
return FALSE; /* '-' is at end of string */
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Tue Mar 31 23:07:06 2020
@@ -660,7 +660,7 @@ svn_wc__conflict_skel_resolve(svn_boolea
/* If no conflicted property names left */
if (!c->next->next->children)
{
- /* Remove the propery conflict skel from the linked list */
+ /* Remove the property conflict skel from the linked list */
*pconflict = (*pconflict)->next;
continue;
}
@@ -3899,7 +3899,7 @@ svn_wc__guess_incoming_move_target_nodes
* cannot be modified (e.g. replaced or deleted nodes) don't count.
* Nodes which are of a different node kind don't count either.
* Ignore switched nodes as well, since that is an unlikely case during
- * update/swtich/merge conflict resolution. And externals shouldn't even
+ * update/switch/merge conflict resolution. And externals shouldn't even
* be on our candidate list in the first place.
* If multiple candidates match these criteria, choose the one which
* shares the longest common ancestor with the victim. */
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.h?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.h (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.h Tue Mar 31 23:07:06 2020
@@ -259,7 +259,7 @@ svn_wc__conflict_skel_add_tree_conflict(
resolve/remove the tree conflict in CONFLICT_SKEL.
If COMPLETELY_RESOLVED is not NULL, then set *COMPLETELY_RESOLVED to TRUE,
- when no conflict registration is left in CONFLICT_SKEL after editting,
+ when no conflict registration is left in CONFLICT_SKEL after editing,
otherwise to FALSE.
Allocate data stored in the skel in RESULT_POOL.
Modified: subversion/trunk/subversion/libsvn_wc/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/copy.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/copy.c (original)
+++ subversion/trunk/subversion/libsvn_wc/copy.c Tue Mar 31 23:07:06 2020
@@ -148,7 +148,7 @@ copy_to_tmpdir(svn_skel_t **work_item,
}
else if (*kind == svn_node_dir && !file_copy)
{
- /* Just build a new direcory from the workqueue */
+ /* Just build a new directory from the workqueue */
SVN_ERR(svn_wc__wq_build_dir_install(work_item,
db, dst_abspath,
result_pool, scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/lock.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/lock.c (original)
+++ subversion/trunk/subversion/libsvn_wc/lock.c Tue Mar 31 23:07:06 2020
@@ -592,7 +592,7 @@ open_single(svn_wc_adm_access_t **adm_ac
KIND can be NULL.
### note: this function should go away when we move to a single
- ### adminstrative area. */
+ ### administrative area. */
static svn_error_t *
adm_available(svn_boolean_t *available,
svn_node_kind_t *kind,
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Mar 31 23:07:06 2020
@@ -514,7 +514,7 @@ create_repos_id(apr_int64_t *repos_id,
above query and the insertion below. We're simply going to ignore
that, as it means two processes are *modifying* the working copy
at the same time, *and* new repositores are becoming visible.
- This is rare enough, let alone the miniscule chance of hitting
+ This is rare enough, let alone the minuscule chance of hitting
this race condition. Further, simply failing out will leave the
database in a consistent state, and the user can just re-run the
failed operation. */
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Tue Mar 31 23:07:06 2020
@@ -952,7 +952,7 @@ typedef struct svn_wc__db_install_data_t
/* Open a writable stream to a temporary text base, ready for installing
into the pristine store. Set *STREAM to the opened stream. The temporary
file will have an arbitrary unique name. Return as *INSTALL_DATA a baton
- for eiter installing or removing the file
+ for either installing or removing the file
Arrange that, on stream closure, *MD5_CHECKSUM and *SHA1_CHECKSUM will be
set to the MD-5 and SHA-1 checksums respectively of that file.
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_private.h?rev=1875971&r1=1875970&r2=1875971&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_private.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_private.h Tue Mar 31 23:07:06 2020
@@ -434,7 +434,7 @@ svn_wc__db_op_make_copy_internal(svn_wc_
MOVE_DST_RELPATH is X
DELETE_RELPATH is A
- X/C can be calculated if necessesary, like with the other
+ X/C can be calculated if necessary, like with the other
scan functions.
This function returns SVN_ERR_WC_PATH_NOT_FOUND if LOCAL_RELPATH didn't