Attachment 51639 Details for Bug 41219 – corrupt test: compile successfully against older GLib (Debian stable)

[patch] corrupt test: compile successfully against older GLib (Debian stable)

0001-corrupt-test-compile-successfully-against-older-GLib.patch (text/plain), 3.39 KB, created by Simon McVittie on 2011-09-26 10:14:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-09-26 10:14:24 UTC

Size: 3.39 KB

patch

obsolete

>From c71d6c1ef68f83356ba0dc36d5115a3b38ead557 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 15 Sep 2011 18:27:27 +0100
>Subject: [PATCH] corrupt test: compile successfully against older GLib
> (Debian stable)
>
>We don't really need g_socket_send_with_blocking here.
>
>Also, don't leak the GLib socket objects.
>---
> test/corrupt.c |   60 ++++++++++++++++++++++++++++++++++---------------------
> 1 files changed, 37 insertions(+), 23 deletions(-)
>
>diff --git a/test/corrupt.c b/test/corrupt.c
>index ef9951a..0249590 100644
>--- a/test/corrupt.c
>+++ b/test/corrupt.c
>@@ -160,6 +160,38 @@ test_message (Fixture *f,
>   dbus_message_unref (outgoing);
> }
> 
>+static void
>+send_n_bytes (GSocket *socket,
>+              const gchar *blob,
>+              gssize blob_len)
>+{
>+  gssize len, total_sent;
>+  GError *gerror = NULL;
>+
>+  total_sent = 0;
>+
>+  while (total_sent < blob_len)
>+    {
>+      len = g_socket_send (socket,
>+                           blob + total_sent,
>+                           blob_len - total_sent,
>+                           NULL, &gerror);
>+
>+      /* this is NULL-safe: a NULL error does not match */
>+      if (g_error_matches (gerror, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK))
>+        {
>+          /* we could wait for G_IO_OUT, but life's too short; just sleep */
>+          g_clear_error (&gerror);
>+          g_usleep (G_USEC_PER_SEC / 10);
>+          continue;
>+        }
>+
>+      g_assert_no_error (gerror);
>+      g_assert (len >= 0);
>+      total_sent += len;
>+    }
>+}
>+
> /* Enough bytes for it to be obvious that this connection is broken */
> #define CORRUPT_LEN 1024
> 
>@@ -174,7 +206,6 @@ test_corrupt (Fixture *f,
>   GSocket *socket;
>   GError *gerror = NULL;
>   int fd;
>-  gssize len, total_sent;
>   DBusMessage *incoming;
> 
>   test_message (f, addr);
>@@ -191,17 +222,7 @@ test_corrupt (Fixture *f,
>   g_assert_no_error (gerror);
>   g_assert (socket != NULL);
> 
>-  total_sent = 0;
>-
>-  while (total_sent < CORRUPT_LEN)
>-    {
>-      len = g_socket_send_with_blocking (socket,
>-          not_a_dbus_message + total_sent, CORRUPT_LEN - total_sent,
>-          TRUE, NULL, &gerror);
>-      g_assert_no_error (gerror);
>-      g_assert (len >= 0);
>-      total_sent += len;
>-    }
>+  send_n_bytes (socket, not_a_dbus_message, CORRUPT_LEN);
> 
>   /* Now spin on the client connection: the server just sent it complete
>    * rubbish, so it should disconnect */
>@@ -225,6 +246,7 @@ test_corrupt (Fixture *f,
>       "/org/freedesktop/DBus/Local");
> 
>   dbus_message_unref (incoming);
>+  g_object_unref (socket);
> }
> 
> static void
>@@ -237,7 +259,7 @@ test_byte_order (Fixture *f,
>   char *blob;
>   const gchar *arg = not_a_dbus_message;
>   const gchar * const *args = &arg;
>-  int blob_len, len, total_sent;
>+  int blob_len;
>   DBusMessage *message;
>   dbus_bool_t mem;
> 
>@@ -277,16 +299,7 @@ test_byte_order (Fixture *f,
>   g_assert_no_error (gerror);
>   g_assert (socket != NULL);
> 
>-  total_sent = 0;
>-
>-  while (total_sent < blob_len)
>-    {
>-      len = g_socket_send_with_blocking (socket, blob + total_sent,
>-          blob_len - total_sent, TRUE, NULL, &gerror);
>-      g_assert_no_error (gerror);
>-      g_assert (len >= 0);
>-      total_sent += len;
>-    }
>+  send_n_bytes (socket, blob, blob_len);
> 
>   dbus_free (blob);
> 
>@@ -312,6 +325,7 @@ test_byte_order (Fixture *f,
>       "/org/freedesktop/DBus/Local");
> 
>   dbus_message_unref (message);
>+  g_object_unref (socket);
> }
> 
> static void
>-- 
>1.7.6.3
>

Actions: View | Splinter Review

Attachments on bug 41219: 51639

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.