Eliminate all uses of SVN_REVNUM_T_FMT in every C source file that used it. Replace every occurence with 'ld' and concatenate string constants appropriately. Index: subversion/svnadmin/main.c =================================================================== --- subversion/svnadmin/main.c (revision 9687) +++ 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 (%ld)", + youngest); /* Loop over the requested revision range, performing the predecessor deltification on paths changed in each. */ @@ -441,7 +441,7 @@ svn_pool_clear (subpool); SVN_ERR (check_cancel (NULL)); if (! opt_state->quiet) - printf ("Deltifying revision %" SVN_REVNUM_T_FMT "...", revision); + printf ("Deltifying revision %ld...", revision); SVN_ERR (svn_fs_deltify_revision (fs, revision, subpool)); if (! opt_state->quiet) printf (_("done.\n")); @@ -499,8 +499,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 (%ld)", + youngest); /* Run the dump to STDOUT. Let the user redirect output into a file if they want. :-) */ @@ -614,8 +614,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 %ld.\n", + youngest_rev); return SVN_NO_ERROR; } Index: subversion/libsvn_fs_base/tree.c =================================================================== --- subversion/libsvn_fs_base/tree.c (revision 9687) +++ subversion/libsvn_fs_base/tree.c (arbetskopia) @@ -377,7 +377,7 @@ return svn_error_createf (SVN_ERR_FS_NOT_FOUND, 0, - "File not found: revision '%" SVN_REVNUM_T_FMT "', path '%s'", + "File not found: revision '%ld', path '%s'", root->rev, path); } @@ -398,8 +398,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 '%ld', path '%s'", + fs->path, root->rev, path); } Index: subversion/libsvn_fs_base/err.c =================================================================== --- subversion/libsvn_fs_base/err.c (revision 9687) +++ subversion/libsvn_fs_base/err.c (arbetskopia) @@ -65,7 +65,7 @@ { return svn_error_createf (SVN_ERR_FS_CORRUPT, 0, - "Corrupt filesystem revision '%" SVN_REVNUM_T_FMT "' in filesystem '%s'", + "Corrupt filesystem revision '%ld' in filesystem '%s'", rev, fs->path); } @@ -108,9 +108,7 @@ { return svn_error_createf (SVN_ERR_FS_NO_SUCH_REVISION, 0, - "Reference to non-existent revision '%" - SVN_REVNUM_T_FMT - "' in filesystem '%s'", + "Reference to non-existent revision '%ld' in filesystem '%s'", rev, fs->path); } @@ -165,8 +163,8 @@ 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 %ld, path '%s'", + fs->path, rev, path); } Index: subversion/libsvn_fs_base/util/fs_skels.c =================================================================== --- subversion/libsvn_fs_base/util/fs_skels.c (revision 9687) +++ subversion/libsvn_fs_base/util/fs_skels.c (arbetskopia) @@ -900,7 +900,7 @@ { /* Committed transactions have a revision number... */ svn_fs_base__prepend (svn_fs_base__str_atom - (apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, + (apr_psprintf (pool, "%ld", transaction->revision), pool), \ skel); } Index: subversion/libsvn_wc/entries.c =================================================================== --- subversion/libsvn_wc/entries.c (revision 9687) +++ subversion/libsvn_wc/entries.c (arbetskopia) @@ -62,7 +62,7 @@ apr_file_t *f = NULL; svn_stringbuf_t *accum = NULL; apr_hash_t *atts = apr_hash_make (pool); - char *initial_revstr = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, + char *initial_revstr = apr_psprintf (pool, "%ld", initial_rev); /* Create the entries file, which must not exist prior to this. */ @@ -881,7 +881,7 @@ /* Revision */ if (SVN_IS_VALID_REVNUM (entry->revision)) apr_hash_set (atts, SVN_WC__ENTRY_ATTR_REVISION, APR_HASH_KEY_STRING, - apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, entry->revision)); + apr_psprintf (pool, "%ld", entry->revision)); /* URL */ if (entry->url) @@ -953,7 +953,7 @@ if (SVN_IS_VALID_REVNUM (entry->copyfrom_rev)) apr_hash_set (atts, SVN_WC__ENTRY_ATTR_COPYFROM_REV, APR_HASH_KEY_STRING, - apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, + apr_psprintf (pool, "%ld", entry->copyfrom_rev)); if (entry->copyfrom_url) @@ -992,7 +992,7 @@ /* Last-commit Stuff */ if (SVN_IS_VALID_REVNUM (entry->cmt_rev)) apr_hash_set (atts, SVN_WC__ENTRY_ATTR_CMT_REV, APR_HASH_KEY_STRING, - apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, entry->cmt_rev)); + apr_psprintf (pool, "%ld", entry->cmt_rev)); if (entry->cmt_author) apr_hash_set (atts, SVN_WC__ENTRY_ATTR_CMT_AUTHOR, APR_HASH_KEY_STRING, Index: subversion/libsvn_wc/adm_ops.c =================================================================== --- subversion/libsvn_wc/adm_ops.c (revision 9687) +++ subversion/libsvn_wc/adm_ops.c (arbetskopia) @@ -229,7 +229,7 @@ const char *base_name; svn_stringbuf_t *logtags; apr_file_t *log_fp = NULL; - char *revstr = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, new_revnum); + char *revstr = apr_psprintf (pool, "%ld", new_revnum); const char *hex_digest = NULL; SVN_ERR (svn_wc__adm_write_check (adm_access)); Index: subversion/libsvn_wc/adm_files.c =================================================================== --- subversion/libsvn_wc/adm_files.c (revision 9687) +++ subversion/libsvn_wc/adm_files.c (arbetskopia) @@ -900,9 +900,8 @@ && !(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 %ld doesn't match existing revision %ld" + " in '%s'", revision, entry->revision, path); /** ### comparing URLs, should they be canonicalized first? */ Index: subversion/libsvn_wc/update_editor.c =================================================================== --- subversion/libsvn_wc/update_editor.c (revision 9687) +++ subversion/libsvn_wc/update_editor.c (arbetskopia) @@ -835,7 +835,7 @@ accurate reports about itself in the future. */ if (strcmp (path, eb->target) == 0) { - tgt_rev_str = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, + tgt_rev_str = apr_psprintf (pool, "%ld", *(eb->target_revision)); svn_xml_make_open_tag (&log_item, pool, svn_xml_self_closing, @@ -1786,7 +1786,7 @@ if (copyfrom_url) { assert (SVN_IS_VALID_REVNUM (copyfrom_rev)); - rev_str = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, copyfrom_rev); + rev_str = apr_psprintf (pool, "%ld", copyfrom_rev); } svn_xml_make_open_tag @@ -1960,7 +1960,7 @@ /* Write log entry which will bump the revision number. Also, just in case we're overwriting an existing phantom 'deleted' or 'absent' entry, be sure to remove the hiddenness. */ - revision_str = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, new_revision); + revision_str = apr_psprintf (pool, "%ld", new_revision); svn_xml_make_open_tag (&log_accum, pool, svn_xml_self_closing, @@ -2055,9 +2055,9 @@ old and new text-bases. */ SVN_ERR (svn_wc_entry (&e, file_path, adm_access, FALSE, pool)); assert (e != NULL); - oldrev_str = apr_psprintf (pool, ".r%" SVN_REVNUM_T_FMT, + oldrev_str = apr_psprintf (pool, ".r%ld", e->revision); - newrev_str = apr_psprintf (pool, ".r%" SVN_REVNUM_T_FMT, + newrev_str = apr_psprintf (pool, ".r%ld", new_revision); /* Merge the changes from the old-textbase (TXTB) to Index: subversion/libsvn_wc/translate.c =================================================================== --- subversion/libsvn_wc/translate.c (revision 9687) +++ subversion/libsvn_wc/translate.c (arbetskopia) @@ -206,7 +206,7 @@ SVN_ERR (svn_subst_build_keywords (&tmp_keywords, list, - apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, + apr_psprintf (pool, "%ld", entry->cmt_rev), entry->url, entry->cmt_date, Index: subversion/libsvn_ra_local/ra_plugin.c =================================================================== --- subversion/libsvn_ra_local/ra_plugin.c (revision 9687) +++ subversion/libsvn_ra_local/ra_plugin.c (arbetskopia) @@ -652,7 +652,7 @@ apr_hash_set (*props, SVN_PROP_ENTRY_COMMITTED_REV, APR_HASH_KEY_STRING, - svn_string_createf (pool, "%" SVN_REVNUM_T_FMT, cmt_rev)); + svn_string_createf (pool, "%ld", cmt_rev)); apr_hash_set (*props, SVN_PROP_ENTRY_COMMITTED_DATE, APR_HASH_KEY_STRING, Index: subversion/libsvn_client/export.c =================================================================== --- subversion/libsvn_client/export.c (revision 9687) +++ subversion/libsvn_client/export.c (arbetskopia) @@ -228,12 +228,12 @@ to the revision number, and set the author to "(local)" since we can't always determine the current user's username */ - fmt = "%" SVN_REVNUM_T_FMT "M"; + fmt = "%ldM"; author = "(local)"; } else { - fmt = "%" SVN_REVNUM_T_FMT; + fmt = "%ld"; author = entry->cmt_author; } Index: subversion/libsvn_client/ra.c =================================================================== --- subversion/libsvn_client/ra.c (revision 9687) +++ subversion/libsvn_client/ra.c (arbetskopia) @@ -430,7 +430,7 @@ else return svn_error_createf (SVN_ERR_CLIENT_UNRELATED_RESOURCES, NULL, "Missing changed-path information for " - "'%s' in revision %" SVN_REVNUM_T_FMT, + "'%s' in revision %ld", path, revision); } @@ -565,7 +565,7 @@ 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 '%s' doesn't exist in revision %ld", path, peg_revnum); /* Populate most of our log receiver baton structure. */ @@ -625,18 +625,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 %ld", + path, start_revnum); 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 %ld", + path, end_revnum); 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 %ld", + peg_revnum); /* Repository paths might be absolute, but we want to treat them as relative. */ @@ -655,7 +655,7 @@ 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.", + "'%s' in revision %ld is an unrelated object.", path, youngest); } Index: subversion/libsvn_client/diff.c =================================================================== --- subversion/libsvn_client/diff.c (revision 9687) +++ subversion/libsvn_client/diff.c (arbetskopia) @@ -264,7 +264,7 @@ { const char *label; if (revnum != SVN_INVALID_REVNUM) - label = apr_psprintf (pool, "%s\t(revision %" SVN_REVNUM_T_FMT ")", + label = apr_psprintf (pool, "%s\t(revision %ld)", path, revnum); else label = apr_psprintf (pool, _("%s\t(working copy)"), path); @@ -658,10 +658,10 @@ 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, + ".merge-left.r%ld", older_rev); const char *right_label = apr_psprintf (subpool, - ".merge-right.r%" SVN_REVNUM_T_FMT, + ".merge-right.r%ld", yours_rev); svn_boolean_t has_local_mods; svn_boolean_t merge_required = TRUE; @@ -1608,13 +1608,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 %ld", + url1, rev1); 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 %ld", + url2, rev2); 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 9687) +++ subversion/libsvn_client/copy.c (arbetskopia) @@ -378,7 +378,7 @@ 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 "'", + "Path '%s' does not exist in revision '%ld'", src_url, src_revnum); /* Figure out the basename that will result from this operation. */ @@ -786,7 +786,7 @@ 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 "'", + "Path '%s' not found in revision '%ld'", src_url, src_revnum); else return svn_error_createf Index: subversion/libsvn_client/blame.c =================================================================== --- subversion/libsvn_client/blame.c (revision 9687) +++ subversion/libsvn_client/blame.c (arbetskopia) @@ -400,7 +400,7 @@ else return svn_error_createf (APR_EGENERAL, NULL, "Revision action '%c' for " - "revision %" SVN_REVNUM_T_FMT " of '%s'" + "revision %ld of '%s'" "lacks a prior revision", lmb.action, lmb.eldest->revision, lmb.eldest->path); Index: subversion/libsvn_client/commit_util.c =================================================================== --- subversion/libsvn_client/commit_util.c (revision 9687) +++ subversion/libsvn_client/commit_util.c (arbetskopia) @@ -824,7 +824,7 @@ flags[4] = (this_item->state_flags & SVN_CLIENT_COMMIT_ITEM_IS_COPY) ? 'c' : '-'; flags[5] = '\0'; - fprintf (stderr, " %s %6" SVN_REVNUM_T_FMT " '%s' (%s)\n", + fprintf (stderr, " %s %6ld '%s' (%s)\n", flags, this_item->revision, this_item->url ? this_item->url : "", @@ -1334,7 +1334,7 @@ const char *copystuffs = ""; if (copyfrom_path && SVN_IS_VALID_REVNUM(copyfrom_revision)) copystuffs = apr_psprintf (pool, - " (copied from %s:%" SVN_REVNUM_T_FMT ")", + " (copied from %s:%ld)", copyfrom_path, copyfrom_revision); fprintf (stderr, " Adding : %s%s\n", path, copystuffs); @@ -1429,7 +1429,7 @@ const char *copystuffs = ""; if (copyfrom_path && SVN_IS_VALID_REVNUM(copyfrom_revision)) copystuffs = apr_psprintf (pool, - " (copied from %s:%" SVN_REVNUM_T_FMT ")", + " (copied from %s:%ld)", copyfrom_path, copyfrom_revision); fprintf (stderr, " Adding : %s%s\n", path, copystuffs); Index: subversion/svnlook/main.c =================================================================== --- subversion/svnlook/main.c (revision 9687) +++ subversion/svnlook/main.c (arbetskopia) @@ -685,7 +685,7 @@ *label = apr_psprintf (pool, "%s\t%s UTC (txn %s)", path, datestr, name); else - *label = apr_psprintf (pool, "%s\t%s UTC (rev %" SVN_REVNUM_T_FMT ")", + *label = apr_psprintf (pool, "%s\t%s UTC (rev %ld)", path, datestr, rev); return SVN_NO_ERROR; } @@ -807,7 +807,7 @@ SVN_ERR (svn_utf_cstring_from_utf8 (&base_path_native, base_path, pool)); - printf ("Copied: %s (from rev %" SVN_REVNUM_T_FMT ", %s)\n", + printf ("Copied: %s (from rev %ld, %s)\n", path_native, node->copyfrom_rev, base_path_native); SVN_ERR (svn_fs_revision_root (&base_root, @@ -1356,12 +1356,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", + printf ("%8ld %s <%s>\n", revision, path, id_string->data); } else { - printf ("%8" SVN_REVNUM_T_FMT " %s\n", revision, path); + printf ("%8ld %s\n", revision, path); } return SVN_NO_ERROR; @@ -1760,7 +1760,7 @@ svnlook_ctxt_t *c; SVN_ERR (get_ctxt_baton (&c, opt_state, pool)); - printf ("%" SVN_REVNUM_T_FMT "\n", c->rev_id); + printf ("%ld\n", c->rev_id); return SVN_NO_ERROR; } Index: subversion/mod_dav_svn/merge.c =================================================================== --- subversion/mod_dav_svn/merge.c (revision 9687) +++ subversion/mod_dav_svn/merge.c (arbetskopia) @@ -208,7 +208,7 @@ svn_fs_root_t *root; svn_error_t *serr; const char *vcc; - char revbuf[20]; /* long enough for SVN_REVNUM_T_FMT */ + char revbuf[20]; /* long enough for a long int */ svn_string_t *creationdate, *creator_displayname; serr = svn_fs_revision_root(&root, repos->fs, new_rev, pool); @@ -229,7 +229,7 @@ NULL, 0 /* add_href */, pool); /* the version-name of the baseline is the revision number */ - sprintf(revbuf, "%" SVN_REVNUM_T_FMT, new_rev); + sprintf(revbuf, "%ld", new_rev); /* get the creationdate and creator-displayname of the new revision, too. */ serr = svn_fs_revision_prop(&creationdate, repos->fs, new_rev, Index: subversion/mod_dav_svn/log.c =================================================================== --- subversion/mod_dav_svn/log.c (revision 9687) +++ subversion/mod_dav_svn/log.c (arbetskopia) @@ -98,8 +98,8 @@ SVN_ERR( maybe_send_header(lrb) ); - SVN_ERR( send_xml(lrb, "" DEBUG_CR "%" - SVN_REVNUM_T_FMT "" DEBUG_CR, rev) ); + SVN_ERR( send_xml(lrb, "" DEBUG_CR "%ld" + "" DEBUG_CR, rev) ); if (author) SVN_ERR( send_xml(lrb, "%s" @@ -141,7 +141,7 @@ SVN_ERR( send_xml(lrb, "" + " copyfrom-rev=\"%ld\">" "%s" DEBUG_CR, apr_xml_quote_string(pool, log_item->copyfrom_path, @@ -160,7 +160,7 @@ SVN_ERR( send_xml(lrb, "" + " copyfrom-rev=\"%ld\">" "%s" DEBUG_CR, apr_xml_quote_string(pool, log_item->copyfrom_path, Index: subversion/mod_dav_svn/update.c =================================================================== --- subversion/mod_dav_svn/update.c (revision 9687) +++ subversion/mod_dav_svn/update.c (arbetskopia) @@ -493,16 +493,15 @@ if (bc_url) elt = apr_psprintf(pool, "" DEBUG_CR, DIR_OR_FILE(is_dir), qname, qcopy, copyfrom_revision, bc_url); else elt = apr_psprintf(pool, "" DEBUG_CR, + "copyfrom-path=\"%s\"" + " copyfrom-rev=\"%ld\">" DEBUG_CR, DIR_OR_FILE(is_dir), qname, qcopy, copyfrom_revision); } @@ -535,8 +534,8 @@ item_baton_t *child = make_child_baton(parent, path, pool); const char *qname = apr_xml_quote_string(pool, child->name, 1); - SVN_ERR( send_xml(child->uc, "" DEBUG_CR, + SVN_ERR( send_xml(child->uc, "" DEBUG_CR, DIR_OR_FILE(is_dir), qname, base_revision)); SVN_ERR( send_vsn_url(child, pool) ); *child_baton = child; @@ -654,7 +653,7 @@ SVN_ERR( maybe_start_update_report(uc) ); if (! uc->resource_walk) - SVN_ERR( send_xml(uc, "" DEBUG_CR, target_revision) ); return SVN_NO_ERROR; @@ -688,7 +687,7 @@ } else { - SVN_ERR( send_xml(uc, "" + SVN_ERR( send_xml(uc, "" DEBUG_CR, base_revision) ); } Index: subversion/mod_dav_svn/liveprops.c =================================================================== --- subversion/mod_dav_svn/liveprops.c (revision 9687) +++ subversion/mod_dav_svn/liveprops.c (arbetskopia) @@ -411,7 +411,7 @@ if (resource->baselined) { /* just the revision number for baselines */ - value = apr_psprintf(p, "%" SVN_REVNUM_T_FMT, + value = apr_psprintf(p, "%ld", resource->info->root.rev); } else @@ -431,7 +431,7 @@ } /* Convert the revision into a quoted string */ - s = apr_psprintf(p, "%" SVN_REVNUM_T_FMT, committed_rev); + s = apr_psprintf(p, "%ld", committed_rev); value = apr_xml_quote_string(p, s, 1); } break; Index: subversion/mod_dav_svn/version.c =================================================================== --- subversion/mod_dav_svn/version.c (revision 9687) +++ subversion/mod_dav_svn/version.c (arbetskopia) @@ -554,8 +554,7 @@ const char *msg; msg = apr_psprintf(resource->pool, - "created-rev mismatch: r=%" SVN_REVNUM_T_FMT - ", t=%" SVN_REVNUM_T_FMT, + "created-rev mismatch: r=%ld, t=%ld", resource->info->root.rev, txn_created_rev); return dav_new_error_tag(resource->pool, HTTP_CONFLICT, @@ -652,8 +651,8 @@ if (err) { ap_log_perror(APLOG_MARK, APLOG_ERR, err->apr_err, cdb->pool, - "cleanup_deltify: error deltifying against revision %" - SVN_REVNUM_T_FMT " in repository '%s'", + "cleanup_deltify: error deltifying against revision %ld" + " in repository '%s'", cdb->revision, cdb->repos_path); svn_error_clear(err); } @@ -864,7 +863,7 @@ DAV_XML_HEADER DEBUG_CR "" DEBUG_CR - "%" SVN_REVNUM_T_FMT "" + "%ld" "", rev); if (apr_err) derr = dav_svn_convert_err(svn_error_create(apr_err, 0, NULL), Index: subversion/mod_dav_svn/repos.c =================================================================== --- subversion/mod_dav_svn/repos.c (revision 9687) +++ subversion/mod_dav_svn/repos.c (arbetskopia) @@ -1549,8 +1549,8 @@ return dav_svn_convert_err (serr, HTTP_INTERNAL_SERVER_ERROR, apr_psprintf(r->pool, - "Could not open root of revision %" - SVN_REVNUM_T_FMT, base_rev), + "Could not open root of revision %ld", + base_rev), r->pool); serr = svn_fs_check_path (kind, base_rev_root, @@ -1779,7 +1779,7 @@ /* Use the "weak" format of the etag for collections because our GET requests on collections include dynamic data (the HEAD revision, the build version of Subversion, etc.). */ - return apr_psprintf(pool, "%s\"%" SVN_REVNUM_T_FMT "/%s\"", + return apr_psprintf(pool, "%s\"%ld/%s\"", resource->collection ? "W/" : "", created_rev, apr_xml_quote_string(pool, @@ -2017,7 +2017,7 @@ if (SVN_IS_VALID_REVNUM(resource->info->root.rev)) title = apr_psprintf(resource->pool, - "Revision %" SVN_REVNUM_T_FMT ": %s", + "Revision %ld: %s", resource->info->root.rev, title); if (resource->info->repos->repo_name) @@ -2046,7 +2046,7 @@ ap_fprintf(output, bb, " name=\"%s\"", apr_xml_quote_string(resource->pool, name, 1)); if (SVN_IS_VALID_REVNUM(resource->info->root.rev)) - ap_fprintf(output, bb, " rev=\"%" SVN_REVNUM_T_FMT "\"", + ap_fprintf(output, bb, " rev=\"%ld\"", resource->info->root.rev); if (href) ap_fprintf(output, bb, " path=\"%s\"", @@ -2774,7 +2774,7 @@ if (base->baselined) path = apr_psprintf(base->pool, - "/%s/wbl/%s/%" SVN_REVNUM_T_FMT, + "/%s/wbl/%s/%ld", base->info->repos->special_uri, activity_id, base->info->root.rev); else Index: subversion/mod_dav_svn/util.c =================================================================== --- subversion/mod_dav_svn/util.c (revision 9687) +++ subversion/mod_dav_svn/util.c (arbetskopia) @@ -167,11 +167,11 @@ href1, root_path, special_uri, href2); case DAV_SVN_BUILD_URI_BASELINE: - return apr_psprintf(pool, "%s%s/%s/bln/%" SVN_REVNUM_T_FMT "%s", + return apr_psprintf(pool, "%s%s/%s/bln/%ld%s", href1, root_path, special_uri, revision, href2); case DAV_SVN_BUILD_URI_BC: - return apr_psprintf(pool, "%s%s/%s/bc/%" SVN_REVNUM_T_FMT "/%s", + return apr_psprintf(pool, "%s%s/%s/bc/%ld/%s", href1, root_path, special_uri, revision, href2); case DAV_SVN_BUILD_URI_PUBLIC: @@ -179,7 +179,7 @@ href1, root_path, path_uri, href2); case DAV_SVN_BUILD_URI_VERSION: - return apr_psprintf(pool, "%s%s/%s/ver/%" SVN_REVNUM_T_FMT "%s%s", + return apr_psprintf(pool, "%s%s/%s/ver/%ld%s%s", href1, root_path, special_uri, revision, path_uri, href2); Index: subversion/clients/cmdline/propdel-cmd.c =================================================================== --- subversion/clients/cmdline/propdel-cmd.c (revision 9687) +++ subversion/clients/cmdline/propdel-cmd.c (arbetskopia) @@ -94,8 +94,7 @@ 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", + printf ("property '%s' deleted from repository revision '%ld'\n", pname_stdout, rev); } } Index: subversion/clients/cmdline/util.c =================================================================== --- subversion/clients/cmdline/util.c (revision 9687) +++ subversion/clients/cmdline/util.c (arbetskopia) @@ -55,7 +55,7 @@ { if ((commit_info) && (SVN_IS_VALID_REVNUM (commit_info->revision))) - printf ("\nCommitted revision %" SVN_REVNUM_T_FMT ".\n", + printf ("\nCommitted revision %ld.\n", commit_info->revision); return; Index: subversion/clients/cmdline/ls-cmd.c =================================================================== --- subversion/clients/cmdline/ls-cmd.c (revision 9687) +++ subversion/clients/cmdline/ls-cmd.c (arbetskopia) @@ -94,7 +94,7 @@ sprintf (size_buf, "%" SVN_FILESIZE_T_FMT, dirent->size); - printf ("%7"SVN_REVNUM_T_FMT" %-8.8s %10s %12s %s%s\n", + printf ("%7ld %-8.8s %10s %12s %s%s\n", dirent->created_rev, stdout_author ? stdout_author : " ? ", (dirent->kind == svn_node_file) ? size_buf : "", Index: subversion/clients/cmdline/blame-cmd.c =================================================================== --- subversion/clients/cmdline/blame-cmd.c (revision 9687) +++ subversion/clients/cmdline/blame-cmd.c (arbetskopia) @@ -53,7 +53,7 @@ const char *time_utf8; const char *time_stdout; const char *rev_str = SVN_IS_VALID_REVNUM (revision) - ? apr_psprintf (pool, "%6" SVN_REVNUM_T_FMT, revision) + ? apr_psprintf (pool, "%6ld", revision) : " -"; if (opt_state->verbose) Index: subversion/clients/cmdline/log-cmd.c =================================================================== --- subversion/clients/cmdline/log-cmd.c (revision 9687) +++ subversion/clients/cmdline/log-cmd.c (arbetskopia) @@ -245,7 +245,7 @@ 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", + "r%ld | %s | %s", rev, author_stdout, date_stdout)); if (! lb->omit_log_message) @@ -285,7 +285,7 @@ (&path_stdout, log_item->copyfrom_path, pool)); copy_data = apr_psprintf (pool, - " (from %s:%" SVN_REVNUM_T_FMT ")", + " (from %s:%ld)", path_stdout, log_item->copyfrom_rev); } @@ -364,7 +364,7 @@ if (rev == 0) return SVN_NO_ERROR; - revstr = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, rev); + revstr = apr_psprintf (pool, "%ld", rev); /* */ svn_xml_make_open_tag (&sb, pool, svn_xml_normal, "logentry", "revision", revstr, NULL); @@ -417,7 +417,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, + revstr = apr_psprintf (pool, "%ld", log_item->copyfrom_rev); svn_xml_make_open_tag (&sb, pool, svn_xml_protect_pcdata, "path", "action", action, Index: subversion/clients/cmdline/status.c =================================================================== --- subversion/clients/cmdline/status.c (revision 9687) +++ subversion/clients/cmdline/status.c (arbetskopia) @@ -78,7 +78,7 @@ else if (status->copied) working_rev = "-"; else - sprintf (working_rev_buf, "%" SVN_REVNUM_T_FMT, + sprintf (working_rev_buf, "%ld", status->entry->revision); if (status->repos_text_status != svn_wc_status_none @@ -90,7 +90,7 @@ if (show_last_committed) { if (status->entry && SVN_IS_VALID_REVNUM (status->entry->cmt_rev)) - sprintf(commit_rev_buf, "%" SVN_REVNUM_T_FMT, + sprintf(commit_rev_buf, "%ld", status->entry->cmt_rev); else if (status->entry) commit_rev = " ? "; Index: subversion/clients/cmdline/propset-cmd.c =================================================================== --- subversion/clients/cmdline/propset-cmd.c (revision 9687) +++ subversion/clients/cmdline/propset-cmd.c (arbetskopia) @@ -122,8 +122,7 @@ &rev, opt_state->force, ctx, pool)); if (! opt_state->quiet) { - printf ("property '%s' set on repository revision '%" - SVN_REVNUM_T_FMT"'\n", + printf ("property '%s' set on repository revision '%ld'\n", pname, rev); } } Index: subversion/clients/cmdline/notify.c =================================================================== --- subversion/clients/cmdline/notify.c (revision 9687) +++ subversion/clients/cmdline/notify.c (arbetskopia) @@ -178,21 +178,21 @@ if (SVN_IS_VALID_REVNUM (revision)) { if (nb->is_export) - printf ("Exported %srevision %" SVN_REVNUM_T_FMT ".\n", + printf ("Exported %srevision %ld.\n", nb->in_external ? "external at " : "", revision); else if (nb->is_checkout) - printf ("Checked out %srevision %" SVN_REVNUM_T_FMT ".\n", + printf ("Checked out %srevision %ld.\n", nb->in_external ? "external at " : "", revision); else { if (nb->received_some_change) - printf ("Updated %sto revision %" SVN_REVNUM_T_FMT ".\n", + printf ("Updated %sto revision %ld.\n", nb->in_external ? "external " : "", revision); else - printf ("%st revision %" SVN_REVNUM_T_FMT ".\n", + printf ("%st revision %ld.\n", nb->in_external ? "External a" : "A", revision); } @@ -223,7 +223,7 @@ 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: %6ld\n", revision); break; case svn_wc_notify_commit_modified: Index: subversion/clients/cmdline/proplist-cmd.c =================================================================== --- subversion/clients/cmdline/proplist-cmd.c (revision 9687) +++ subversion/clients/cmdline/proplist-cmd.c (arbetskopia) @@ -85,7 +85,7 @@ URL, &(opt_state->start_revision), &rev, ctx, pool)); - printf("Unversioned properties on revision %"SVN_REVNUM_T_FMT":\n", + printf("Unversioned properties on revision %ld:\n", rev); SVN_ERR (svn_cl__print_prop_hash Index: subversion/clients/cmdline/propedit-cmd.c =================================================================== --- subversion/clients/cmdline/propedit-cmd.c (revision 9687) +++ subversion/clients/cmdline/propedit-cmd.c (arbetskopia) @@ -128,13 +128,12 @@ 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 %ld\n", + pname, rev); } else { - printf ("No changes to property '%s' on revision %" - SVN_REVNUM_T_FMT"\n", pname, rev); + printf ("No changes to property '%s' on revision %ld", pname, rev); } } 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 9687) +++ 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: %ld\n", entry->revision); switch (entry->kind) { @@ -156,7 +156,7 @@ } if (SVN_IS_VALID_REVNUM (entry->copyfrom_rev)) - printf ("Copied From Rev: %" SVN_REVNUM_T_FMT "\n", + printf ("Copied From Rev: %ld\n", entry->copyfrom_rev); } @@ -168,7 +168,7 @@ } if (SVN_IS_VALID_REVNUM (entry->cmt_rev)) - printf ("Last Changed Rev: %" SVN_REVNUM_T_FMT "\n", entry->cmt_rev); + printf ("Last Changed Rev: %ld\n", entry->cmt_rev); if (entry->cmt_date) SVN_ERR (svn_cl__info_print_time (entry->cmt_date, Index: subversion/tests/libsvn_fs_base/fs-test.c =================================================================== --- subversion/tests/libsvn_fs_base/fs-test.c (revision 9687) +++ subversion/tests/libsvn_fs_base/fs-test.c (arbetskopia) @@ -3796,9 +3796,7 @@ if (err) return svn_error_createf (SVN_ERR_FS_GENERAL, err, - "Error validating revision %" SVN_REVNUM_T_FMT - " (youngest is %" SVN_REVNUM_T_FMT ")", i, max_rev); - + "Error validating revision %ld (youngest is %ld)", i, max_rev); svn_pool_clear (subpool); } @@ -4267,7 +4265,7 @@ if (memcmp (digest, digest_list[j], APR_MD5_DIGESTSIZE)) return svn_error_createf (SVN_ERR_FS_GENERAL, NULL, - "MD5 checksum failure, revision %" SVN_REVNUM_T_FMT, j); + "MD5 checksum failure, revision %ld", j); svn_pool_clear (subpool); } @@ -4346,8 +4344,7 @@ if (test_rev != youngest_rev) return svn_error_createf (SVN_ERR_FS_GENERAL, NULL, - "Root node in revision %" SVN_REVNUM_T_FMT - " has unexpected stored revision %" SVN_REVNUM_T_FMT, + "Root node in revision %ld has unexpected stored revision %ld", youngest_rev, test_rev); svn_pool_clear (subpool); @@ -4368,8 +4365,7 @@ if (test_rev != youngest_rev) return svn_error_createf (SVN_ERR_FS_GENERAL, NULL, - "Root node in revision %" SVN_REVNUM_T_FMT - " has unexpected stored revision %" SVN_REVNUM_T_FMT, + "Root node in revision %ld has unexpected stored revision %ld", youngest_rev, test_rev); svn_pool_clear (subpool); } @@ -4402,8 +4398,8 @@ if (rev != args[i].rev) return svn_error_createf (SVN_ERR_FS_GENERAL, NULL, - "verify_path_revs: '%s' has created rev '%" SVN_REVNUM_T_FMT "' " - "(expected '%" SVN_REVNUM_T_FMT "')", + "verify_path_revs: '%s' has created rev '%ld' " + "(expected '%ld')", args[i].path, rev, args[i].rev); } Index: subversion/tests/svn_test_editor.c =================================================================== --- subversion/tests/svn_test_editor.c (revision 9687) +++ subversion/tests/svn_test_editor.c (arbetskopia) @@ -188,9 +188,7 @@ svn_stringbuf_t *str; str = svn_stringbuf_createf (pool, - "[%s] set_target_revision (%" - SVN_REVNUM_T_FMT - ")\n", + "[%s] set_target_revision (%ld)\n", eb->editor_name, target_revision); SVN_ERR (print (eb, 0, str)); @@ -228,7 +226,7 @@ return SVN_NO_ERROR; str = svn_stringbuf_createf (pool, - "base_revision: %" SVN_REVNUM_T_FMT "\n", + "base_revision: %ld\n", base_revision); SVN_ERR (print (eb, nb->indent_level, str)); SVN_ERR (newline (eb)); @@ -277,15 +275,14 @@ base_path ? base_path : ""); SVN_ERR (print (eb, nb->indent_level, str)); - str = svn_stringbuf_createf (pool, "copyfrom_revision: %" - SVN_REVNUM_T_FMT "\n", + str = svn_stringbuf_createf (pool, "copyfrom_revision: %ld\n", base_revision); SVN_ERR (print (eb, nb->indent_level, str)); } else { - str = svn_stringbuf_createf (pool, "base_revision: %" - SVN_REVNUM_T_FMT "\n", base_revision); + str = svn_stringbuf_createf (pool, "base_revision: %ld\n", + base_revision); SVN_ERR (print (eb, nb->indent_level, str)); } Index: subversion/tests/libsvn_repos/repos-test.c =================================================================== --- subversion/tests/libsvn_repos/repos-test.c (revision 9687) +++ subversion/tests/libsvn_repos/repos-test.c (arbetskopia) @@ -453,9 +453,7 @@ rev = ((svn_revnum_t *)revs_got->elts)[i]; outstr = apr_pstrcat (pool, outstr, - apr_psprintf (pool, "%" - SVN_REVNUM_T_FMT - " ", rev), + apr_psprintf (pool, "%ld ", rev), NULL); } } @@ -464,7 +462,7 @@ { outstr = apr_pstrcat (pool, outstr, - apr_psprintf (pool, "%" SVN_REVNUM_T_FMT " ", + apr_psprintf (pool, "%ld ", revs_expected[i]), NULL); } Index: subversion/svndumpfilter/main.c =================================================================== --- subversion/svndumpfilter/main.c (revision 9687) +++ subversion/svndumpfilter/main.c (arbetskopia) @@ -251,8 +251,8 @@ SVN_ERR (svn_stream_printf (header_stream, pool, - SVN_REPOS_DUMPFILE_REVISION_NUMBER ": %" - SVN_REVNUM_T_FMT "\n", rb->rev_actual)); + SVN_REPOS_DUMPFILE_REVISION_NUMBER ": %ld\n", + rb->rev_actual)); for (hi = apr_hash_first (pool, headers); hi; hi = apr_hash_next (hi)) { @@ -414,8 +414,8 @@ } SVN_ERR (svn_stream_printf (header_stream, pool, - SVN_REPOS_DUMPFILE_NODE_COPYFROM_REV ": %" - SVN_REVNUM_T_FMT "\n", *cf_renum_rev)); + SVN_REPOS_DUMPFILE_NODE_COPYFROM_REV ": %ld\n", + *cf_renum_rev)); continue; } @@ -635,14 +635,14 @@ 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 %ld committed as %ld.\n", + rb->rev_orig, rb->rev_actual); } else { rb->pb->rev_drop_count++; if (! rb->pb->quiet) - fprintf (stderr, "Revision %" SVN_REVNUM_T_FMT " skipped.\n", + fprintf (stderr, "Revision %ld skipped.\n", rb->rev_orig); } return SVN_NO_ERROR; @@ -885,12 +885,11 @@ &this_key, sizeof (this_key))); if (this_val == SVN_INVALID_REVNUM) - fprintf (stderr, " '%" SVN_REVNUM_T_FMT "' => (dropped)\n", + fprintf (stderr, " '%ld' => (dropped)\n", this_key); else fprintf (stderr, - " '%" SVN_REVNUM_T_FMT "' => '%" - SVN_REVNUM_T_FMT "'\n", + " '%ld' => '%ld'\n", this_key, this_val); } fprintf (stderr, "\n"); Index: subversion/libsvn_repos/load.c =================================================================== --- subversion/libsvn_repos/load.c (revision 9687) +++ subversion/libsvn_repos/load.c (arbetskopia) @@ -788,8 +788,7 @@ 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 %ld\n", rb->rev)); } /* If we're parsing revision 0, only the revision are (possibly) @@ -828,8 +827,8 @@ 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 - " is not available in current repository", + "Relative source revision %ld is not" + " available in current repository", src_rev); SVN_ERR (svn_fs_revision_root (©_root, pb->fs, src_rev, pool)); @@ -1105,17 +1104,14 @@ 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 %ld" + " >>>\n\n", new_rev)); } 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------- Committed new rev %ld" + " (loaded from original rev %ld" ") >>>\n\n", new_rev, rb->rev)); } } Index: subversion/libsvn_repos/log.c =================================================================== --- subversion/libsvn_repos/log.c (revision 9687) +++ 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 '%ld'", start); 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 '%ld'", end); /* 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/reporter.c =================================================================== --- subversion/libsvn_repos/reporter.c (revision 9687) +++ subversion/libsvn_repos/reporter.c (arbetskopia) @@ -357,7 +357,7 @@ if (SVN_IS_VALID_REVNUM (crev)) { /* Transmit the committed-rev. */ - cr_str = svn_string_createf (pool, "%" SVN_REVNUM_T_FMT, crev); + cr_str = svn_string_createf (pool, "%ld", crev); SVN_ERR (change_fn (b, object, SVN_PROP_ENTRY_COMMITTED_REV, cr_str, pool)); @@ -928,7 +928,7 @@ lrep = lpath ? apr_psprintf (pool, "+%" APR_SIZE_T_FMT ":%s", strlen(lpath), lpath) : "-"; rrep = (SVN_IS_VALID_REVNUM (rev)) ? - apr_psprintf (pool, "+%" SVN_REVNUM_T_FMT ":", rev) : "-"; + apr_psprintf (pool, "+%ld:", rev) : "-"; rep = apr_psprintf (pool, "+%" APR_SIZE_T_FMT ":%s%s%s%c", strlen(path), path, lrep, rrep, start_empty ? '+' : '-'); return svn_io_file_write_full (b->tempfile, rep, strlen(rep), NULL, pool); Index: subversion/libsvn_repos/hooks.c =================================================================== --- subversion/libsvn_repos/hooks.c (revision 9687) +++ subversion/libsvn_repos/hooks.c (arbetskopia) @@ -235,7 +235,7 @@ args[0] = hook; args[1] = svn_repos_path (repos, pool); - args[2] = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, rev); + args[2] = apr_psprintf (pool, "%ld", rev); args[3] = NULL; SVN_ERR (run_hook_cmd ("post-commit", hook, args, FALSE, NULL, pool)); @@ -265,7 +265,7 @@ args[0] = hook; args[1] = svn_repos_path (repos, pool); - args[2] = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, rev); + args[2] = apr_psprintf (pool, "%ld", rev); args[3] = author ? author : ""; args[4] = name; args[5] = NULL; @@ -310,7 +310,7 @@ args[0] = hook; args[1] = svn_repos_path (repos, pool); - args[2] = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, rev); + args[2] = apr_psprintf (pool, "%ld", rev); args[3] = author ? author : ""; args[4] = name; args[5] = NULL; Index: subversion/libsvn_repos/dump.c =================================================================== --- subversion/libsvn_repos/dump.c (revision 9687) +++ subversion/libsvn_repos/dump.c (arbetskopia) @@ -429,16 +429,16 @@ && eb->feedback_stream) svn_stream_printf (eb->feedback_stream, pool, - "WARNING: Referencing data in revision %" SVN_REVNUM_T_FMT + "WARNING: Referencing data in revision %ld" ", which is older than the oldest\nWARNING: dumped revision " - "(%" SVN_REVNUM_T_FMT "). Loading this dump into an empty " + "(%ld). Loading this dump into an empty " "repository\nWARNING: will fail.\n", cmp_rev, eb->oldest_dumped_rev); if (eb->stream) SVN_ERR (svn_stream_printf (eb->stream, pool, SVN_REPOS_DUMPFILE_NODE_COPYFROM_REV - ": %" SVN_REVNUM_T_FMT "\n" + ": %ld\n" SVN_REPOS_DUMPFILE_NODE_COPYFROM_PATH ": %s\n", cmp_rev, cmp_path)); @@ -902,7 +902,7 @@ SVN_ERR (svn_stream_printf (stream, pool, SVN_REPOS_DUMPFILE_REVISION_NUMBER - ": %" SVN_REVNUM_T_FMT "\n", rev)); + ": %ld\n", rev)); SVN_ERR (svn_stream_printf (stream, pool, SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH ": %" APR_SIZE_T_FMT "\n", @@ -959,14 +959,13 @@ /* 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 revision %ld" + " is greater than end revision %ld", start_rev, end_rev); 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 revision %ld is invalid " + "(youngest revision is %ld)", end_rev, youngest); if ((start_rev == 0) && incremental) incremental = FALSE; /* revision 0 looks the same regardless of @@ -1074,7 +1073,7 @@ svn_pool_clear (subpool); if (feedback_stream) SVN_ERR (svn_stream_printf (feedback_stream, pool, - "* %s revision %" SVN_REVNUM_T_FMT ".\n", + "* %s revision %ld.\n", stream ? "Dumped" : "Verified", to_rev)); } Index: subversion/libsvn_repos/delta.c =================================================================== --- subversion/libsvn_repos/delta.c (revision 9687) +++ subversion/libsvn_repos/delta.c (arbetskopia) @@ -485,7 +485,7 @@ const char *uuid; /* Transmit the committed-rev. */ - cr_str = svn_string_createf (subpool, "%" SVN_REVNUM_T_FMT, + cr_str = svn_string_createf (subpool, "%ld", committed_rev); SVN_ERR (change_fn (c, object, SVN_PROP_ENTRY_COMMITTED_REV, cr_str, subpool)); Index: subversion/libsvn_repos/rev_hunt.c =================================================================== --- subversion/libsvn_repos/rev_hunt.c (revision 9687) +++ subversion/libsvn_repos/rev_hunt.c (arbetskopia) @@ -56,7 +56,7 @@ 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 %ld", rev); SVN_ERR (svn_time_from_cstring (tm, date_str->data, pool)); @@ -191,13 +191,11 @@ 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 %ld", start); 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 %ld", end); /* Ensure that the input is ordered. */ if (start > end) Index: subversion/libsvn_ra_dav/log.c =================================================================== --- subversion/libsvn_ra_dav/log.c (revision 9687) +++ subversion/libsvn_ra_dav/log.c (arbetskopia) @@ -359,11 +359,11 @@ svn_stringbuf_appendcstr(request_body, log_request_head); svn_stringbuf_appendcstr(request_body, apr_psprintf(ras->pool, - "%" SVN_REVNUM_T_FMT + "%ld" "", start)); svn_stringbuf_appendcstr(request_body, apr_psprintf(ras->pool, - "%" SVN_REVNUM_T_FMT + "%ld" "", end)); if (discover_changed_paths) { Index: subversion/libsvn_ra_dav/props.c =================================================================== --- subversion/libsvn_ra_dav/props.c (revision 9687) +++ subversion/libsvn_ra_dav/props.c (arbetskopia) @@ -850,7 +850,7 @@ /* ### send Label hdr, get DAV:baseline-collection [from the baseline] */ - apr_snprintf(label, sizeof(label), "%" SVN_REVNUM_T_FMT, revision); + apr_snprintf(label, sizeof(label), "%ld", revision); /* ### do we want to optimize the props we fetch, based on what the ### user asked for? i.e. omit version-name if latest_rev is NULL */ Index: subversion/libsvn_ra_dav/commit.c =================================================================== --- subversion/libsvn_ra_dav/commit.c (revision 9687) +++ subversion/libsvn_ra_dav/commit.c (arbetskopia) @@ -643,7 +643,7 @@ if (SVN_IS_VALID_REVNUM(revision)) { - const char *revstr = apr_psprintf(pool, "%" SVN_REVNUM_T_FMT, revision); + const char *revstr = apr_psprintf(pool, "%ld", revision); extra_headers = apr_hash_make(pool); apr_hash_set(extra_headers, SVN_DAV_VERSION_NAME_HEADER, APR_HASH_KEY_STRING, revstr); Index: subversion/libsvn_ra_dav/fetch.c =================================================================== --- subversion/libsvn_ra_dav/fetch.c (revision 9687) +++ subversion/libsvn_ra_dav/fetch.c (arbetskopia) @@ -2178,15 +2178,13 @@ svn_xml_escape_cdata_cstring (&qpath, path, pool); if (start_empty) entry = apr_psprintf(pool, - "%s" DEBUG_CR, + "%s" DEBUG_CR, revision, qpath->data); else entry = apr_psprintf(pool, - "%s" DEBUG_CR, + "" + "%s" DEBUG_CR, revision, qpath->data); return svn_io_file_write_full(rb->tmpfile, entry, strlen(entry), NULL, pool); @@ -2218,14 +2216,14 @@ svn_xml_escape_attr_cstring (&qlinkpath, bc_relative.data, pool); if (start_empty) entry = apr_psprintf(pool, - "%s" DEBUG_CR, revision, qlinkpath->data, qpath->data); else entry = apr_psprintf(pool, - "%s" DEBUG_CR, + "%s" DEBUG_CR, revision, qlinkpath->data, qpath->data); return svn_io_file_write_full(rb->tmpfile, entry, strlen(entry), NULL, pool); @@ -2403,7 +2401,7 @@ if (SVN_IS_VALID_REVNUM(revision)) { s = apr_psprintf(pool, - "%" SVN_REVNUM_T_FMT + "%ld" "", revision); SVN_ERR( svn_io_file_write_full(rb->tmpfile, s, strlen(s), NULL, pool) ); } Index: subversion/svnserve/serve.c =================================================================== --- subversion/svnserve/serve.c (revision 9687) +++ subversion/svnserve/serve.c (arbetskopia) @@ -406,7 +406,7 @@ /* Hardcode the values for the committed revision, date, and author. */ SVN_ERR(svn_repos_get_committed_info(&crev, &cdate, &cauthor, root, path, pool)); - str = svn_string_create(apr_psprintf(pool, "%" SVN_REVNUM_T_FMT, crev), + str = svn_string_create(apr_psprintf(pool, "%ld", crev), pool); apr_hash_set(*props, SVN_PROP_ENTRY_COMMITTED_REV, APR_HASH_KEY_STRING, str); str = (cdate) ? svn_string_create(cdate, pool) : NULL; Index: subversion/svnversion/main.c =================================================================== --- subversion/svnversion/main.c (revision 9687) +++ subversion/svnversion/main.c (arbetskopia) @@ -308,9 +308,9 @@ } } - printf ("%" SVN_REVNUM_T_FMT, sb.min_rev); + printf ("%ld", sb.min_rev); if (sb.min_rev != sb.max_rev) - printf (":%" SVN_REVNUM_T_FMT, sb.max_rev); + printf (":%ld", sb.max_rev); if (sb.modified) fputs ("M", stdout); if (sb.switched) Index: subversion/libsvn_fs_fs/tree.c =================================================================== --- subversion/libsvn_fs_fs/tree.c (revision 9687) +++ subversion/libsvn_fs_fs/tree.c (arbetskopia) @@ -330,7 +330,7 @@ return svn_error_createf (SVN_ERR_FS_NOT_FOUND, 0, - "File not found: revision '%" SVN_REVNUM_T_FMT "', path '%s'", + "File not found: revision '%ld', path '%s'", root->rev, path); } @@ -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 '%ld', path '%s'", + fs->path, root->rev, path); } Index: subversion/libsvn_fs_fs/fs_fs.c =================================================================== --- subversion/libsvn_fs_fs/fs_fs.c (revision 9687) +++ subversion/libsvn_fs_fs/fs_fs.c (arbetskopia) @@ -292,8 +292,7 @@ for (rev = 0; rev <= youngest; rev++) SVN_ERR (svn_io_dir_file_copy (src_subdir, dst_subdir, - apr_psprintf (pool, "%" - SVN_REVNUM_T_FMT, rev), + apr_psprintf (pool, "%ld", rev), pool)); /* Copy the necessary revprop files. */ @@ -304,8 +303,7 @@ for (rev = 0; rev <= youngest; rev++) SVN_ERR (svn_io_dir_file_copy (src_subdir, dst_subdir, - apr_psprintf (pool, "%" - SVN_REVNUM_T_FMT, rev), + apr_psprintf (pool, "%ld", rev), pool)); /* Make an empty transactions directory for now. Eventually some @@ -399,7 +397,7 @@ const char *rev_filename; apr_file_t *rev_file; - rev_filename = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, rev); + rev_filename = apr_psprintf (pool, "%ld", rev); SVN_ERR (svn_io_file_open (&rev_file, svn_path_join_many (pool, @@ -796,7 +794,7 @@ { const char *rev; - rev = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, rep->revision); + rev = apr_psprintf (pool, "%ld", rep->revision); return apr_psprintf (pool, "%s %" APR_OFF_T_FMT " %" APR_SIZE_T_FMT " %" APR_SIZE_T_FMT " %s", @@ -845,15 +843,15 @@ noderev->created_path)); if (noderev->copyfrom_path) - SVN_ERR (svn_stream_printf (outfile, pool, SVN_FS_FS__COPYFROM ": %" - SVN_REVNUM_T_FMT " %s\n", + SVN_ERR (svn_stream_printf (outfile, pool, SVN_FS_FS__COPYFROM ": %ld" + " %s\n", noderev->copyfrom_rev, noderev->copyfrom_path)); if ((noderev->copyroot_rev != svn_fs_fs__id_rev (noderev->id)) || (strcmp (noderev->copyroot_path, noderev->created_path) != 0)) - SVN_ERR (svn_stream_printf (outfile, pool, SVN_FS_FS__COPYROOT ": %" - SVN_REVNUM_T_FMT " %s\n", + SVN_ERR (svn_stream_printf (outfile, pool, SVN_FS_FS__COPYROOT ": %ld" + " %s\n", noderev->copyroot_rev, noderev->copyroot_path)); @@ -1088,7 +1086,7 @@ apr_off_t root_offset; svn_fs_id_t *root_id; - revision_filename = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, rev); + revision_filename = apr_psprintf (pool, "%ld", rev); SVN_ERR (svn_io_file_open (&revision_file, svn_path_join_many (pool, @@ -1118,7 +1116,7 @@ char *revprop_filename; apr_file_t *revprop_file; - revprop_filename = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, rev); + revprop_filename = apr_psprintf (pool, "%ld", rev); SVN_ERR (svn_io_file_open (&revprop_file, svn_path_join_many (pool, @@ -1146,7 +1144,7 @@ apr_file_t *revprop_file; apr_hash_t *proplist; - revprop_filename = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, rev); + revprop_filename = apr_psprintf (pool, "%ld", rev); SVN_ERR (svn_io_file_open (&revprop_file, svn_path_join_many (pool, @@ -1786,7 +1784,7 @@ else { copyfrom_string = apr_psprintf (copyfrom_pool, - "%" SVN_REVNUM_T_FMT " %s", + "%ld %s", change->copyfrom_rev, change->copyfrom_path); } @@ -1816,8 +1814,8 @@ new_change->prop_mod = change->prop_mod; if (change->copyfrom_rev != SVN_INVALID_REVNUM) { - copyfrom_string = apr_psprintf (copyfrom_pool, "%" SVN_REVNUM_T_FMT - " %s", change->copyfrom_rev, + copyfrom_string = apr_psprintf (copyfrom_pool, "%ld %s", + change->copyfrom_rev, change->copyfrom_path); } else @@ -2106,7 +2104,7 @@ apr_hash_t *changed_paths; apr_file_t *revision_file; - revision_filename = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, rev); + revision_filename = apr_psprintf (pool, "%ld", rev); SVN_ERR (svn_io_file_open (&revision_file, svn_path_join_many (pool, @@ -2179,8 +2177,7 @@ svn_fs_id_t *root_id; char *txn_filename = svn_path_join_many (pool, fs->path, SVN_FS_FS__TXNS_DIR, - apr_psprintf (pool, "%" - SVN_REVNUM_T_FMT, + apr_psprintf (pool, "%ld", rev), NULL); const char *txn_dirname, *txn_tmpfile_orig; @@ -2685,7 +2682,7 @@ if (copyfrom_rev != SVN_INVALID_REVNUM) { - copyfrom = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT " %s", + copyfrom = apr_psprintf (pool, "%ld %s", copyfrom_rev, copyfrom_path); } else @@ -2937,8 +2934,8 @@ /* Write out the rep header. */ if (base_rep) { - header = apr_psprintf (b->pool, SVN_FS_FS__DELTA " %" - SVN_REVNUM_T_FMT " %" APR_OFF_T_FMT " %" + header = apr_psprintf (b->pool, SVN_FS_FS__DELTA " %ld" + " %" APR_OFF_T_FMT " %" APR_SIZE_T_FMT "\n", base_rep->revision, base_rep->offset, base_rep->size); @@ -3492,7 +3489,7 @@ svn_fs_fs__add_keys (start_copy_id, txn_copy_id, new_copy_id); /* Now we can just write out this line. */ - buf = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT " %s %s\n", rev, new_node_id, + buf = apr_psprintf (pool, "%ld %s %s\n", rev, new_node_id, new_copy_id); name = svn_path_join (fs->path, SVN_FS_FS__CURRENT, pool); @@ -3571,14 +3568,12 @@ old_rev_filename = svn_path_join_many (subpool, fs->path, SVN_FS_FS__REVS_DIR, - apr_psprintf (subpool, "%" - SVN_REVNUM_T_FMT, + apr_psprintf (subpool, "%ld", old_rev), NULL); rev_filename = svn_path_join_many (subpool, fs->path, SVN_FS_FS__REVS_DIR, - apr_psprintf (subpool, "%" - SVN_REVNUM_T_FMT, + apr_psprintf (subpool, "%ld", new_rev), NULL); @@ -3628,7 +3623,7 @@ final_revprop = svn_path_join_many (subpool, fs->path, SVN_FS_FS__REVPROPS_DIR, - apr_psprintf (pool, "%" SVN_REVNUM_T_FMT, + apr_psprintf (pool, "%ld", new_rev), NULL); Index: subversion/libsvn_fs_fs/err.c =================================================================== --- subversion/libsvn_fs_fs/err.c (revision 9687) +++ subversion/libsvn_fs_fs/err.c (arbetskopia) @@ -67,7 +67,7 @@ { return svn_error_createf (SVN_ERR_FS_CORRUPT, 0, - "Corrupt filesystem revision '%" SVN_REVNUM_T_FMT "' in filesystem '%s'", + "Corrupt filesystem revision '%ld' in filesystem '%s'", rev, fs->path); } @@ -110,9 +110,7 @@ { return svn_error_createf (SVN_ERR_FS_NO_SUCH_REVISION, 0, - "Reference to non-existent revision '%" - SVN_REVNUM_T_FMT - "' in filesystem '%s'", + "Reference to non-existent revision '%ld' in filesystem '%s'", rev, fs->path); } @@ -167,8 +165,8 @@ 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 %ld, path '%s'", + fs->path, rev, path); } Index: subversion/libsvn_fs_fs/id.c =================================================================== --- subversion/libsvn_fs_fs/id.c (revision 9687) +++ subversion/libsvn_fs_fs/id.c (arbetskopia) @@ -88,7 +88,7 @@ if ((! pvt->txn_id)) { - txn_rev_id = apr_psprintf (pool, "%" SVN_REVNUM_T_FMT "/%" + txn_rev_id = apr_psprintf (pool, "%ld/%" APR_OFF_T_FMT, pvt->rev, pvt->offset); } else