Replaced SVN_REVNUM_T_FTM with calls to svn_revnum_to_cstring() in many places. * subversion/svnadmin/main.c: * subversion/libsvn_wc/adm_files.c: * subversion/libsvn_client/ra.c: * subversion/libsvn_client/diff.c: * subversion/libsvn_client/copy.c: * subversion/libsvn_client/blame.c: * subversion/svnlook/main.c: * subversion/clients/cmdline/propdel-cmd.c: * subversion/clients/cmdline/move-cmd.c: * subversion/clients/cmdline/mkdir-cmd.c: * subversion/clients/cmdline/copy-cmd.c: * subversion/clients/cmdline/ls-cmd.c: * subversion/clients/cmdline/commit-cmd.c: * subversion/clients/cmdline/propset-cmd.c: * subversion/clients/cmdline/delete-cmd.c: * subversion/clients/cmdline/notify.c: * subversion/clients/cmdline/import-cmd.c: * subversion/clients/cmdline/proplist-cmd.c: * subversion/clients/cmdline/propedit-cmd.c: * subversion/clients/cmdline/info-cmd.c: * subversion/svndumpfilter/main.c: * subversion/libsvn_repos/load.c: * subversion/libsvn_repos/log.c: * subversion/libsvn_repos/dump.c: * subversion/libsvn_repos/rev_hunt.c: * subversion/svnversion/main.c: SVN_REVNUM_T_FMT -> svn_revnum_to_cstring * subversion/clients/cmdline/log-cmd.c: SVN_REVNUM_T_FMT -> svn_revnum_to_cstring (log_message_receiver_xml): Change revstr to const char * to silence a compiler warning. * subversion/libsvn_fs_fs/tree.c: SVN_REVNUM_T_FMT -> svn_revnum_to_cstring (not_found, already_exists): Add pool argument. * subversion/libsvn_fs_fs/err.c: * subversion/libsvn_fs_fs/err.h: SVN_REVNUM_T_FMT -> svn_revnum_to_cstring (svn_fs_fs__err_corrupt_fs_revision, svn_fs_fs__err_dangling_rev, svn_fs_fs__err_not_mutable): Added pool argument. * subversion/clients/cmdline/cl.h: * subversion/clients/cmdline/util.c: SVN_REVNUM_T_FMT -> svn_revnum_to_cstring (svn_cl__print_commit_info): Added pool argument. * subversion/libsvn_fs_base/tree.c: SVN_REVNUM_T_FMT -> svn_revnum_to_cstring (not_found, already_exists) Add pool argument. * subversion/libsvn_fs_base/err.c: * subversion/libsvn_fs_base/err.h: * subversion/libsvn_fs_base/bdb/rev-table.c: * subversion/libsvn_fs_base/revs-txns.c: SVN_REVNUM_T_FMT -> svn_revnum_to_cstring (svn_fs_base__err_corrupt_fs_revision, svn_fs_base__err_dangling_rev, svn_fs_base__err_not_mutable): Add pool argument. Index: subversion/libsvn_fs_base/tree.c =================================================================== --- subversion/libsvn_fs_base/tree.c (revision 9652) +++ subversion/libsvn_fs_base/tree.c (arbetskopia) @@ -365,7 +365,7 @@ /* Return the error SVN_ERR_FS_NOT_FOUND, with a detailed error text, for PATH in ROOT. */ static svn_error_t * -not_found (svn_fs_root_t *root, const char *path) +not_found (svn_fs_root_t *root, const char *path, apr_pool_t *pool) { if (root->is_txn_root) return @@ -377,14 +377,14 @@ return svn_error_createf (SVN_ERR_FS_NOT_FOUND, 0, - "File not found: revision '%" SVN_REVNUM_T_FMT "', path '%s'", - root->rev, path); + "File not found: revision '%s', path '%s'", + svn_revnum_to_cstring (root->rev, pool), path); } /* Return a detailed `file already exists' message for PATH in ROOT. */ static svn_error_t * -already_exists (svn_fs_root_t *root, const char *path) +already_exists (svn_fs_root_t *root, const char *path, apr_pool_t* pool) { svn_fs_t *fs = root->fs; @@ -398,8 +398,11 @@ return svn_error_createf (SVN_ERR_FS_ALREADY_EXISTS, 0, - "File already exists: filesystem '%s', revision '%" SVN_REVNUM_T_FMT - "', path '%s'", fs->path, root->rev, path); + "File already exists: filesystem '%s', revision '%s" + "', path '%s'", + fs->path, + svn_revnum_to_cstring (root->rev, pool), + path); } @@ -447,13 +450,15 @@ mutable_root_node (dag_node_t **node_p, svn_fs_root_t *root, const char *error_path, - trail_t *trail) + trail_t *trail, + apr_pool_t *pool) { if (root->is_txn_root) return svn_fs_base__dag_clone_root (node_p, root->fs, root->txn, trail); else /* If it's not a transaction root, we can't change its contents. */ - return svn_fs_base__err_not_mutable (root->fs, root->rev, error_path); + return svn_fs_base__err_not_mutable (root->fs, root->rev, error_path, + pool); } @@ -783,7 +788,7 @@ { /* Build a better error message than svn_fs_base__dag_open can provide, giving the root and full path name. */ - return not_found (root, path); + return not_found (root, path, pool); } } @@ -904,7 +909,8 @@ else { /* We're trying to clone the root directory. */ - SVN_ERR (mutable_root_node (&clone, root, error_path, trail)); + SVN_ERR (mutable_root_node (&clone, root, error_path, trail, + trail->pool)); } /* Update the PARENT_PATH link to refer to the clone. */ @@ -2773,7 +2779,7 @@ /* If there's already a sub-directory by that name, complain. This also catches the case of trying to make a subdirectory named `/'. */ if (parent_path->node) - return already_exists (root, path); + return already_exists (root, path, trail->pool); /* Create the subdirectory. */ SVN_ERR (make_path_mutable (root, parent_path->parent, path, trail)); @@ -3115,7 +3121,7 @@ /* If there's already a file by that name, complain. This also catches the case of trying to make a file named `/'. */ if (parent_path->node) - return already_exists (root, path); + return already_exists (root, path, trail->pool); /* Create the file. */ SVN_ERR (make_path_mutable (root, parent_path->parent, path, trail)); @@ -3848,7 +3854,7 @@ /* And we require that the path exist in the root. */ SVN_ERR (base_check_path (&kind, root, path, pool)); if (kind == svn_node_none) - return not_found (root, path); + return not_found (root, path, pool); /* Okay, all seems well. Build our history object and return it. */ *history_p = assemble_history (root->fs, Index: subversion/libsvn_fs_base/bdb/rev-table.c =================================================================== --- subversion/libsvn_fs_base/bdb/rev-table.c (revision 9652) +++ subversion/libsvn_fs_base/bdb/rev-table.c (arbetskopia) @@ -79,7 +79,7 @@ /* If there's no such revision, return an appropriately specific error. */ if (db_err == DB_NOTFOUND) - return svn_fs_base__err_dangling_rev (fs, rev); + return svn_fs_base__err_dangling_rev (fs, rev, trail->pool); /* Handle any other error conditions. */ SVN_ERR (BDB_WRAP (fs, "reading filesystem revision", db_err)); @@ -87,7 +87,7 @@ /* Parse REVISION skel. */ skel = svn_fs_base__parse_skel (value.data, value.size, trail->pool); if (! skel) - return svn_fs_base__err_corrupt_fs_revision (fs, rev); + return svn_fs_base__err_corrupt_fs_revision (fs, rev, trail->pool); /* Convert skel to native type. */ SVN_ERR (svn_fs_base__parse_revision_skel (&revision, skel, trail->pool)); Index: subversion/libsvn_fs_base/revs-txns.c =================================================================== --- subversion/libsvn_fs_base/revs-txns.c (revision 9652) +++ subversion/libsvn_fs_base/revs-txns.c (arbetskopia) @@ -91,7 +91,7 @@ SVN_ERR (svn_fs_bdb__get_rev (&revision, fs, rev, trail)); if (revision->txn_id == NULL) - return svn_fs_base__err_corrupt_fs_revision (fs, rev); + return svn_fs_base__err_corrupt_fs_revision (fs, rev, trail->pool); SVN_ERR (get_txn (&txn, fs, revision->txn_id, FALSE, trail)); if (txn->revision != rev) @@ -115,7 +115,7 @@ SVN_ERR (get_rev_txn (&txn, NULL, fs, rev, trail)); if (txn->root_id == NULL) - return svn_fs_base__err_corrupt_fs_revision (fs, rev); + return svn_fs_base__err_corrupt_fs_revision (fs, rev, trail->pool); *root_id_p = txn->root_id; return SVN_NO_ERROR; @@ -132,7 +132,7 @@ SVN_ERR (svn_fs_bdb__get_rev (&revision, fs, rev, trail)); if (revision->txn_id == NULL) - return svn_fs_base__err_corrupt_fs_revision (fs, rev); + return svn_fs_base__err_corrupt_fs_revision (fs, rev, trail->pool); *txn_id_p = revision->txn_id; return SVN_NO_ERROR; Index: subversion/libsvn_fs_base/err.c =================================================================== --- subversion/libsvn_fs_base/err.c (revision 9652) +++ subversion/libsvn_fs_base/err.c (arbetskopia) @@ -60,12 +60,13 @@ svn_error_t * -svn_fs_base__err_corrupt_fs_revision (svn_fs_t *fs, svn_revnum_t rev) +svn_fs_base__err_corrupt_fs_revision (svn_fs_t *fs, svn_revnum_t rev, + apr_pool_t* pool) { return svn_error_createf (SVN_ERR_FS_CORRUPT, 0, - "Corrupt filesystem revision '%" SVN_REVNUM_T_FMT "' in filesystem '%s'", - rev, fs->path); + "Corrupt filesystem revision '%s' in filesystem '%s'", + svn_revnum_to_cstring (rev, pool), fs->path); } @@ -103,14 +104,13 @@ svn_error_t * -svn_fs_base__err_dangling_rev (svn_fs_t *fs, svn_revnum_t rev) +svn_fs_base__err_dangling_rev (svn_fs_t *fs, svn_revnum_t rev, + apr_pool_t* pool) { return svn_error_createf (SVN_ERR_FS_NO_SUCH_REVISION, 0, - "Reference to non-existent revision '%" - SVN_REVNUM_T_FMT - "' in filesystem '%s'", - rev, fs->path); + "Reference to non-existent revision '%s' in filesystem '%s'", + svn_revnum_to_cstring (rev, pool), fs->path); } @@ -159,13 +159,14 @@ svn_error_t * -svn_fs_base__err_not_mutable (svn_fs_t *fs, svn_revnum_t rev, const char *path) +svn_fs_base__err_not_mutable (svn_fs_t *fs, svn_revnum_t rev, const char *path, + apr_pool_t *pool) { return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, 0, - "File is not mutable: filesystem '%s', revision %" SVN_REVNUM_T_FMT - ", path '%s'", fs->path, rev, path); + "File is not mutable: filesystem '%s', revision %s" + ", path '%s'", fs->path, svn_revnum_to_cstring (rev, pool), path); } Index: subversion/libsvn_fs_base/err.h =================================================================== --- subversion/libsvn_fs_base/err.h (revision 9652) +++ subversion/libsvn_fs_base/err.h (arbetskopia) @@ -49,7 +49,8 @@ /* SVN_ERR_FS_CORRUPT: the REVISION skel of revision REV in FS is corrupt. */ svn_error_t *svn_fs_base__err_corrupt_fs_revision (svn_fs_t *fs, - svn_revnum_t rev); + svn_revnum_t rev, + apr_pool_t *pool); /* SVN_ERR_FS_CORRUPT: ID is a node ID, not a node revision ID. */ svn_error_t *svn_fs_base__err_corrupt_id (svn_fs_t *fs, const svn_fs_id_t *id); @@ -67,7 +68,8 @@ /* SVN_ERR_FS_CORRUPT: something in FS refers to filesystem revision REV, but that filesystem revision doesn't exist. */ -svn_error_t *svn_fs_base__err_dangling_rev (svn_fs_t *fs, svn_revnum_t rev); +svn_error_t *svn_fs_base__err_dangling_rev (svn_fs_t *fs, svn_revnum_t rev, + apr_pool_t *pool); /* SVN_ERR_FS_CORRUPT: a key in FS's `nodes' table is bogus. */ svn_error_t *svn_fs_base__err_corrupt_nodes_key (svn_fs_t *fs); @@ -87,7 +89,8 @@ /* SVN_ERR_FS_NOT_MUTABLE: the caller attempted to change a node outside of a transaction. */ svn_error_t *svn_fs_base__err_not_mutable (svn_fs_t *fs, svn_revnum_t rev, - const char *path); + const char *path, + apr_pool_t *pool); /* SVN_ERR_FS_PATH_SYNTAX: PATH is not a valid path name. */ svn_error_t *svn_fs_base__err_path_syntax (svn_fs_t *fs, const char *path); Index: subversion/svnadmin/main.c =================================================================== --- subversion/svnadmin/main.c (revision 9652) +++ subversion/svnadmin/main.c (arbetskopia) @@ -431,8 +431,8 @@ if ((start > youngest) || (end > youngest)) return svn_error_createf (SVN_ERR_CL_ARG_PARSING_ERROR, NULL, - "Revisions must not be greater than the youngest revision (%" - SVN_REVNUM_T_FMT ")", youngest); + "Revisions must not be greater than the youngest revision (%s)", + svn_revnum_to_cstring (youngest, pool)); /* Loop over the requested revision range, performing the predecessor deltification on paths changed in each. */ @@ -441,7 +441,8 @@ svn_pool_clear (subpool); SVN_ERR (check_cancel (NULL)); if (! opt_state->quiet) - printf ("Deltifying revision %" SVN_REVNUM_T_FMT "...", revision); + printf ("Deltifying revision %s...", + svn_revnum_to_cstring (revision, pool)); SVN_ERR (svn_fs_deltify_revision (fs, revision, subpool)); if (! opt_state->quiet) printf (_("done.\n")); @@ -499,8 +500,8 @@ if ((lower > youngest) || (upper > youngest)) return svn_error_createf (SVN_ERR_CL_ARG_PARSING_ERROR, NULL, - "Revisions must not be greater than the youngest revision (%" - SVN_REVNUM_T_FMT ")", youngest); + "Revisions must not be greater than the youngest revision (%s)", + svn_revnum_to_cstring (youngest, pool)); /* Run the dump to STDOUT. Let the user redirect output into a file if they want. :-) */ @@ -614,8 +615,8 @@ recovery actually worked. */ SVN_ERR (open_repos (&repos, opt_state->repository_path, pool)); SVN_ERR (svn_fs_youngest_rev (&youngest_rev, svn_repos_fs (repos), pool)); - printf ("The latest repos revision is %" - SVN_REVNUM_T_FMT ".\n", youngest_rev); + printf ("The latest repos revision is %s.\n", + svn_revnum_to_cstring (youngest_rev, pool)); return SVN_NO_ERROR; } Index: subversion/libsvn_wc/adm_files.c =================================================================== --- subversion/libsvn_wc/adm_files.c (revision 9652) +++ subversion/libsvn_wc/adm_files.c (arbetskopia) @@ -900,11 +900,13 @@ && !(entry->schedule == svn_wc_schedule_delete && revision == 0)) return svn_error_createf (SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL, - "Revision %" SVN_REVNUM_T_FMT - " doesn't match existing revision %" - SVN_REVNUM_T_FMT " in '%s'", - revision, entry->revision, path); + "Revision %s" + " doesn't match existing revision %s" + " in '%s'", + svn_revnum_to_cstring (revision, pool), + svn_revnum_to_cstring (entry->revision, pool), + path); /** ### comparing URLs, should they be canonicalized first? */ if (strcmp (entry->url, url) != 0) Index: subversion/svnlook/main.c =================================================================== --- subversion/svnlook/main.c (revision 9652) +++ subversion/svnlook/main.c (arbetskopia) @@ -807,8 +807,10 @@ SVN_ERR (svn_utf_cstring_from_utf8 (&base_path_native, base_path, pool)); - printf ("Copied: %s (from rev %" SVN_REVNUM_T_FMT ", %s)\n", - path_native, node->copyfrom_rev, base_path_native); + printf ("Copied: %s (from rev %s, %s)\n", + path_native, + svn_revnum_to_cstring (node->copyfrom_rev, pool), + base_path_native); SVN_ERR (svn_fs_revision_root (&base_root, svn_fs_root_fs (base_root), @@ -1356,12 +1358,12 @@ SVN_ERR (svn_fs_revision_root (&rev_root, phb->fs, revision, pool)); SVN_ERR (svn_fs_node_id (&node_id, rev_root, path, pool)); id_string = svn_fs_unparse_id (node_id, pool); - printf ("%8" SVN_REVNUM_T_FMT " %s <%s>\n", - revision, path, id_string->data); + printf ("%8s %s <%s>\n", + svn_revnum_to_cstring (revision, pool), path, id_string->data); } else { - printf ("%8" SVN_REVNUM_T_FMT " %s\n", revision, path); + printf ("%8s %s\n", svn_revnum_to_cstring (revision, pool), path); } return SVN_NO_ERROR; @@ -1760,7 +1762,7 @@ svnlook_ctxt_t *c; SVN_ERR (get_ctxt_baton (&c, opt_state, pool)); - printf ("%" SVN_REVNUM_T_FMT "\n", c->rev_id); + printf ("%s\n", svn_revnum_to_cstring (c->rev_id, pool)); return SVN_NO_ERROR; } Index: subversion/libsvn_client/ra.c =================================================================== --- subversion/libsvn_client/ra.c (revision 9652) +++ subversion/libsvn_client/ra.c (arbetskopia) @@ -430,8 +430,9 @@ else return svn_error_createf (SVN_ERR_CLIENT_UNRELATED_RESOURCES, NULL, "Missing changed-path information for " - "'%s' in revision %" SVN_REVNUM_T_FMT, - path, revision); + "'%s' in revision %s", + path, + svn_revnum_to_cstring (revision, pool)); } *prev_path_p = prev_path; @@ -565,8 +566,8 @@ if (lrb.kind == svn_node_none) return svn_error_createf (SVN_ERR_FS_NOT_FOUND, NULL, - "path '%s' doesn't exist in revision %" SVN_REVNUM_T_FMT, - path, peg_revnum); + "path '%s' doesn't exist in revision %s", + path, svn_revnum_to_cstring (peg_revnum, pool)); /* Populate most of our log receiver baton structure. */ SVN_ERR (ra_lib->get_repos_root (ra_session, &repos_url, pool)); @@ -625,18 +626,18 @@ if (! lrb.start_path) return svn_error_createf (APR_EGENERAL, NULL, - "Unable to find repository location for '%s' in revision %" - SVN_REVNUM_T_FMT, path, start_revnum); + "Unable to find repository location for '%s' in revision %s", + path, svn_revnum_to_cstring (start_revnum, pool)); if (! lrb.end_path) return svn_error_createf (APR_EGENERAL, NULL, - "Unable to find repository location for '%s' in revision %" - SVN_REVNUM_T_FMT, path, end_revnum); + "Unable to find repository location for '%s' in revision %s", + path, svn_revnum_to_cstring (end_revnum, pool)); if (! lrb.peg_path) return svn_error_createf (APR_EGENERAL, NULL, - "Unable to find repository location for '%s' in revision %" - SVN_REVNUM_T_FMT, path, peg_revnum); + "Unable to find repository location for '%s' in revision %s", + path, svn_revnum_to_cstring (peg_revnum, pool)); /* Repository paths might be absolute, but we want to treat them as relative. */ @@ -655,8 +656,8 @@ if (strcmp (url, svn_path_join (repos_url, lrb.peg_path, pool)) != 0) return svn_error_createf (SVN_ERR_CLIENT_UNRELATED_RESOURCES, NULL, - "'%s' in revision %" SVN_REVNUM_T_FMT " is an unrelated object.", - path, youngest); + "'%s' in revision %s is an unrelated object.", + path, svn_revnum_to_cstring (youngest, pool)); } /* Set our return variables */ Index: subversion/libsvn_client/diff.c =================================================================== --- subversion/libsvn_client/diff.c (revision 9652) +++ subversion/libsvn_client/diff.c (arbetskopia) @@ -264,8 +264,8 @@ { const char *label; if (revnum != SVN_INVALID_REVNUM) - label = apr_psprintf (pool, "%s\t(revision %" SVN_REVNUM_T_FMT ")", - path, revnum); + label = apr_psprintf (pool, "%s\t(revision %s)", + path, svn_revnum_to_cstring (revnum, pool)); else label = apr_psprintf (pool, _("%s\t(working copy)"), path); @@ -658,11 +658,13 @@ apr_pool_t *subpool = svn_pool_create (merge_b->pool); const char *target_label = ".working"; const char *left_label = apr_psprintf (subpool, - ".merge-left.r%" SVN_REVNUM_T_FMT, - older_rev); + ".merge-left.r%s", + svn_revnum_to_cstring (older_rev, + subpool)); const char *right_label = apr_psprintf (subpool, - ".merge-right.r%" SVN_REVNUM_T_FMT, - yours_rev); + ".merge-right.r%s", + svn_revnum_to_cstring (yours_rev, + subpool)); svn_boolean_t has_local_mods; svn_boolean_t merge_required = TRUE; enum svn_wc_merge_outcome_t merge_outcome; @@ -1608,13 +1610,13 @@ if (kind1 == svn_node_none) return svn_error_createf (SVN_ERR_FS_NOT_FOUND, NULL, - "'%s' was not found in the repository at revision %" - SVN_REVNUM_T_FMT, url1, rev1); + "'%s' was not found in the repository at revision %s", + url1, svn_revnum_to_cstring (rev1, pool)); if (kind2 == svn_node_none) return svn_error_createf (SVN_ERR_FS_NOT_FOUND, NULL, - "'%s' was not found in the repository at revision %" - SVN_REVNUM_T_FMT, url2, rev2); + "'%s' was not found in the repository at revision %s", + url2, svn_revnum_to_cstring (rev2, pool)); if ((kind1 == svn_node_file) || (kind2 == svn_node_file)) { svn_path_split (url1, &anchor1, &target1, pool); Index: subversion/libsvn_client/copy.c =================================================================== --- subversion/libsvn_client/copy.c (revision 9652) +++ subversion/libsvn_client/copy.c (arbetskopia) @@ -378,8 +378,8 @@ if (src_kind == svn_node_none) return svn_error_createf (SVN_ERR_FS_NOT_FOUND, NULL, - "Path '%s' does not exist in revision '%" SVN_REVNUM_T_FMT "'", - src_url, src_revnum); + "Path '%s' does not exist in revision '%s'", + src_url, svn_revnum_to_cstring (src_revnum, pool)); /* Figure out the basename that will result from this operation. */ SVN_ERR (ra_lib->check_path (sess, dst_rel, youngest, &dst_kind, pool)); @@ -786,8 +786,8 @@ if (SVN_IS_VALID_REVNUM (src_revnum)) return svn_error_createf (SVN_ERR_FS_NOT_FOUND, NULL, - "Path '%s' not found in revision '%" SVN_REVNUM_T_FMT "'", - src_url, src_revnum); + "Path '%s' not found in revision '%s'", + src_url, svn_revnum_to_cstring (src_revnum, pool)); else return svn_error_createf (SVN_ERR_FS_NOT_FOUND, NULL, Index: subversion/libsvn_client/blame.c =================================================================== --- subversion/libsvn_client/blame.c (revision 9652) +++ subversion/libsvn_client/blame.c (arbetskopia) @@ -400,9 +400,11 @@ else return svn_error_createf (APR_EGENERAL, NULL, "Revision action '%c' for " - "revision %" SVN_REVNUM_T_FMT " of '%s'" + "revision %s of '%s'" "lacks a prior revision", - lmb.action, lmb.eldest->revision, + lmb.action, + svn_revnum_to_cstring (lmb.eldest->revision, + pool), lmb.eldest->path); /* Walk the revision list in chronological order, downloading Index: subversion/clients/cmdline/cl.h =================================================================== --- subversion/clients/cmdline/cl.h (revision 9652) +++ subversion/clients/cmdline/cl.h (arbetskopia) @@ -190,7 +190,8 @@ /*** Command-line output functions -- printing to the user. ***/ /* Print out commit information found in COMMIT_INFO to the console. */ -void svn_cl__print_commit_info (svn_client_commit_info_t *commit_info); +void svn_cl__print_commit_info (svn_client_commit_info_t *commit_info, + apr_pool_t *pool); /* Print STATUS for PATH to stdout for human consumption. Prints in Index: subversion/clients/cmdline/propdel-cmd.c =================================================================== --- subversion/clients/cmdline/propdel-cmd.c (revision 9652) +++ subversion/clients/cmdline/propdel-cmd.c (arbetskopia) @@ -94,9 +94,8 @@ const char *pname_stdout; SVN_ERR (svn_cmdline_cstring_from_utf8 (&pname_stdout, pname_utf8, pool)); - printf ("property '%s' deleted from repository revision '%" - SVN_REVNUM_T_FMT"'\n", - pname_stdout, rev); + printf ("property '%s' deleted from repository revision '%s'\n", + pname_stdout, svn_revnum_to_cstring (rev, pool)); } } else if (opt_state->start_revision.kind != svn_opt_revision_unspecified) Index: subversion/clients/cmdline/move-cmd.c =================================================================== --- subversion/clients/cmdline/move-cmd.c (revision 9652) +++ subversion/clients/cmdline/move-cmd.c (arbetskopia) @@ -77,7 +77,7 @@ SVN_ERR (svn_cl__cleanup_log_msg (ctx->log_msg_baton, err)); if (commit_info && ! opt_state->quiet) - svn_cl__print_commit_info (commit_info); + svn_cl__print_commit_info (commit_info, pool); return SVN_NO_ERROR; } Index: subversion/clients/cmdline/mkdir-cmd.c =================================================================== --- subversion/clients/cmdline/mkdir-cmd.c (revision 9652) +++ subversion/clients/cmdline/mkdir-cmd.c (arbetskopia) @@ -77,7 +77,7 @@ } if (commit_info && ! opt_state->quiet) - svn_cl__print_commit_info (commit_info); + svn_cl__print_commit_info (commit_info, subpool); return SVN_NO_ERROR; } Index: subversion/clients/cmdline/copy-cmd.c =================================================================== --- subversion/clients/cmdline/copy-cmd.c (revision 9652) +++ subversion/clients/cmdline/copy-cmd.c (arbetskopia) @@ -111,7 +111,7 @@ ctx, pool))); if (commit_info && ! opt_state->quiet) - svn_cl__print_commit_info (commit_info); + svn_cl__print_commit_info (commit_info, pool); return SVN_NO_ERROR; } Index: subversion/clients/cmdline/util.c =================================================================== --- subversion/clients/cmdline/util.c (revision 9652) +++ subversion/clients/cmdline/util.c (arbetskopia) @@ -51,12 +51,13 @@ void -svn_cl__print_commit_info (svn_client_commit_info_t *commit_info) +svn_cl__print_commit_info (svn_client_commit_info_t *commit_info, + apr_pool_t* pool) { if ((commit_info) && (SVN_IS_VALID_REVNUM (commit_info->revision))) - printf ("\nCommitted revision %" SVN_REVNUM_T_FMT ".\n", - commit_info->revision); + printf ("\nCommitted revision %s.\n", + svn_revnum_to_cstring (commit_info->revision, pool)); return; } Index: subversion/clients/cmdline/ls-cmd.c =================================================================== --- subversion/clients/cmdline/ls-cmd.c (revision 9652) +++ subversion/clients/cmdline/ls-cmd.c (arbetskopia) @@ -94,8 +94,8 @@ sprintf (size_buf, "%" SVN_FILESIZE_T_FMT, dirent->size); - printf ("%7"SVN_REVNUM_T_FMT" %-8.8s %10s %12s %s%s\n", - dirent->created_rev, + printf ("%7s %-8.8s %10s %12s %s%s\n", + svn_revnum_to_cstring (dirent->created_rev, pool), stdout_author ? stdout_author : " ? ", (dirent->kind == svn_node_file) ? size_buf : "", timestr, Index: subversion/clients/cmdline/log-cmd.c =================================================================== --- subversion/clients/cmdline/log-cmd.c (revision 9652) +++ subversion/clients/cmdline/log-cmd.c (arbetskopia) @@ -245,8 +245,9 @@ SVN_ERR (svn_stream_printf (lb->out, pool, SEP_STRING)); SVN_ERR (svn_stream_printf (lb->out, pool, - "r%" SVN_REVNUM_T_FMT " | %s | %s", - rev, author_stdout, date_stdout)); + "r%s | %s | %s", + svn_revnum_to_cstring (rev, pool), + author_stdout, date_stdout)); if (! lb->omit_log_message) { @@ -285,9 +286,10 @@ (&path_stdout, log_item->copyfrom_path, pool)); copy_data = apr_psprintf (pool, - " (from %s:%" SVN_REVNUM_T_FMT ")", + " (from %s:%s)", path_stdout, - log_item->copyfrom_rev); + svn_revnum_to_cstring (log_item->copyfrom_rev, + pool)); } SVN_ERR (svn_cmdline_cstring_from_utf8 (&path_stdout, path, pool)); SVN_ERR (svn_stream_printf (lb->out, pool, " %c %s%s" APR_EOL_STR, @@ -355,7 +357,7 @@ struct log_receiver_baton *lb = baton; /* Collate whole log message into sb before printing. */ svn_stringbuf_t *sb = svn_stringbuf_create ("", pool); - char *revstr; + const char *revstr; const char *msg_native_eol; if (lb->cancel_func) @@ -364,7 +366,7 @@ if (rev == 0) return SVN_NO_ERROR; - revstr = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, rev); + revstr = svn_revnum_to_cstring (rev, pool); /* */ svn_xml_make_open_tag (&sb, pool, svn_xml_normal, "logentry", "revision", revstr, NULL); @@ -417,8 +419,7 @@ svn_stringbuf_t *escpath = svn_stringbuf_create ("", pool); svn_xml_escape_attr_cstring (&escpath, log_item->copyfrom_path, pool); - revstr = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, - log_item->copyfrom_rev); + revstr = svn_revnum_to_cstring (log_item->copyfrom_rev, pool); svn_xml_make_open_tag (&sb, pool, svn_xml_protect_pcdata, "path", "action", action, "copyfrom-path", escpath->data, Index: subversion/clients/cmdline/commit-cmd.c =================================================================== --- subversion/clients/cmdline/commit-cmd.c (revision 9652) +++ subversion/clients/cmdline/commit-cmd.c (arbetskopia) @@ -98,7 +98,7 @@ ctx, pool))); if (commit_info && ! opt_state->quiet) - svn_cl__print_commit_info (commit_info); + svn_cl__print_commit_info (commit_info, pool); return SVN_NO_ERROR; } Index: subversion/clients/cmdline/propset-cmd.c =================================================================== --- subversion/clients/cmdline/propset-cmd.c (revision 9652) +++ subversion/clients/cmdline/propset-cmd.c (arbetskopia) @@ -122,9 +122,8 @@ &rev, opt_state->force, ctx, pool)); if (! opt_state->quiet) { - printf ("property '%s' set on repository revision '%" - SVN_REVNUM_T_FMT"'\n", - pname, rev); + printf ("property '%s' set on repository revision '%s'\n", + pname, svn_revnum_to_cstring (rev, pool)); } } else if (opt_state->start_revision.kind != svn_opt_revision_unspecified) Index: subversion/clients/cmdline/delete-cmd.c =================================================================== --- subversion/clients/cmdline/delete-cmd.c (revision 9652) +++ subversion/clients/cmdline/delete-cmd.c (arbetskopia) @@ -85,7 +85,7 @@ SVN_ERR (svn_cl__cleanup_log_msg (ctx->log_msg_baton, err)); if (commit_info && ! opt_state->quiet) - svn_cl__print_commit_info (commit_info); + svn_cl__print_commit_info (commit_info, pool); return SVN_NO_ERROR; } Index: subversion/clients/cmdline/notify.c =================================================================== --- subversion/clients/cmdline/notify.c (revision 9652) +++ subversion/clients/cmdline/notify.c (arbetskopia) @@ -178,23 +178,23 @@ if (SVN_IS_VALID_REVNUM (revision)) { if (nb->is_export) - printf ("Exported %srevision %" SVN_REVNUM_T_FMT ".\n", + printf ("Exported %srevision %s.\n", nb->in_external ? "external at " : "", - revision); + svn_revnum_to_cstring (revision, nb->pool)); else if (nb->is_checkout) - printf ("Checked out %srevision %" SVN_REVNUM_T_FMT ".\n", + printf ("Checked out %srevision %s.\n", nb->in_external ? "external at " : "", - revision); + svn_revnum_to_cstring (revision, nb->pool)); else { if (nb->received_some_change) - printf ("Updated %sto revision %" SVN_REVNUM_T_FMT ".\n", + printf ("Updated %sto revision %s.\n", nb->in_external ? "external " : "", - revision); + svn_revnum_to_cstring (revision, nb->pool)); else - printf ("%st revision %" SVN_REVNUM_T_FMT ".\n", + printf ("%st revision %s.\n", nb->in_external ? "External a" : "A", - revision); + svn_revnum_to_cstring (revision, nb->pool)); } } else /* no revision */ @@ -223,7 +223,8 @@ case svn_wc_notify_status_completed: if (SVN_IS_VALID_REVNUM (revision)) - printf ("Status against revision: %6" SVN_REVNUM_T_FMT "\n", revision); + printf ("Status against revision: %6s\n", + svn_revnum_to_cstring (revision, nb->pool)); break; case svn_wc_notify_commit_modified: Index: subversion/clients/cmdline/import-cmd.c =================================================================== --- subversion/clients/cmdline/import-cmd.c (revision 9652) +++ subversion/clients/cmdline/import-cmd.c (arbetskopia) @@ -119,7 +119,7 @@ pool))); if (commit_info && ! opt_state->quiet) - svn_cl__print_commit_info (commit_info); + svn_cl__print_commit_info (commit_info, pool); return SVN_NO_ERROR; } Index: subversion/clients/cmdline/proplist-cmd.c =================================================================== --- subversion/clients/cmdline/proplist-cmd.c (revision 9652) +++ subversion/clients/cmdline/proplist-cmd.c (arbetskopia) @@ -85,8 +85,8 @@ URL, &(opt_state->start_revision), &rev, ctx, pool)); - printf("Unversioned properties on revision %"SVN_REVNUM_T_FMT":\n", - rev); + printf("Unversioned properties on revision %s:\n", + svn_revnum_to_cstring (rev, pool)); SVN_ERR (svn_cl__print_prop_hash (proplist, (! opt_state->verbose), pool)); Index: subversion/clients/cmdline/propedit-cmd.c =================================================================== --- subversion/clients/cmdline/propedit-cmd.c (revision 9652) +++ subversion/clients/cmdline/propedit-cmd.c (arbetskopia) @@ -128,13 +128,13 @@ URL, &(opt_state->start_revision), &rev, opt_state->force, ctx, pool)); - printf ("Set new value for property '%s' on revision %" - SVN_REVNUM_T_FMT"\n", pname, rev); + printf ("Set new value for property '%s' on revision %s\n", + pname, svn_revnum_to_cstring (rev, pool)); } else { - printf ("No changes to property '%s' on revision %" - SVN_REVNUM_T_FMT"\n", pname, rev); + printf ("No changes to property '%s' on revision %s\n", + pname, svn_revnum_to_cstring (rev, pool)); } } else if (opt_state->start_revision.kind != svn_opt_revision_unspecified) Index: subversion/clients/cmdline/info-cmd.c =================================================================== --- subversion/clients/cmdline/info-cmd.c (revision 9652) +++ subversion/clients/cmdline/info-cmd.c (arbetskopia) @@ -93,7 +93,7 @@ } if (SVN_IS_VALID_REVNUM (entry->revision)) - printf ("Revision: %" SVN_REVNUM_T_FMT "\n", entry->revision); + printf ("Revision: %s\n", svn_revnum_to_cstring (entry->revision, pool)); switch (entry->kind) { @@ -156,8 +156,8 @@ } if (SVN_IS_VALID_REVNUM (entry->copyfrom_rev)) - printf ("Copied From Rev: %" SVN_REVNUM_T_FMT "\n", - entry->copyfrom_rev); + printf ("Copied From Rev: %s\n", + svn_revnum_to_cstring (entry->copyfrom_rev, pool)); } if (entry->cmt_author) @@ -168,7 +168,8 @@ } if (SVN_IS_VALID_REVNUM (entry->cmt_rev)) - printf ("Last Changed Rev: %" SVN_REVNUM_T_FMT "\n", entry->cmt_rev); + printf ("Last Changed Rev: %s\n", + svn_revnum_to_cstring (entry->cmt_rev, pool)); if (entry->cmt_date) SVN_ERR (svn_cl__info_print_time (entry->cmt_date, Index: subversion/svndumpfilter/main.c =================================================================== --- subversion/svndumpfilter/main.c (revision 9652) +++ subversion/svndumpfilter/main.c (arbetskopia) @@ -635,15 +635,16 @@ SVN_ERR (svn_stream_write (rb->pb->out_stream, rb->body->data , &(rb->body->len))); if (! rb->pb->quiet) - fprintf (stderr, "Revision %" SVN_REVNUM_T_FMT " committed as %" - SVN_REVNUM_T_FMT ".\n", rb->rev_orig, rb->rev_actual); + fprintf (stderr, "Revision %s committed as %s.\n", + svn_revnum_to_cstring (rb->rev_orig, hash_pool), + svn_revnum_to_cstring (rb->rev_actual, hash_pool)); } else { rb->pb->rev_drop_count++; if (! rb->pb->quiet) - fprintf (stderr, "Revision %" SVN_REVNUM_T_FMT " skipped.\n", - rb->rev_orig); + fprintf (stderr, "Revision %s skipped.\n", + svn_revnum_to_cstring (rb->rev_orig, hash_pool)); } return SVN_NO_ERROR; } @@ -885,13 +886,13 @@ &this_key, sizeof (this_key))); if (this_val == SVN_INVALID_REVNUM) - fprintf (stderr, " '%" SVN_REVNUM_T_FMT "' => (dropped)\n", - this_key); + fprintf (stderr, " '%s' => (dropped)\n", + svn_revnum_to_cstring (this_key, pool)); else fprintf (stderr, - " '%" SVN_REVNUM_T_FMT "' => '%" - SVN_REVNUM_T_FMT "'\n", - this_key, this_val); + " '%s' => '%s'\n", + svn_revnum_to_cstring (this_key, pool), + svn_revnum_to_cstring (this_val, pool)); } fprintf (stderr, "\n"); } Index: subversion/libsvn_repos/load.c =================================================================== --- subversion/libsvn_repos/load.c (revision 9652) +++ subversion/libsvn_repos/load.c (arbetskopia) @@ -788,8 +788,8 @@ if (pb->outstream) SVN_ERR (svn_stream_printf (pb->outstream, pool, "<<< Started new transaction, based on " - "original revision %" - SVN_REVNUM_T_FMT "\n", rb->rev)); + "original revision %s\n", + svn_revnum_to_cstring (rb->rev, pool))); } /* If we're parsing revision 0, only the revision are (possibly) @@ -828,9 +828,9 @@ if (! SVN_IS_VALID_REVNUM(src_rev)) return svn_error_createf (SVN_ERR_FS_NO_SUCH_REVISION, NULL, - "Relative source revision %" SVN_REVNUM_T_FMT + "Relative source revision %s" " is not available in current repository", - src_rev); + svn_revnum_to_cstring (src_rev, pool)); SVN_ERR (svn_fs_revision_root (©_root, pb->fs, src_rev, pool)); SVN_ERR (svn_fs_copy (copy_root, nb->copyfrom_path, @@ -1105,18 +1105,21 @@ if (new_rev == rb->rev) { SVN_ERR (svn_stream_printf (pb->outstream, rb->pool, - "\n------- Committed revision %" - SVN_REVNUM_T_FMT - " >>>\n\n", new_rev)); + "\n------- Committed revision %s" + " >>>\n\n", + svn_revnum_to_cstring (new_rev, + rb->pool))); } else { SVN_ERR (svn_stream_printf (pb->outstream, rb->pool, - "\n------- Committed new rev %" - SVN_REVNUM_T_FMT - " (loaded from original rev %" - SVN_REVNUM_T_FMT - ") >>>\n\n", new_rev, rb->rev)); + "\n------- Committed new rev %s" + " (loaded from original rev %s" + ") >>>\n\n", + svn_revnum_to_cstring (new_rev, + rb->pool), + svn_revnum_to_cstring (rb->rev, + rb->pool))); } } Index: subversion/libsvn_repos/log.c =================================================================== --- subversion/libsvn_repos/log.c (revision 9652) +++ subversion/libsvn_repos/log.c (arbetskopia) @@ -159,11 +159,11 @@ if (start > head) return svn_error_createf (SVN_ERR_FS_NO_SUCH_REVISION, 0, - "No such revision '%" SVN_REVNUM_T_FMT "'", start); + "No such revision '%s'", svn_revnum_to_cstring (start, pool)); if (end > head) return svn_error_createf (SVN_ERR_FS_NO_SUCH_REVISION, 0, - "No such revision '%" SVN_REVNUM_T_FMT "'", end); + "No such revision '%s'", svn_revnum_to_cstring (end, pool)); /* If paths were specified, then we only really care about revisions in which those paths were changed. So we ask the filesystem for Index: subversion/libsvn_repos/dump.c =================================================================== --- subversion/libsvn_repos/dump.c (revision 9652) +++ subversion/libsvn_repos/dump.c (arbetskopia) @@ -429,11 +429,12 @@ && eb->feedback_stream) svn_stream_printf (eb->feedback_stream, pool, - "WARNING: Referencing data in revision %" SVN_REVNUM_T_FMT + "WARNING: Referencing data in revision %s" ", which is older than the oldest\nWARNING: dumped revision " - "(%" SVN_REVNUM_T_FMT "). Loading this dump into an empty " + "(%s). Loading this dump into an empty " "repository\nWARNING: will fail.\n", - cmp_rev, eb->oldest_dumped_rev); + svn_revnum_to_cstring (cmp_rev, pool), + svn_revnum_to_cstring (eb->oldest_dumped_rev, pool)); if (eb->stream) SVN_ERR (svn_stream_printf (eb->stream, pool, @@ -959,15 +960,16 @@ /* Validate the revisions. */ if (start_rev > end_rev) return svn_error_createf (SVN_ERR_REPOS_BAD_ARGS, NULL, - "Start revision %" SVN_REVNUM_T_FMT - " is greater than end revision %" - SVN_REVNUM_T_FMT, - start_rev, end_rev); + "Start revision %s" + " is greater than end revision %s", + svn_revnum_to_cstring (start_rev, pool), + svn_revnum_to_cstring (end_rev, pool)); if (end_rev > youngest) return svn_error_createf (SVN_ERR_REPOS_BAD_ARGS, NULL, - "End revision %" SVN_REVNUM_T_FMT " is invalid " - "(youngest revision is %" SVN_REVNUM_T_FMT ")", - end_rev, youngest); + "End revision %s is invalid " + "(youngest revision is %s)", + svn_revnum_to_cstring (end_rev, pool), + svn_revnum_to_cstring (youngest, pool)); if ((start_rev == 0) && incremental) incremental = FALSE; /* revision 0 looks the same regardless of whether or not this is an incremental @@ -1074,8 +1076,9 @@ svn_pool_clear (subpool); if (feedback_stream) SVN_ERR (svn_stream_printf (feedback_stream, pool, - "* %s revision %" SVN_REVNUM_T_FMT ".\n", - stream ? "Dumped" : "Verified", to_rev)); + "* %s revision %s.\n", + stream ? "Dumped" : "Verified", + svn_revnum_to_cstring (to_rev, pool))); } svn_pool_destroy (subpool); Index: subversion/libsvn_repos/rev_hunt.c =================================================================== --- subversion/libsvn_repos/rev_hunt.c (revision 9652) +++ subversion/libsvn_repos/rev_hunt.c (arbetskopia) @@ -56,7 +56,8 @@ if (! date_str) return svn_error_createf (SVN_ERR_FS_GENERAL, NULL, - "Failed to find time on revision %" SVN_REVNUM_T_FMT, rev); + "Failed to find time on revision %s", svn_revnum_to_cstring (rev, + pool)); SVN_ERR (svn_time_from_cstring (tm, date_str->data, pool)); @@ -191,13 +192,13 @@ if (! SVN_IS_VALID_REVNUM (start)) return svn_error_createf (SVN_ERR_FS_NO_SUCH_REVISION, 0, - "Invalid start revision %" - SVN_REVNUM_T_FMT, start); + "Invalid start revision %s", + svn_revnum_to_cstring (start, pool)); if (! SVN_IS_VALID_REVNUM (end)) return svn_error_createf (SVN_ERR_FS_NO_SUCH_REVISION, 0, - "Invalid end revision %" - SVN_REVNUM_T_FMT, end); + "Invalid end revision %s", + svn_revnum_to_cstring (end, pool)); /* Ensure that the input is ordered. */ if (start > end) Index: subversion/svnversion/main.c =================================================================== --- subversion/svnversion/main.c (revision 9652) +++ subversion/svnversion/main.c (arbetskopia) @@ -308,9 +308,9 @@ } } - printf ("%" SVN_REVNUM_T_FMT, sb.min_rev); + printf ("%s", svn_revnum_to_cstring (sb.min_rev, pool)); if (sb.min_rev != sb.max_rev) - printf (":%" SVN_REVNUM_T_FMT, sb.max_rev); + printf (":%s", svn_revnum_to_cstring (sb.max_rev, pool)); if (sb.modified) fputs ("M", stdout); if (sb.switched) Index: subversion/libsvn_fs_fs/tree.c =================================================================== --- subversion/libsvn_fs_fs/tree.c (revision 9652) +++ subversion/libsvn_fs_fs/tree.c (arbetskopia) @@ -318,7 +318,7 @@ /* Return the error SVN_ERR_FS_NOT_FOUND, with a detailed error text, for PATH in ROOT. */ static svn_error_t * -not_found (svn_fs_root_t *root, const char *path) +not_found (svn_fs_root_t *root, const char *path, apr_pool_t *pool) { if (root->is_txn_root) return @@ -330,14 +330,14 @@ return svn_error_createf (SVN_ERR_FS_NOT_FOUND, 0, - "File not found: revision '%" SVN_REVNUM_T_FMT "', path '%s'", - root->rev, path); + "File not found: revision '%s', path '%s'", + svn_revnum_to_cstring (root->rev, pool), path); } /* Return a detailed `file already exists' message for PATH in ROOT. */ static svn_error_t * -already_exists (svn_fs_root_t *root, const char *path) +already_exists (svn_fs_root_t *root, const char *path, apr_pool_t *pool) { svn_fs_t *fs = root->fs; @@ -351,8 +351,8 @@ return svn_error_createf (SVN_ERR_FS_ALREADY_EXISTS, 0, - "File already exists: filesystem '%s', revision '%" SVN_REVNUM_T_FMT - "', path '%s'", fs->path, root->rev, path); + "File already exists: filesystem '%s', revision '%s', path '%s'", + fs->path, svn_revnum_to_cstring (root->rev, pool), path); } @@ -408,7 +408,7 @@ pool); else /* If it's not a transaction root, we can't change its contents. */ - return svn_fs_fs__err_not_mutable (root->fs, root->rev, error_path); + return svn_fs_fs__err_not_mutable (root->fs, root->rev, error_path, pool); } @@ -743,7 +743,7 @@ { /* Build a better error message than svn_fs_fs__dag_open can provide, giving the root and full path name. */ - return not_found (root, path); + return not_found (root, path, pool); } } @@ -2184,7 +2184,7 @@ /* If there's already a sub-directory by that name, complain. This also catches the case of trying to make a subdirectory named `/'. */ if (parent_path->node) - return already_exists (root, path); + return already_exists (root, path, pool); /* Create the subdirectory. */ SVN_ERR (make_path_mutable (root, parent_path->parent, path, pool)); @@ -2436,7 +2436,7 @@ /* If there's already a file by that name, complain. This also catches the case of trying to make a file named `/'. */ if (parent_path->node) - return already_exists (root, path); + return already_exists (root, path, pool); /* Create the file. */ SVN_ERR (make_path_mutable (root, parent_path->parent, path, pool)); @@ -3022,7 +3022,7 @@ /* And we require that the path exist in the root. */ SVN_ERR (svn_fs_check_path (&kind, root, path, pool)); if (kind == svn_node_none) - return not_found (root, path); + return not_found (root, path, pool); /* Okay, all seems well. Build our history object and return it. */ *history_p = assemble_history (root->fs, Index: subversion/libsvn_fs_fs/err.c =================================================================== --- subversion/libsvn_fs_fs/err.c (revision 9652) +++ subversion/libsvn_fs_fs/err.c (arbetskopia) @@ -62,12 +62,13 @@ svn_error_t * -svn_fs_fs__err_corrupt_fs_revision (svn_fs_t *fs, svn_revnum_t rev) +svn_fs_fs__err_corrupt_fs_revision (svn_fs_t *fs, svn_revnum_t rev, + apr_pool_t *pool) { return svn_error_createf (SVN_ERR_FS_CORRUPT, 0, - "Corrupt filesystem revision '%" SVN_REVNUM_T_FMT "' in filesystem '%s'", - rev, fs->path); + "Corrupt filesystem revision '%s' in filesystem '%s'", + svn_revnum_to_cstring (rev, pool), fs->path); } @@ -105,14 +106,12 @@ svn_error_t * -svn_fs_fs__err_dangling_rev (svn_fs_t *fs, svn_revnum_t rev) +svn_fs_fs__err_dangling_rev (svn_fs_t *fs, svn_revnum_t rev, apr_pool_t *pool) { return svn_error_createf (SVN_ERR_FS_NO_SUCH_REVISION, 0, - "Reference to non-existent revision '%" - SVN_REVNUM_T_FMT - "' in filesystem '%s'", - rev, fs->path); + "Reference to non-existent revision '%s' in filesystem '%s'", + svn_revnum_to_cstring (rev, pool), fs->path); } @@ -161,13 +160,14 @@ svn_error_t * -svn_fs_fs__err_not_mutable (svn_fs_t *fs, svn_revnum_t rev, const char *path) +svn_fs_fs__err_not_mutable (svn_fs_t *fs, svn_revnum_t rev, const char *path, + apr_pool_t *pool) { return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, 0, - "File is not mutable: filesystem '%s', revision %" SVN_REVNUM_T_FMT - ", path '%s'", fs->path, rev, path); + "File is not mutable: filesystem '%s', revision %s, path '%s'", + fs->path, svn_revnum_to_cstring (rev, pool), path); } Index: subversion/libsvn_fs_fs/err.h =================================================================== --- subversion/libsvn_fs_fs/err.h (revision 9652) +++ subversion/libsvn_fs_fs/err.h (arbetskopia) @@ -49,7 +49,8 @@ /* SVN_ERR_FS_CORRUPT: the REVISION skel of revision REV in FS is corrupt. */ svn_error_t *svn_fs_fs__err_corrupt_fs_revision (svn_fs_t *fs, - svn_revnum_t rev); + svn_revnum_t rev, + apr_pool_t *pool); /* SVN_ERR_FS_CORRUPT: ID is a node ID, not a node revision ID. */ svn_error_t *svn_fs_fs__err_corrupt_id (svn_fs_t *fs, const svn_fs_id_t *id); @@ -66,7 +67,8 @@ /* SVN_ERR_FS_CORRUPT: something in FS refers to filesystem revision REV, but that filesystem revision doesn't exist. */ -svn_error_t *svn_fs_fs__err_dangling_rev (svn_fs_t *fs, svn_revnum_t rev); +svn_error_t *svn_fs_fs__err_dangling_rev (svn_fs_t *fs, svn_revnum_t rev, + apr_pool_t *pool); /* SVN_ERR_FS_CORRUPT: a key in FS's `nodes' table is bogus. */ svn_error_t *svn_fs_fs__err_corrupt_nodes_key (svn_fs_t *fs); @@ -85,7 +87,8 @@ /* SVN_ERR_FS_NOT_MUTABLE: the caller attempted to change a node outside of a transaction. */ svn_error_t *svn_fs_fs__err_not_mutable (svn_fs_t *fs, svn_revnum_t rev, - const char *path); + const char *path, + apr_pool_t* pool); /* SVN_ERR_FS_PATH_SYNTAX: PATH is not a valid path name. */ svn_error_t *svn_fs_fs__err_path_syntax (svn_fs_t *fs, const char *path);