OK for me to commit this?
The API change in it is only to a private API, which, as I understand it, can be changed in any release. (If it were a public API, it would be relevant that this is a loosening of the API, which is source-compatible in one direction, though I'm not sure about binary compatibility.)
- Julian
Remove unnecessary type casts because they are ugly and can easily mask
serious errors.
* subversion/libsvn_fs/bdb/dbt.c
* subversion/libsvn_fs/bdb/dbt.h
(svn_fs__str_to_dbt): Accept a "const" pointer so that callers need not cast.
* subversion/clients/cmdline/main.c
* subversion/libsvn_fs/bdb/changes-table.c
* subversion/libsvn_fs/bdb/copies-table.c
* subversion/libsvn_fs/bdb/dbt.c
* subversion/libsvn_fs/bdb/nodes-table.c
* subversion/libsvn_fs/bdb/reps-table.c
* subversion/libsvn_fs/bdb/strings-table.c
* subversion/libsvn_fs/bdb/txn-table.c
* subversion/libsvn_fs/dag.c
* subversion/libsvn_fs/util/fs_skels.c
Remove unnecessary type casts.
Index: subversion/libsvn_fs/bdb/changes-table.c
===================================================================
--- subversion/libsvn_fs/bdb/changes-table.c (revision 8769)
+++ subversion/libsvn_fs/bdb/changes-table.c (working copy)
@@ -77,7 +77,7 @@ svn_fs__bdb_changes_add (svn_fs_t *fs,
SVN_ERR (svn_fs__unparse_change_skel (&skel, change, trail->pool));
/* Store a new record into the database. */
- svn_fs__str_to_dbt (&query, (char *) key);
+ svn_fs__str_to_dbt (&query, key);
svn_fs__skel_to_dbt (&value, skel, trail->pool);
svn_fs__trail_debug (trail, "changes", "put");
SVN_ERR (BDB_WRAP (fs, "creating change",
@@ -98,7 +98,7 @@ svn_fs__bdb_changes_delete (svn_fs_t *fs
svn_fs__trail_debug (trail, "changes", "del");
db_err = fs->changes->del (fs->changes, trail->db_txn,
- svn_fs__str_to_dbt (&query, (char *) key), 0);
+ svn_fs__str_to_dbt (&query, key), 0);
/* If there're no changes for KEY, that is acceptable. Any other
error should be propogated to the caller, though. */
@@ -248,7 +248,7 @@ svn_fs__bdb_changes_fetch (apr_hash_t **
&cursor, 0)));
/* Advance the cursor to the key that we're looking for. */
- svn_fs__str_to_dbt (&query, (char *) key);
+ svn_fs__str_to_dbt (&query, key);
svn_fs__result_dbt (&result);
db_err = cursor->c_get (cursor, &query, &result, DB_SET);
if (! db_err)
@@ -369,7 +369,7 @@ svn_fs__bdb_changes_fetch_raw (apr_array
&cursor, 0)));
/* Advance the cursor to the key that we're looking for. */
- svn_fs__str_to_dbt (&query, (char *) key);
+ svn_fs__str_to_dbt (&query, key);
svn_fs__result_dbt (&result);
db_err = cursor->c_get (cursor, &query, &result, DB_SET);
if (! db_err)
Index: subversion/libsvn_fs/bdb/copies-table.c
===================================================================
--- subversion/libsvn_fs/bdb/copies-table.c (revision 8769)
+++ subversion/libsvn_fs/bdb/copies-table.c (working copy)
@@ -51,9 +51,8 @@ svn_fs__bdb_open_copies_table (DB **copi
{
DBT key, value;
BDB_ERR (copies->put (copies, 0,
- svn_fs__str_to_dbt (&key,
- (char *) svn_fs__next_key_key),
- svn_fs__str_to_dbt (&value, (char *) "0"),
+ svn_fs__str_to_dbt (&key, svn_fs__next_key_key),
+ svn_fs__str_to_dbt (&value, "0"),
SVN_BDB_AUTO_COMMIT));
}
@@ -78,7 +77,7 @@ put_copy (svn_fs_t *fs,
/* Only in the context of this function do we know that the DB call
will not attempt to modify COPY_ID, so the cast belongs here. */
- svn_fs__str_to_dbt (&key, (char *) copy_id);
+ svn_fs__str_to_dbt (&key, copy_id);
svn_fs__skel_to_dbt (&value, copy_skel, trail->pool);
svn_fs__trail_debug (trail, "copies", "put");
SVN_ERR (BDB_WRAP (fs, "storing copy record",
@@ -99,7 +98,7 @@ svn_fs__bdb_reserve_copy_id (const char
char next_key[SVN_FS__MAX_KEY_SIZE];
int db_err;
- svn_fs__str_to_dbt (&query, (char *) svn_fs__next_key_key);
+ svn_fs__str_to_dbt (&query, svn_fs__next_key_key);
/* Get the current value associated with the `next-id' key in the
copies table. */
@@ -118,9 +117,8 @@ svn_fs__bdb_reserve_copy_id (const char
svn_fs__next_key (result.data, &len, next_key);
svn_fs__trail_debug (trail, "copies", "put");
db_err = fs->copies->put (fs->copies, trail->db_txn,
- svn_fs__str_to_dbt (&query,
- (char *) svn_fs__next_key_key),
- svn_fs__str_to_dbt (&result, (char *) next_key),
+ svn_fs__str_to_dbt (&query, svn_fs__next_key_key),
+ svn_fs__str_to_dbt (&result, next_key),
0);
SVN_ERR (BDB_WRAP (fs, "bumping next copy key", db_err));
@@ -141,7 +139,7 @@ svn_fs__bdb_create_copy (svn_fs_t *fs,
copy.kind = kind;
copy.src_path = src_path;
copy.src_txn_id = src_txn_id;
- copy.dst_noderev_id = (svn_fs_id_t *) dst_noderev_id;
+ copy.dst_noderev_id = dst_noderev_id;
return put_copy (fs, ©, copy_id, trail);
}
@@ -154,7 +152,7 @@ svn_fs__bdb_delete_copy (svn_fs_t *fs,
DBT key;
int db_err;
- svn_fs__str_to_dbt (&key, (char *) copy_id);
+ svn_fs__str_to_dbt (&key, copy_id);
svn_fs__trail_debug (trail, "copies", "del");
db_err = fs->copies->del (fs->copies, trail->db_txn, &key, 0);
if (db_err == DB_NOTFOUND)
@@ -178,7 +176,7 @@ svn_fs__bdb_get_copy (svn_fs__copy_t **c
will not attempt to modify copy_id, so the cast belongs here. */
svn_fs__trail_debug (trail, "copies", "get");
db_err = fs->copies->get (fs->copies, trail->db_txn,
- svn_fs__str_to_dbt (&key, (char *) copy_id),
+ svn_fs__str_to_dbt (&key, copy_id),
svn_fs__result_dbt (&value),
0);
svn_fs__track_dbt (&value, trail->pool);
Index: subversion/libsvn_fs/bdb/dbt.c
===================================================================
--- subversion/libsvn_fs/bdb/dbt.c (revision 8769)
+++ subversion/libsvn_fs/bdb/dbt.c (working copy)
@@ -127,7 +127,7 @@
apr_pool_t *pool)
{
svn_string_t *unparsed_id = svn_fs_unparse_id (id, pool);
- svn_fs__set_dbt (dbt, (char *) unparsed_id->data, unparsed_id->len);
+ svn_fs__set_dbt (dbt, unparsed_id->data, unparsed_id->len);
return dbt;
}
@@ -147,7 +147,7 @@
/* Set DBT to the text of the null-terminated string STR. DBT will
refer to STR's storage. Return DBT. */
DBT *
-svn_fs__str_to_dbt (DBT *dbt, char *str)
+svn_fs__str_to_dbt (DBT *dbt, const char *str)
{
svn_fs__set_dbt (dbt, str, strlen (str));
return dbt;
Index: subversion/libsvn_fs/bdb/dbt.h
===================================================================
--- subversion/libsvn_fs/bdb/dbt.h (revision 8769)
+++ subversion/libsvn_fs/bdb/dbt.h (working copy)
@@ -100,7 +100,7 @@
/* Set DBT to the text of the null-terminated string STR. DBT will
refer to STR's storage. Return DBT. */
-DBT *svn_fs__str_to_dbt (DBT *dbt, char *str);
+DBT *svn_fs__str_to_dbt (DBT *dbt, const char *str);
#ifdef __cplusplus
Index: subversion/libsvn_fs/bdb/nodes-table.c
===================================================================
--- subversion/libsvn_fs/bdb/nodes-table.c (revision 8769)
+++ subversion/libsvn_fs/bdb/nodes-table.c (working copy)
@@ -59,9 +59,8 @@ svn_fs__bdb_open_nodes_table (DB **nodes
DBT key, value;
BDB_ERR (nodes->put (nodes, 0,
- svn_fs__str_to_dbt (&key,
- (char *) svn_fs__next_key_key),
- svn_fs__str_to_dbt (&value, (char *) "1"),
+ svn_fs__str_to_dbt (&key, svn_fs__next_key_key),
+ svn_fs__str_to_dbt (&value, "1"),
SVN_BDB_AUTO_COMMIT));
}
@@ -90,7 +89,7 @@ svn_fs__bdb_new_node_id (svn_fs_id_t **i
assert (txn_id);
/* Get the current value associated with the `next-key' key in the table. */
- svn_fs__str_to_dbt (&query, (char *) svn_fs__next_key_key);
+ svn_fs__str_to_dbt (&query, svn_fs__next_key_key);
svn_fs__trail_debug (trail, "nodes", "get");
SVN_ERR (BDB_WRAP (fs, "allocating new node ID (getting 'next-key')",
fs->nodes->get (fs->nodes, trail->db_txn,
@@ -107,9 +106,8 @@ svn_fs__bdb_new_node_id (svn_fs_id_t **i
svn_fs__next_key (result.data, &len, next_key);
svn_fs__trail_debug (trail, "nodes", "put");
db_err = fs->nodes->put (fs->nodes, trail->db_txn,
- svn_fs__str_to_dbt (&query,
- (char *) svn_fs__next_key_key),
- svn_fs__str_to_dbt (&result, (char *) next_key),
+ svn_fs__str_to_dbt (&query, svn_fs__next_key_key),
+ svn_fs__str_to_dbt (&result, next_key),
0);
SVN_ERR (BDB_WRAP (fs, "bumping next node ID key", db_err));
Index: subversion/libsvn_fs/bdb/reps-table.c
===================================================================
--- subversion/libsvn_fs/bdb/reps-table.c (revision 8769)
+++ subversion/libsvn_fs/bdb/reps-table.c (working copy)
@@ -53,8 +53,8 @@ svn_fs__bdb_open_reps_table (DB **reps_p
BDB_ERR (reps->put
(reps, 0,
- svn_fs__str_to_dbt (&key, (char *) svn_fs__next_key_key),
- svn_fs__str_to_dbt (&value, (char *) "0"),
+ svn_fs__str_to_dbt (&key, svn_fs__next_key_key),
+ svn_fs__str_to_dbt (&value, "0"),
SVN_BDB_AUTO_COMMIT));
}
@@ -80,7 +80,7 @@ svn_fs__bdb_read_rep (svn_fs__representa
db_err = fs->representations->get
(fs->representations,
trail->db_txn,
- svn_fs__str_to_dbt (&query, (char *) key),
+ svn_fs__str_to_dbt (&query, key),
svn_fs__result_dbt (&result), 0);
svn_fs__track_dbt (&result, trail->pool);
@@ -121,7 +121,7 @@ svn_fs__bdb_write_rep (svn_fs_t *fs,
SVN_ERR (BDB_WRAP (fs, "storing representation",
fs->representations->put
(fs->representations, trail->db_txn,
- svn_fs__str_to_dbt (&query, (char *) key),
+ svn_fs__str_to_dbt (&query, key),
svn_fs__skel_to_dbt (&result, skel, trail->pool), 0)));
return SVN_NO_ERROR;
@@ -143,7 +143,7 @@ svn_fs__bdb_write_new_rep (const char **
trail is problematic. */
/* Get the current value associated with `next-key'. */
- svn_fs__str_to_dbt (&query, (char *) svn_fs__next_key_key);
+ svn_fs__str_to_dbt (&query, svn_fs__next_key_key);
svn_fs__trail_debug (trail, "representations", "get");
SVN_ERR (BDB_WRAP (fs, "allocating new representation (getting next-key)",
fs->representations->get (fs->representations,
@@ -164,8 +164,8 @@ svn_fs__bdb_write_new_rep (const char **
svn_fs__trail_debug (trail, "representations", "put");
db_err = fs->representations->put
(fs->representations, trail->db_txn,
- svn_fs__str_to_dbt (&query, (char *) svn_fs__next_key_key),
- svn_fs__str_to_dbt (&result, (char *) next_key),
+ svn_fs__str_to_dbt (&query, svn_fs__next_key_key),
+ svn_fs__str_to_dbt (&result, next_key),
0);
SVN_ERR (BDB_WRAP (fs, "bumping next representation key", db_err));
@@ -183,7 +183,7 @@ svn_fs__bdb_delete_rep (svn_fs_t *fs, co
svn_fs__trail_debug (trail, "representations", "del");
db_err = fs->representations->del
(fs->representations, trail->db_txn,
- svn_fs__str_to_dbt (&query, (char *) key), 0);
+ svn_fs__str_to_dbt (&query, key), 0);
/* If there's no such node, return an appropriately specific error. */
if (db_err == DB_NOTFOUND)
Index: subversion/libsvn_fs/bdb/strings-table.c
===================================================================
--- subversion/libsvn_fs/bdb/strings-table.c (revision 8769)
+++ subversion/libsvn_fs/bdb/strings-table.c (working copy)
@@ -56,8 +56,8 @@ svn_fs__bdb_open_strings_table (DB **str
/* Create the `next-key' table entry. */
BDB_ERR (strings->put
(strings, 0,
- svn_fs__str_to_dbt (&key, (char *) svn_fs__next_key_key),
- svn_fs__str_to_dbt (&value, (char *) "0"),
+ svn_fs__str_to_dbt (&key, svn_fs__next_key_key),
+ svn_fs__str_to_dbt (&value, "0"),
SVN_BDB_AUTO_COMMIT));
}
@@ -192,7 +192,7 @@ svn_fs__bdb_string_read (svn_fs_t *fs,
DBC *cursor;
apr_size_t length, bytes_read = 0;
- svn_fs__str_to_dbt (&query, (char *) key);
+ svn_fs__str_to_dbt (&query, key);
SVN_ERR (locate_key (&length, &cursor, &query, fs, trail));
@@ -285,8 +285,7 @@ get_key_and_bump (svn_fs_t *fs, const ch
/* Advance the cursor to 'next-key' and read it. */
db_err = cursor->c_get (cursor,
- svn_fs__str_to_dbt (&query,
- (char *) svn_fs__next_key_key),
+ svn_fs__str_to_dbt (&query, svn_fs__next_key_key),
svn_fs__result_dbt (&result),
DB_SET);
if (db_err)
@@ -304,7 +303,7 @@ get_key_and_bump (svn_fs_t *fs, const ch
/* Shove the new key back into the database, at the cursor position. */
db_err = cursor->c_put (cursor, &query,
- svn_fs__str_to_dbt (&result, (char *) next_key),
+ svn_fs__str_to_dbt (&result, next_key),
DB_CURRENT);
if (db_err)
{
@@ -338,8 +337,8 @@ svn_fs__bdb_string_append (svn_fs_t *fs,
SVN_ERR (BDB_WRAP (fs, "appending string",
fs->strings->put
(fs->strings, trail->db_txn,
- svn_fs__str_to_dbt (&query, (char *) (*key)),
- svn_fs__set_dbt (&result, (void *) buf, len),
+ svn_fs__str_to_dbt (&query, *key),
+ svn_fs__set_dbt (&result, buf, len),
0)));
return SVN_NO_ERROR;
@@ -354,7 +353,7 @@ svn_fs__bdb_string_clear (svn_fs_t *fs,
int db_err;
DBT query, result;
- svn_fs__str_to_dbt (&query, (char *)key);
+ svn_fs__str_to_dbt (&query, key);
/* Torch the prior contents */
svn_fs__trail_debug (trail, "strings", "del");
@@ -394,7 +393,7 @@ svn_fs__bdb_string_size (svn_filesize_t
apr_size_t length;
svn_filesize_t total;
- svn_fs__str_to_dbt (&query, (char *) key);
+ svn_fs__str_to_dbt (&query, key);
SVN_ERR (locate_key (&length, &cursor, &query, fs, trail));
@@ -429,7 +428,7 @@ svn_fs__bdb_string_delete (svn_fs_t *fs,
svn_fs__trail_debug (trail, "strings", "del");
db_err = fs->strings->del (fs->strings, trail->db_txn,
- svn_fs__str_to_dbt (&query, (char *) key), 0);
+ svn_fs__str_to_dbt (&query, key), 0);
/* If there's no such node, return an appropriately specific error. */
if (db_err == DB_NOTFOUND)
@@ -467,8 +466,8 @@ svn_fs__bdb_string_copy (svn_fs_t *fs,
fs->strings->cursor (fs->strings, trail->db_txn,
&cursor, 0)));
- svn_fs__str_to_dbt (&query, (char *) old_key);
- svn_fs__str_to_dbt (©key, (char *) *new_key);
+ svn_fs__str_to_dbt (&query, old_key);
+ svn_fs__str_to_dbt (©key, *new_key);
svn_fs__clear_dbt (&result);
Index: subversion/libsvn_fs/bdb/txn-table.c
===================================================================
--- subversion/libsvn_fs/bdb/txn-table.c (revision 8769)
+++ subversion/libsvn_fs/bdb/txn-table.c (working copy)
@@ -60,9 +60,8 @@ svn_fs__bdb_open_transactions_table (DB
DBT key, value;
BDB_ERR (txns->put (txns, 0,
- svn_fs__str_to_dbt (&key,
- (char *) svn_fs__next_key_key),
- svn_fs__str_to_dbt (&value, (char *) "0"),
+ svn_fs__str_to_dbt (&key, svn_fs__next_key_key),
+ svn_fs__str_to_dbt (&value, "0"),
SVN_BDB_AUTO_COMMIT));
}
@@ -85,7 +84,7 @@ svn_fs__bdb_put_txn (svn_fs_t *fs,
/* Only in the context of this function do we know that the DB call
will not attempt to modify txn_name, so the cast belongs here. */
- svn_fs__str_to_dbt (&key, (char *) txn_name);
+ svn_fs__str_to_dbt (&key, txn_name);
svn_fs__skel_to_dbt (&value, txn_skel, trail->pool);
svn_fs__trail_debug (trail, "transactions", "put");
SVN_ERR (BDB_WRAP (fs, "storing transaction record",
@@ -108,7 +107,7 @@ allocate_txn_id (const char **id_p,
char next_key[SVN_FS__MAX_KEY_SIZE];
int db_err;
- svn_fs__str_to_dbt (&query, (char *) svn_fs__next_key_key);
+ svn_fs__str_to_dbt (&query, svn_fs__next_key_key);
/* Get the current value associated with the `next-key' key in the table. */
svn_fs__trail_debug (trail, "transactions", "get");
@@ -125,8 +124,8 @@ allocate_txn_id (const char **id_p,
/* Bump to future key. */
len = result.size;
svn_fs__next_key (result.data, &len, next_key);
- svn_fs__str_to_dbt (&query, (char *) svn_fs__next_key_key);
- svn_fs__str_to_dbt (&result, (char *) next_key);
+ svn_fs__str_to_dbt (&query, svn_fs__next_key_key);
+ svn_fs__str_to_dbt (&result, next_key);
svn_fs__trail_debug (trail, "transactions", "put");
db_err = fs->transactions->put (fs->transactions, trail->db_txn,
&query, &result, 0);
@@ -173,7 +172,7 @@ svn_fs__bdb_delete_txn (svn_fs_t *fs,
return svn_fs__err_txn_not_mutable (fs, txn_name);
/* Delete the transaction from the `transactions' table. */
- svn_fs__str_to_dbt (&key, (char *) txn_name);
+ svn_fs__str_to_dbt (&key, txn_name);
svn_fs__trail_debug (trail, "transactions", "del");
SVN_ERR (BDB_WRAP (fs, "deleting entry from 'transactions' table",
fs->transactions->del (fs->transactions,
@@ -198,7 +197,7 @@ svn_fs__bdb_get_txn (svn_fs__transaction
will not attempt to modify txn_name, so the cast belongs here. */
svn_fs__trail_debug (trail, "transactions", "get");
db_err = fs->transactions->get (fs->transactions, trail->db_txn,
- svn_fs__str_to_dbt (&key, (char *) txn_name),
+ svn_fs__str_to_dbt (&key, txn_name),
svn_fs__result_dbt (&value),
0);
svn_fs__track_dbt (&value, trail->pool);
Index: subversion/libsvn_fs/dag.c
===================================================================
--- subversion/libsvn_fs/dag.c (revision 8769)
+++ subversion/libsvn_fs/dag.c (working copy)
@@ -459,10 +459,10 @@ get_dir_entries (apr_hash_t **entries_p,
/* KEY will be the entry name in ancestor, VAL the id. */
apr_hash_this (hi, &key, &klen, &val);
- dirent->name = (char *) key;
+ dirent->name = key;
dirent->id = val;
dirent->kind = svn_node_unknown;
- apr_hash_set (*entries_p, key, klen, (void *) dirent);
+ apr_hash_set (*entries_p, key, klen, dirent);
}
/* Return our findings. */
@@ -555,7 +555,7 @@ set_entry (dag_node_t *parent,
entries = apr_hash_make (trail->pool);
/* Now, add our new entry to the entries list. */
- apr_hash_set (entries, name, APR_HASH_KEY_STRING, (void *) id);
+ apr_hash_set (entries, name, APR_HASH_KEY_STRING, id);
/* Finally, replace the old entries list with the new one. */
SVN_ERR (svn_fs__unparse_entries_skel (&entries_skel, entries, trail->pool));
Index: subversion/libsvn_fs/util/fs_skels.c
===================================================================
--- subversion/libsvn_fs/util/fs_skels.c (revision 8769)
+++ subversion/libsvn_fs/util/fs_skels.c (working copy)
@@ -362,7 +362,7 @@ svn_fs__parse_proplist_skel (apr_hash_t
apr_hash_set (proplist,
apr_pstrmemdup (pool, elt->data, elt->len),
elt->len,
- (void *)value);
+ value);
}
/* Return the structure. */
@@ -718,7 +718,7 @@ svn_fs__parse_entries_skel (apr_hash_t *
elt->children->next->len, pool);
/* Add the entry to the hash. */
- apr_hash_set (entries, name, elt->children->len, (void *) id);
+ apr_hash_set (entries, name, elt->children->len, id);
}
}
Index: subversion/clients/cmdline/main.c
===================================================================
--- subversion/clients/cmdline/main.c (revision 8769)
+++ subversion/clients/cmdline/main.c (working copy)
@@ -1222,8 +1222,7 @@ main (int argc, const char * const *argv
/* Same with the --non-interactive option. */
if (opt_state.non_interactive)
- svn_auth_set_parameter(ab, SVN_AUTH_PARAM_NON_INTERACTIVE,
- (void *) "");
+ svn_auth_set_parameter(ab, SVN_AUTH_PARAM_NON_INTERACTIVE, "");
if (opt_state.config_dir)
svn_auth_set_parameter(ab, SVN_AUTH_PARAM_CONFIG_DIR,
@@ -1238,8 +1237,7 @@ main (int argc, const char * const *argv
TRUE)))
svn_handle_error (err, stderr, TRUE);
if (opt_state.no_auth_cache || !store_password_val)
- svn_auth_set_parameter(ab, SVN_AUTH_PARAM_NO_AUTH_CACHE,
- (void *) "");
+ svn_auth_set_parameter(ab, SVN_AUTH_PARAM_NO_AUTH_CACHE, "");
}
/* Set up our cancellation support. */
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Mar 7 20:42:36 2004