svn commit: r945449 - /subversion/trunk/subversion/mod_dav_svn/posts/create-transaction.c

[cm...@apache.org]

Author: cmpilato
Date: Tue May 18 01:15:41 2010
New Revision: 945449

URL: http://svn.apache.org/viewvc?rev=945449&view=rev
Log:
Follow up to r945280 with a not-really-right-but-hopefully-good-enough
tweak to get the build unbroken.

NOTE: I'm reworking the approach altogether, so don't want to bother
with a perfect solution, but also don't want to mess up the build for
everyone either.

* subversion/mod_dav_svn/posts/create-transaction.c
  (dav_svn__create_transaction_post): Fix some compiler errors.

Modified:
    subversion/trunk/subversion/mod_dav_svn/posts/create-transaction.c

Modified: subversion/trunk/subversion/mod_dav_svn/posts/create-transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/posts/create-transaction.c?rev=945449&r1=945448&r2=945449&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/posts/create-transaction.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/posts/create-transaction.c Tue May 18 01:15:41 2010
@@ -59,7 +59,7 @@ dav_svn__create_transaction_post(const d
   apr_err = ap_fprintf(output, bb,
                        DAV_XML_HEADER DEBUG_CR
                        "<S:transaction xmlns:S=\"" SVN_XML_NAMESPACE "\""
-                       ">%ld</S:transaction",
+                       ">%s</S:transaction",
                        apr_xml_quote_string(resource->pool, txn_name, 0));
   if (apr_err)
     derr = dav_svn__convert_err(svn_error_create(apr_err, 0, NULL),
@@ -67,5 +67,11 @@ dav_svn__create_transaction_post(const d
                                 "Error writing POST response.",
                                 resource->pool);
       
-  return dav_svn__final_flush_or_error(r, bb, output, derr, resource->pool);
+  derr = dav_svn__final_flush_or_error(r, bb, output, derr, resource->pool);
+  if (derr)
+    {
+      /* ### We should at least log something. */
+      return HTTP_INTERNAL_SERVER_ERROR;
+    }
+  return DONE;
 }