[libsoup/wip/xmlrpc-variant: 7/11] fixup! xmlrpc: Port soup_xmlrpc_build_fault() to GVariant
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup/wip/xmlrpc-variant: 7/11] fixup! xmlrpc: Port soup_xmlrpc_build_fault() to GVariant
- Date: Thu, 6 Aug 2015 12:52:42 +0000 (UTC)
commit 8dfccca22ef16a84c4ab99cf8bdb8ded6d2269d5
Author: Dan Winship <danw gnome org>
Date: Thu Aug 6 08:33:13 2015 -0400
fixup! xmlrpc: Port soup_xmlrpc_build_fault() to GVariant
libsoup/soup-xmlrpc-old.c | 33 +++++++++++++++++++++++++++++++++
libsoup/soup-xmlrpc.c | 31 ++-----------------------------
2 files changed, 35 insertions(+), 29 deletions(-)
---
diff --git a/libsoup/soup-xmlrpc-old.c b/libsoup/soup-xmlrpc-old.c
index 0bd72ef..8e091e4 100644
--- a/libsoup/soup-xmlrpc-old.c
+++ b/libsoup/soup-xmlrpc-old.c
@@ -319,6 +319,39 @@ soup_xmlrpc_set_response (SoupMessage *msg, GType type, ...)
body, strlen (body));
}
+char *soup_xmlrpc_build_faultv (int fault_code,
+ const char *fault_format,
+ va_list args) G_GNUC_PRINTF (2, 0);
+
+/**
+ * soup_xmlrpc_set_fault:
+ * @msg: an XML-RPC request
+ * @fault_code: the fault code
+ * @fault_format: a printf()-style format string
+ * @...: the parameters to @fault_format
+ *
+ * Sets the status code and response body of @msg to indicate an
+ * unsuccessful XML-RPC call, with the error described by @fault_code
+ * and @fault_format.
+ **/
+void
+soup_xmlrpc_set_fault (SoupMessage *msg, int fault_code,
+ const char *fault_format, ...)
+{
+ va_list args;
+ char *body;
+
+ va_start (args, fault_format);
+ body = soup_xmlrpc_build_faultv (fault_code, fault_format, args);
+ va_end (args);
+
+ soup_message_set_status (msg, SOUP_STATUS_OK);
+ soup_message_set_response (msg, "text/xml", SOUP_MEMORY_TAKE,
+ body, strlen (body));
+}
+
+
+
static gboolean
parse_value (xmlNode *xmlvalue, GValue *value)
{
diff --git a/libsoup/soup-xmlrpc.c b/libsoup/soup-xmlrpc.c
index bfa667d..f33c0a8 100644
--- a/libsoup/soup-xmlrpc.c
+++ b/libsoup/soup-xmlrpc.c
@@ -413,12 +413,12 @@ soup_xmlrpc_build_response (GVariant *value, GError **error)
return body;
}
-static char *
+char *
soup_xmlrpc_build_faultv (int fault_code,
const char *fault_format,
va_list args) G_GNUC_PRINTF (2, 0);
-static char *
+char *
soup_xmlrpc_build_faultv (int fault_code, const char *fault_format, va_list args)
{
xmlDoc *doc;
@@ -517,33 +517,6 @@ soup_xmlrpc_message_set_fault (SoupMessage *msg, int fault_code,
}
/**
- * soup_xmlrpc_set_fault:
- * @msg: an XML-RPC request
- * @fault_code: the fault code
- * @fault_format: a printf()-style format string
- * @...: the parameters to @fault_format
- *
- * Sets the status code and response body of @msg to indicate an
- * unsuccessful XML-RPC call, with the error described by @fault_code
- * and @fault_format.
- **/
-void
-soup_xmlrpc_set_fault (SoupMessage *msg, int fault_code,
- const char *fault_format, ...)
-{
- va_list args;
- char *body;
-
- va_start (args, fault_format);
- body = soup_xmlrpc_build_faultv (fault_code, fault_format, args);
- va_end (args);
-
- soup_message_set_status (msg, SOUP_STATUS_OK);
- soup_message_set_response (msg, "text/xml", SOUP_MEMORY_TAKE,
- body, strlen (body));
-}
-
-/**
* soup_xmlrpc_message_set_response:
* @msg: an XML-RPC request
* @value: a #GVariant
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]