subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1136932 - in /subversion/trunk/subversion/libsvn_wc: wc_db.c wc_db.h workqueue.c
Date Fri, 17 Jun 2011 16:53:32 GMT
Author: philip
Date: Fri Jun 17 16:53:32 2011
New Revision: 1136932

URL: http://svn.apache.org/viewvc?rev=1136932&view=rev
Log:
Remove some unneeded parameters.

* subversion/libsvn_wc/wc_db.h
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_read_node_install_info): Remove output parameters that
   the caller doesn't use.

* subversion/libsvn_wc/workqueue.c
  (run_file_install): Update call.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.c
    subversion/trunk/subversion/libsvn_wc/wc_db.h
    subversion/trunk/subversion/libsvn_wc/workqueue.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1136932&r1=1136931&r2=1136932&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Jun 17 16:53:32 2011
@@ -7133,10 +7133,7 @@ svn_wc__db_read_children_walker_info(apr
 
 svn_error_t *
 svn_wc__db_read_node_install_info(const char **wcroot_abspath,
-                                  svn_wc__db_status_t *status,
-                                  svn_wc__db_kind_t *kind,
                                   const svn_checksum_t **sha1_checksum,
-                                  const char **target,
                                   apr_hash_t **pristine_props,
                                   apr_time_t *changed_date,
                                   svn_wc__db_t *db,
@@ -7185,26 +7182,9 @@ svn_wc__db_read_node_install_info(const 
 
   if (have_row)
     {
-      svn_wc__db_status_t db_status;
-
-      apr_int64_t op_depth = svn_sqlite__column_int64(stmt, 0);
-      db_status = svn_sqlite__column_token(stmt, 3, presence_map);
-
-      if (op_depth > 0)
-         err = convert_to_working_status(&db_status, db_status);
-
-      if (status)
-        *status = db_status;
-
-      if (kind)
-        *kind = svn_sqlite__column_token(stmt, 4, kind_map);
-
       if (!err && sha1_checksum)
         err = svn_sqlite__column_checksum(sha1_checksum, stmt, 6, result_pool);
 
-      if (target)
-        *target = svn_sqlite__column_text(stmt, 12, result_pool);
-
       if (!err && pristine_props)
         err = svn_sqlite__column_properties(pristine_props, stmt, 14,
                                             result_pool, scratch_pool);

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1136932&r1=1136931&r2=1136932&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Fri Jun 17 16:53:32 2011
@@ -1898,20 +1898,17 @@ svn_wc__db_read_pristine_info(svn_wc__db
 
 /* Gets the information required to install a pristine file to the working copy
 
-   Set WCROOT_ABSPATH to the working copy root, STATUS to the presence of the
-   node, KIND to the node kind, SHA1_CHECKSUM to the checksum of the node
-   (a valid reference into the pristine store) and PRISTINE_PROPS to the node's
-   pristine properties (to use for installing the file).
+   Set WCROOT_ABSPATH to the working copy root, SHA1_CHECKSUM to the
+   checksum of the node (a valid reference into the pristine store)
+   and PRISTINE_PROPS to the node's pristine properties (to use for
+   installing the file).
 
    If WRI_ABSPATH is not NULL, check for information in the working copy
    identified by WRI_ABSPATH.
    */
 svn_error_t *
 svn_wc__db_read_node_install_info(const char **wcroot_abspath,
-                                  svn_wc__db_status_t *status,
-                                  svn_wc__db_kind_t *kind,
                                   const svn_checksum_t **sha1_checksum,
-                                  const char **target,
                                   apr_hash_t **pristine_props,
                                   apr_time_t *changed_date,
                                   svn_wc__db_t *db,

Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1136932&r1=1136931&r2=1136932&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Fri Jun 17 16:53:32 2011
@@ -653,8 +653,8 @@ run_file_install(svn_wc__db_t *db,
   SVN_ERR(svn_skel__parse_int(&val, arg1->next->next, scratch_pool));
   record_fileinfo = (val != 0);
 
-  SVN_ERR(svn_wc__db_read_node_install_info(&wcroot_abspath, NULL, NULL,
-                                            &checksum, NULL, &props,
+  SVN_ERR(svn_wc__db_read_node_install_info(&wcroot_abspath,
+                                            &checksum, &props,
                                             &changed_date,
                                             db, local_abspath, wri_abspath,
                                             scratch_pool, scratch_pool));



Mime
View raw message