You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2014/02/28 12:18:21 UTC
svn commit: r1572921 - in /subversion/trunk/subversion:
include/private/svn_magic.h libsvn_client/add.c libsvn_client/import.c
libsvn_subr/magic.c
Author: philip
Date: Fri Feb 28 11:18:20 2014
New Revision: 1572921
URL: http://svn.apache.org/r1572921
Log:
Followup to r1572916, fix error return handling.
* subversion/include/private/svn_magic.h
* subversion/libsvn_subr/magic.c
(svn_magic__init): Change return type.
* subversion/libsvn_client/add.c
(add): Handle svn_magic__init return.
* subversion/libsvn_client/import.c
(import): Handle svn_magic__init return.
Modified:
subversion/trunk/subversion/include/private/svn_magic.h
subversion/trunk/subversion/libsvn_client/add.c
subversion/trunk/subversion/libsvn_client/import.c
subversion/trunk/subversion/libsvn_subr/magic.c
Modified: subversion/trunk/subversion/include/private/svn_magic.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_magic.h?rev=1572921&r1=1572920&r2=1572921&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_magic.h (original)
+++ subversion/trunk/subversion/include/private/svn_magic.h Fri Feb 28 11:18:20 2014
@@ -37,7 +37,7 @@ typedef struct svn_magic__cookie_t svn_m
* All resources used by libmagic are freed by a cleanup handler
* installed on RESULT_POOL, i.e. *MAGIC_COOKIE becomes invalid when
* the pool is cleared! */
-void
+svn_error_t *
svn_magic__init(svn_magic__cookie_t **magic_cookie,
apr_hash_t *config,
apr_pool_t *result_pool);
Modified: subversion/trunk/subversion/libsvn_client/add.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/add.c?rev=1572921&r1=1572920&r2=1572921&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/add.c (original)
+++ subversion/trunk/subversion/libsvn_client/add.c Fri Feb 28 11:18:20 2014
@@ -840,7 +840,7 @@ add(const char *local_abspath,
svn_magic__cookie_t *magic_cookie;
apr_array_header_t *ignores = NULL;
- svn_magic__init(&magic_cookie, ctx->config, scratch_pool);
+ SVN_ERR(svn_magic__init(&magic_cookie, ctx->config, scratch_pool));
if (existing_parent_abspath)
{
Modified: subversion/trunk/subversion/libsvn_client/import.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/import.c?rev=1572921&r1=1572920&r2=1572921&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/import.c (original)
+++ subversion/trunk/subversion/libsvn_client/import.c Fri Feb 28 11:18:20 2014
@@ -664,7 +664,7 @@ import(const char *local_abspath,
const svn_io_dirent2_t *dirent;
import_ctx->autoprops = autoprops;
- svn_magic__init(&import_ctx->magic_cookie, ctx->config, pool);
+ SVN_ERR(svn_magic__init(&import_ctx->magic_cookie, ctx->config, pool));
/* Get a root dir baton. We pass the revnum we used for testing our
assumptions and obtaining inherited properties. */
Modified: subversion/trunk/subversion/libsvn_subr/magic.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/magic.c?rev=1572921&r1=1572920&r2=1572921&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/magic.c (original)
+++ subversion/trunk/subversion/libsvn_subr/magic.c Fri Feb 28 11:18:20 2014
@@ -63,7 +63,7 @@ close_magic_cookie(void *baton)
}
#endif
-void
+svn_error_t *
svn_magic__init(svn_magic__cookie_t **magic_cookie,
apr_hash_t *config,
apr_pool_t *result_pool)
@@ -83,7 +83,7 @@ svn_magic__init(svn_magic__cookie_t **ma
if (!enable)
{
*magic_cookie = NULL;
- return;
+ return SVN_NO_ERROR;
}
}
@@ -115,6 +115,8 @@ svn_magic__init(svn_magic__cookie_t **ma
#endif
*magic_cookie = mc;
+
+ return SVN_NO_ERROR;
}
svn_error_t *