summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2008-03-29 19:51:05 +0000
committerDan Winship <danw@src.gnome.org>2008-03-29 19:51:05 +0000
commit4b7d4b0a47c007fbbb3478e1b1619890ed1b545f (patch)
treea54d3898ab3920dbe3ad43846e3c4991813f965b
parentad93d598af6d605500ce42c8566dae509b17503a (diff)
downloadlibsoup-4b7d4b0a47c007fbbb3478e1b1619890ed1b545f.tar.gz
de-constify msg->reason_phrase; it's no more const than any other struct
* libsoup/soup-message.h (SoupMessage): de-constify msg->reason_phrase; it's no more const than any other struct field. * libsoup/soup-message.c (finalize) (soup_message_cleanup_response, soup_message_set_status) (soup_message_set_status_full): don't need to cast reason_phase to non-const when freeing it now * libsoup/soup-message-client-io.c (parse_response_headers): Likewise, remove reason-phrase non-const casts svn path=/trunk/; revision=1118
-rw-r--r--ChangeLog14
-rw-r--r--libsoup/soup-message-client-io.c4
-rw-r--r--libsoup/soup-message.c8
-rw-r--r--libsoup/soup-message.h2
4 files changed, 21 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 566a05e5..02f450a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
2008-03-29 Dan Winship <danw@gnome.org>
+ * libsoup/soup-message.h (SoupMessage): de-constify
+ msg->reason_phrase; it's no more const than any other struct
+ field.
+
+ * libsoup/soup-message.c (finalize)
+ (soup_message_cleanup_response, soup_message_set_status)
+ (soup_message_set_status_full): don't need to cast reason_phase to
+ non-const when freeing it now
+
+ * libsoup/soup-message-client-io.c (parse_response_headers):
+ Likewise, remove reason-phrase non-const casts
+
+2008-03-29 Dan Winship <danw@gnome.org>
+
* libsoup/soup-date.c (parse_day): fix the test for no-day-parsed
(parse_year): likewise fix the test for no-year-parsed
(parse_time): don't accept empty components here
diff --git a/libsoup/soup-message-client-io.c b/libsoup/soup-message-client-io.c
index 4906f64f..777ca083 100644
--- a/libsoup/soup-message-client-io.c
+++ b/libsoup/soup-message-client-io.c
@@ -26,13 +26,13 @@ parse_response_headers (SoupMessage *req,
SoupMessagePrivate *priv = SOUP_MESSAGE_GET_PRIVATE (req);
SoupHTTPVersion version;
- g_free((char*)req->reason_phrase);
+ g_free(req->reason_phrase);
req->reason_phrase = NULL;
if (!soup_headers_parse_response (headers, headers_len,
req->response_headers,
&version,
&req->status_code,
- (char **) &req->reason_phrase))
+ &req->reason_phrase))
return SOUP_STATUS_MALFORMED;
g_object_notify (G_OBJECT (req), SOUP_MESSAGE_STATUS_CODE);
diff --git a/libsoup/soup-message.c b/libsoup/soup-message.c
index 8c0676a7..541cc4b6 100644
--- a/libsoup/soup-message.c
+++ b/libsoup/soup-message.c
@@ -149,7 +149,7 @@ finalize (GObject *object)
soup_message_body_free (msg->response_body);
soup_message_headers_free (msg->response_headers);
- g_free ((char *) msg->reason_phrase);
+ g_free (msg->reason_phrase);
G_OBJECT_CLASS (soup_message_parent_class)->finalize (object);
}
@@ -1039,7 +1039,7 @@ soup_message_cleanup_response (SoupMessage *req)
req->status_code = SOUP_STATUS_NONE;
if (req->reason_phrase) {
- g_free ((char *) req->reason_phrase);
+ g_free (req->reason_phrase);
req->reason_phrase = NULL;
}
priv->http_version = priv->orig_http_version;
@@ -1246,7 +1246,7 @@ soup_message_set_status (SoupMessage *msg, guint status_code)
g_return_if_fail (SOUP_IS_MESSAGE (msg));
g_return_if_fail (status_code != 0);
- g_free ((char *) msg->reason_phrase);
+ g_free (msg->reason_phrase);
msg->status_code = status_code;
msg->reason_phrase = g_strdup (soup_status_get_phrase (status_code));
@@ -1271,7 +1271,7 @@ soup_message_set_status_full (SoupMessage *msg,
g_return_if_fail (status_code != 0);
g_return_if_fail (reason_phrase != NULL);
- g_free ((char *) msg->reason_phrase);
+ g_free (msg->reason_phrase);
msg->status_code = status_code;
msg->reason_phrase = g_strdup (reason_phrase);
diff --git a/libsoup/soup-message.h b/libsoup/soup-message.h
index 8045b337..002067d4 100644
--- a/libsoup/soup-message.h
+++ b/libsoup/soup-message.h
@@ -27,7 +27,7 @@ struct _SoupMessage {
const char *method;
guint status_code;
- const char *reason_phrase;
+ char *reason_phrase;
SoupMessageBody *request_body;
SoupMessageHeaders *request_headers;