[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 14:39:29 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9b17469a0cf2c0e95d0692b30127ee7ff92ad3d9
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 14 23:24:46 2010 +0000
2010-10-14 Sergio Villar Senin <svillar at igalia.com>
Reviewed by Martin Robinson.
[GTK] fix compilation warnings in imported libsoup code
https://bugs.webkit.org/show_bug.cgi?id=47674
Fixed some warnings caused by comparisons between signed and
unsigned integer expressions
* platform/network/soup/cache/soup-directory-input-stream.c:
(webkit_soup_directory_input_stream_read):
* platform/network/soup/cache/soup-request-data.c:
(webkit_soup_request_data_send):
* platform/network/soup/cache/soup-request-file.c:
(webkit_soup_request_file_ensure_file):
* platform/network/soup/cache/webkit/soup-cache.c:
(webkit_soup_cache_entry_is_fresh_enough):
(webkit_soup_cache_has_response):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69821 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d05f001..11e183f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-10-14 Sergio Villar Senin <svillar at igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] fix compilation warnings in imported libsoup code
+ https://bugs.webkit.org/show_bug.cgi?id=47674
+
+ Fixed some warnings caused by comparisons between signed and
+ unsigned integer expressions
+
+ * platform/network/soup/cache/soup-directory-input-stream.c:
+ (webkit_soup_directory_input_stream_read):
+ * platform/network/soup/cache/soup-request-data.c:
+ (webkit_soup_request_data_send):
+ * platform/network/soup/cache/soup-request-file.c:
+ (webkit_soup_request_file_ensure_file):
+ * platform/network/soup/cache/webkit/soup-cache.c:
+ (webkit_soup_cache_entry_is_fresh_enough):
+ (webkit_soup_cache_has_response):
+
2010-10-14 Andreas Kling <kling at webkit.org>
Unreviewed buildfix, RetainPtr is a mac thing..
diff --git a/WebCore/platform/network/soup/cache/soup-directory-input-stream.c b/WebCore/platform/network/soup/cache/soup-directory-input-stream.c
index bf16dbb..c14863b 100644
--- a/WebCore/platform/network/soup/cache/soup-directory-input-stream.c
+++ b/WebCore/platform/network/soup/cache/soup-directory-input-stream.c
@@ -109,7 +109,7 @@ webkit_soup_directory_input_stream_read (GInputStream *input,
GError **error)
{
WebKitSoupDirectoryInputStream *stream = WEBKIT_SOUP_DIRECTORY_INPUT_STREAM (input);
- gssize total, size;
+ gsize total, size;
for (total = 0; total < count; total += size) {
if (stream->buffer == NULL) {
diff --git a/WebCore/platform/network/soup/cache/soup-request-data.c b/WebCore/platform/network/soup/cache/soup-request-data.c
index 80e30f5..463fcef 100644
--- a/WebCore/platform/network/soup/cache/soup-request-data.c
+++ b/WebCore/platform/network/soup/cache/soup-request-data.c
@@ -79,7 +79,7 @@ webkit_soup_request_data_send (WebKitSoupRequest *request,
semi = memchr (uristr, ';', comma - uristr);
end = semi ? semi : comma;
- if (semi && !g_ascii_strncasecmp (semi, ";base64", MAX (comma - semi, strlen (";base64"))))
+ if (semi && !g_ascii_strncasecmp (semi, ";base64", MAX ((size_t) (comma - semi), strlen (";base64"))))
base64 = TRUE;
if (end != uristr)
diff --git a/WebCore/platform/network/soup/cache/soup-request-file.c b/WebCore/platform/network/soup/cache/soup-request-file.c
index 1203b9e..24ccb10 100644
--- a/WebCore/platform/network/soup/cache/soup-request-file.c
+++ b/WebCore/platform/network/soup/cache/soup-request-file.c
@@ -168,8 +168,7 @@ webkit_soup_request_file_ensure_file (WebKitSoupRequestFile *file,
* soup_uri_decode when the required libsoup version
* is bumped out to 2.32.1
*/
- gchar *uri_path = uri->path;
- gchar *decoded_uri = webkit_soup_request_uri_decoded_copy (uri_path, strlen (uri_path));
+ gchar *decoded_uri = webkit_soup_request_uri_decoded_copy (uri->path, strlen (uri->path));
if (decoded_uri) {
/* Do not use new_for_uri() as the decoded URI
diff --git a/WebCore/platform/network/soup/cache/webkit/soup-cache.c b/WebCore/platform/network/soup/cache/webkit/soup-cache.c
index a9446fe..b25c4cc 100644
--- a/WebCore/platform/network/soup/cache/webkit/soup-cache.c
+++ b/WebCore/platform/network/soup/cache/webkit/soup-cache.c
@@ -266,9 +266,9 @@ webkit_soup_cache_entry_get_current_age (WebKitSoupCacheEntry *entry)
}
static gboolean
-webkit_soup_cache_entry_is_fresh_enough (WebKitSoupCacheEntry *entry, int min_fresh)
+webkit_soup_cache_entry_is_fresh_enough (WebKitSoupCacheEntry *entry, gint min_fresh)
{
- unsigned limit = (min_fresh == -1) ? webkit_soup_cache_entry_get_current_age (entry) : min_fresh;
+ guint limit = (min_fresh == -1) ? webkit_soup_cache_entry_get_current_age (entry) : (guint) min_fresh;
return entry->freshness_lifetime > limit;
}
@@ -1344,7 +1344,7 @@ webkit_soup_cache_has_response (WebKitSoupCache *cache, SoupMessage *msg)
/* If we are over max-age and max-stale is not
set, do not use the value from the cache
without validation */
- if (max_age <= current_age && max_stale == -1)
+ if ((guint) max_age <= current_age && max_stale == -1)
return WEBKIT_SOUP_CACHE_RESPONSE_NEEDS_VALIDATION;
}
}
@@ -1363,7 +1363,7 @@ webkit_soup_cache_has_response (WebKitSoupCache *cache, SoupMessage *msg)
if (max_stale == G_MAXINT32)
return WEBKIT_SOUP_CACHE_RESPONSE_FRESH;
- if ((webkit_soup_cache_entry_get_current_age (entry) - entry->freshness_lifetime) <= max_stale)
+ if ((webkit_soup_cache_entry_get_current_age (entry) - entry->freshness_lifetime) <= (guint) max_stale)
return WEBKIT_SOUP_CACHE_RESPONSE_FRESH;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list