Attachment 128230 Details for Bug 54828 – Fix minor style issue: whitespace

[patch] Fix minor style issue: whitespace

Fix-minor-style-issue-whitespace.patch (text/plain), 5.04 KB, created by Thomas Gläßle on 2016-11-27 21:40:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Gläßle

Created: 2016-11-27 21:40:33 UTC

Size: 5.04 KB

patch

obsolete

>From 7cc89d0a4a6585a8b0ddc58234756f8138523b4c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Thomas=20Gl=C3=A4=C3=9Fle?= <t_glaessle@gmx.de>
>Date: Sun, 27 Nov 2016 09:38:18 +0100
>Subject: [PATCH] Fix minor style issue: whitespace
>
>---
> src/tests/test.c           | 2 +-
> src/udisksdaemon.c         | 4 ++--
> src/udiskslinuxencrypted.c | 2 +-
> src/udisksspawnedjob.c     | 8 ++++----
> tools/udisksctl.c          | 5 +++--
> 5 files changed, 11 insertions(+), 10 deletions(-)
>
>diff --git a/src/tests/test.c b/src/tests/test.c
>index b303e75..4585627 100644
>--- a/src/tests/test.c
>+++ b/src/tests/test.c
>@@ -414,7 +414,7 @@ test_spawned_job_binary_input_string (void)
>   gchar *s;
>   GString *input;
> 
>-  input = g_string_new_len("\xaf\xfe\0\xaf\xfe", 5);
>+  input = g_string_new_len ("\xaf\xfe\0\xaf\xfe", 5);
>   s = g_strdup_printf (UDISKS_TEST_DIR "/udisks-test-helper 8");
>   job = udisks_spawned_job_new (s, input, getuid (), geteuid (), NULL, NULL);
>   _g_assert_signal_received (job, "spawned-job-completed", G_CALLBACK (binary_input_string_on_spawned_job_completed), NULL);
>diff --git a/src/udisksdaemon.c b/src/udisksdaemon.c
>index 3e1e60b..5d4b4f6 100644
>--- a/src/udisksdaemon.c
>+++ b/src/udisksdaemon.c
>@@ -670,7 +670,7 @@ udisks_daemon_launch_spawned_job (UDisksDaemon    *daemon,
>                                           "%s",
>                                           command_line);
> 
>-  udisks_string_wipe_and_free(input_string_as_gstring);
>+  udisks_string_wipe_and_free (input_string_as_gstring);
>   return job;
> }
> 
>@@ -850,7 +850,7 @@ udisks_daemon_launch_spawned_job_sync (UDisksDaemon    *daemon,
>                                           "%s",
>                                           command_line);
> 
>-  udisks_string_wipe_and_free(input_string_as_gstring);
>+  udisks_string_wipe_and_free (input_string_as_gstring);
>   return ret;
> }
> 
>diff --git a/src/udiskslinuxencrypted.c b/src/udiskslinuxencrypted.c
>index 3127adb..d4dcf8d 100644
>--- a/src/udiskslinuxencrypted.c
>+++ b/src/udiskslinuxencrypted.c
>@@ -461,7 +461,7 @@ handle_unlock (UDisksEncrypted        *encrypted,
>   g_clear_object (&cleartext_device);
>   g_clear_object (&cleartext_object);
>   g_clear_object (&object);
>-  udisks_string_wipe_and_free(effective_passphrase);
>+  udisks_string_wipe_and_free (effective_passphrase);
> 
>   return TRUE; /* returning TRUE means that we handled the method invocation */
> }
>diff --git a/src/udisksspawnedjob.c b/src/udisksspawnedjob.c
>index e289c0b..74f3ae4 100644
>--- a/src/udisksspawnedjob.c
>+++ b/src/udisksspawnedjob.c
>@@ -153,7 +153,7 @@ udisks_spawned_job_finalize (GObject *object)
>   g_free (job->command_line);
> 
>   if (job->input_string != NULL)
>-    g_boxed_free(autowipe_buffer_get_type(), (gpointer) job->input_string);
>+    g_boxed_free (autowipe_buffer_get_type (), (gpointer) job->input_string);
> 
>   if (G_OBJECT_CLASS (udisks_spawned_job_parent_class)->finalize != NULL)
>     G_OBJECT_CLASS (udisks_spawned_job_parent_class)->finalize (object);
>@@ -196,7 +196,7 @@ udisks_spawned_job_set_property (GObject      *object,
> 
>     case PROP_INPUT_STRING:
>       g_assert (job->input_string == NULL);
>-      job->input_string = (GString*) g_value_dup_boxed(value);
>+      job->input_string = (GString*) g_value_dup_boxed (value);
>       if (job->input_string != NULL)
>         {
>           job->input_string_cursor = job->input_string->str;
>@@ -615,7 +615,7 @@ udisks_spawned_job_class_init (UDisksSpawnedJobClass *klass)
>                                    g_param_spec_boxed  ("input-string",
>                                                         "Input String",
>                                                         "String to write to stdin of the spawned program",
>-                                                        autowipe_buffer_get_type(),
>+                                                        autowipe_buffer_get_type (),
>                                                         G_PARAM_WRITABLE |
>                                                         G_PARAM_CONSTRUCT_ONLY |
>                                                         G_PARAM_STATIC_STRINGS));
>@@ -1026,5 +1026,5 @@ static void
> autowipe_buffer_free (gpointer data)
> {
>   GString *string = (GString*) data;
>-  udisks_string_wipe_and_free(string);
>+  udisks_string_wipe_and_free (string);
> }
>diff --git a/tools/udisksctl.c b/tools/udisksctl.c
>index a2738d1..284f322 100644
>--- a/tools/udisksctl.c
>+++ b/tools/udisksctl.c
>@@ -1067,7 +1067,8 @@ static const GOptionEntry command_lock_entries[] =
> };
> 
> static GVariant*
>-pack_binary_blob(const gchar* data, gsize size)
>+pack_binary_blob (const gchar *data,
>+                  gsize        size)
> {
>   GVariantBuilder builder;
> 
>@@ -1283,7 +1284,7 @@ handle_command_unlock_lock (gint        *argc,
>       g_variant_builder_add (&builder,
>                              "{sv}",
>                              "keyfile_contents",
>-                             pack_binary_blob(keyfile_contents, keyfile_size));
>+                             pack_binary_blob (keyfile_contents, keyfile_size));
>     }
>   options = g_variant_builder_end (&builder);
>   g_variant_ref_sink (options);
>-- 
>2.10.2

Actions: View | Splinter Review

Attachments on bug 54828: 128116 | 128117 | 128118 | 128119 | 128120 | 128121 | 128122 | 128123 | 128139 | 128228 | 128229 | 128230 | 128231

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.