svn commit: r1920918 - in /subversion/branches/windows-shared-ra-modules/subversion/libsvn_ra: deprecated.c ra_loader.c

Author: rinrab
Date: Wed Sep 25 17:23:09 2024
New Revision: 1920918

URL: http://svn.apache.org/viewvc?rev=1920918&view=rev
Log:
On the 'windows-shared-ra-modules' branch: Move implementations of
svn_ra_*_init wrappers from subversion/libsvn_ra/ra_loader.c to
deprecated.c, since they are deprecated, so should be implemented
over there.

* subversion/libsvn_ra/deprecated.c
  (includes): Add ra_init.h of each RA module to the includes.
  (svn_ra_dav_init,
   svn_ra_svn_init,
   svn_ra_local_init,
   svn_ra_serf_init): Move from ra_loader.c.
* subversion/libsvn_ra/ra_loader.c
  (svn_ra_dav_init,
   svn_ra_svn_init,
   svn_ra_local_init,
   svn_ra_serf_init): Move to deprecated.c.

Modified:
    subversion/branches/windows-shared-ra-modules/subversion/libsvn_ra/deprecated.c
    subversion/branches/windows-shared-ra-modules/subversion/libsvn_ra/ra_loader.c

Modified: subversion/branches/windows-shared-ra-modules/subversion/libsvn_ra/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/subversion/libsvn_ra/deprecated.c?rev=1920918&r1=1920917&r2=1920918&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/subversion/libsvn_ra/deprecated.c (original)
+++ subversion/branches/windows-shared-ra-modules/subversion/libsvn_ra/deprecated.c Wed Sep 25 17:23:09 2024
@@ -35,6 +35,11 @@
 
 #include "ra_loader.h"
 
+/* Declarations of the init functions for the available RA libraries. */
+#include "../libsvn_ra_local/ra_init.h"
+#include "../libsvn_ra_svn/ra_init.h"
+#include "../libsvn_ra_serf/ra_init.h"
+
 #include "svn_private_config.h"
 
 
@@ -495,3 +500,56 @@ svn_error_t *svn_ra_get_dir(svn_ra_sessi
   return session->vtable->get_dir(session, dirents, fetched_rev, props,
                                   path, revision, SVN_DIRENT_ALL, pool);
 }
+
+/* For each libsvn_ra_foo library that is not linked in, provide a default
+   implementation for svn_ra_foo_init which returns a "not implemented"
+   error. */
+
+#ifndef SVN_LIBSVN_RA_LINKS_RA_NEON
+svn_error_t *
+svn_ra_dav_init(int abi_version,
+                apr_pool_t *pool,
+                apr_hash_t *hash)
+{
+  return svn_error_create(SVN_ERR_RA_NOT_IMPLEMENTED, NULL, NULL);
+}
+#endif /* ! SVN_LIBSVN_RA_LINKS_RA_NEON */
+
+svn_error_t *
+svn_ra_svn_init(int abi_version,
+                apr_pool_t *pool,
+                apr_hash_t *hash)
+{
+#ifdef SVN_LIBSVN_RA_LINKS_RA_SVN
+  return svn_error_trace(
+    svn_ra_svn__compat_init(abi_version, pool, hash));
+#else
+  return svn_error_create(SVN_ERR_RA_NOT_IMPLEMENTED, NULL, NULL);
+#endif /* ! SVN_LIBSVN_RA_LINKS_RA_SVN */
+}
+
+svn_error_t *
+svn_ra_local_init(int abi_version,
+                  apr_pool_t *pool,
+                  apr_hash_t *hash)
+{
+#ifdef SVN_LIBSVN_RA_LINKS_RA_LOCAL
+  return svn_error_trace(
+    svn_ra_local__compat_init(abi_version, pool, hash));
+#else
+  return svn_error_create(SVN_ERR_RA_NOT_IMPLEMENTED, NULL, NULL);
+#endif /* ! SVN_LIBSVN_RA_LINKS_RA_LOCAL */
+}
+
+svn_error_t *
+svn_ra_serf_init(int abi_version,
+                 apr_pool_t *pool,
+                 apr_hash_t *hash)
+{
+#ifdef SVN_LIBSVN_RA_LINKS_RA_SERF
+  return svn_error_trace(
+    svn_ra_serf__compat_init(abi_version, pool, hash));
+#else
+  return svn_error_create(SVN_ERR_RA_NOT_IMPLEMENTED, NULL, NULL);
+#endif /* ! SVN_LIBSVN_RA_LINKS_RA_SERF */
+}

Modified: subversion/branches/windows-shared-ra-modules/subversion/libsvn_ra/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/subversion/libsvn_ra/ra_loader.c?rev=1920918&r1=1920917&r2=1920918&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/branches/windows-shared-ra-modules/subversion/libsvn_ra/ra_loader.c Wed Sep 25 17:23:09 2024
@@ -1570,56 +1570,3 @@ svn_ra_get_ra_library(svn_ra_plugin_t **
   return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
                            _("Unrecognized URL scheme '%s'"), url);
 }
-
-/* For each libsvn_ra_foo library that is not linked in, provide a default
-   implementation for svn_ra_foo_init which returns a "not implemented"
-   error. */
-
-#ifndef SVN_LIBSVN_RA_LINKS_RA_NEON
-svn_error_t *
-svn_ra_dav_init(int abi_version,
-                apr_pool_t *pool,
-                apr_hash_t *hash)
-{
-  return svn_error_create(SVN_ERR_RA_NOT_IMPLEMENTED, NULL, NULL);
-}
-#endif /* ! SVN_LIBSVN_RA_LINKS_RA_NEON */
-
-svn_error_t *
-svn_ra_svn_init(int abi_version,
-                apr_pool_t *pool,
-                apr_hash_t *hash)
-{
-#ifdef SVN_LIBSVN_RA_LINKS_RA_SVN
-  return svn_error_trace(
-    svn_ra_svn__compat_init(abi_version, pool, hash));
-#else
-  return svn_error_create(SVN_ERR_RA_NOT_IMPLEMENTED, NULL, NULL);
-#endif /* ! SVN_LIBSVN_RA_LINKS_RA_SVN */
-}
-
-svn_error_t *
-svn_ra_local_init(int abi_version,
-                  apr_pool_t *pool,
-                  apr_hash_t *hash)
-{
-#ifdef SVN_LIBSVN_RA_LINKS_RA_LOCAL
-  return svn_error_trace(
-    svn_ra_local__compat_init(abi_version, pool, hash));
-#else
-  return svn_error_create(SVN_ERR_RA_NOT_IMPLEMENTED, NULL, NULL);
-#endif /* ! SVN_LIBSVN_RA_LINKS_RA_LOCAL */
-}
-
-svn_error_t *
-svn_ra_serf_init(int abi_version,
-                 apr_pool_t *pool,
-                 apr_hash_t *hash)
-{
-#ifdef SVN_LIBSVN_RA_LINKS_RA_SERF
-  return svn_error_trace(
-    svn_ra_serf__compat_init(abi_version, pool, hash));
-#else
-  return svn_error_create(SVN_ERR_RA_NOT_IMPLEMENTED, NULL, NULL);
-#endif /* ! SVN_LIBSVN_RA_LINKS_RA_SERF */
-}