mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

29 lines
1.7 KiB

  1. diff -pruN subversion-1.0.2_orig/subversion/libsvn_ra_svn/marshal.c subversion-1.0.2/subversion/libsvn_ra_svn/marshal.c
  2. --- subversion-1.0.2_orig/subversion/libsvn_ra_svn/marshal.c 2004-05-13 11:03:26.000000000 +0200
  3. +++ subversion-1.0.2/subversion/libsvn_ra_svn/marshal.c 2004-05-13 11:04:08.000000000 +0200
  4. @@ -731,10 +731,6 @@ svn_error_t *svn_ra_svn_read_cmd_respons
  5. "Malformed error list");
  6. SVN_ERR(svn_ra_svn_parse_tuple(elt->u.list, pool, "nccn", &apr_err,
  7. &message, &file, &line));
  8. - /* The message field should have been optional, but we can't
  9. - easily change that, so "" means a nonexistent message. */
  10. - if (!*message)
  11. - message = NULL;
  12. err = svn_error_create(apr_err, err, message);
  13. err->file = apr_pstrdup(err->pool, file);
  14. err->line = line;
  15. @@ -835,12 +831,10 @@ svn_error_t *svn_ra_svn_write_cmd_failur
  16. SVN_ERR(svn_ra_svn_start_list(conn, pool));
  17. for (; err; err = err->child)
  18. {
  19. - /* The message string should have been optional, but we can't
  20. - easily change that, so marshal nonexistent messages as "". */
  21. SVN_ERR(svn_ra_svn_write_tuple(conn, pool, "nccn",
  22. (apr_uint64_t) err->apr_err,
  23. - err->message ? err->message : "",
  24. - err->file, (apr_uint64_t) err->line));
  25. + err->message, err->file,
  26. + (apr_uint64_t) err->line));
  27. }
  28. SVN_ERR(svn_ra_svn_end_list(conn, pool));
  29. SVN_ERR(svn_ra_svn_end_list(conn, pool));