Attachment 81467 Details for Bug 66068 – [PATCH v2 1/4] dbus-launch: fix coding style

[patch] [PATCH v2 1/4] dbus-launch: fix coding style

0001-dbus-launch-fix-coding-style.patch (text/plain), 2.06 KB, created by Chengwei Yang on 2013-06-26 12:38:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chengwei Yang

Created: 2013-06-26 12:38:17 UTC

Size: 2.06 KB

patch

obsolete

>From 0812627fcd5b30cc82558855b52c6e630ff319b7 Mon Sep 17 00:00:00 2001
>From: Chengwei Yang <chengwei.yang@intel.com>
>Date: Wed, 26 Jun 2013 20:26:37 +0800
>Subject: [PATCH v2 1/4] dbus-launch: fix coding style
>
>Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
>---
> tools/dbus-launch.c |   34 +++++++++++++++++-----------------
> 1 file changed, 17 insertions(+), 17 deletions(-)
>
>diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
>index 632a004..86d325f 100644
>--- a/tools/dbus-launch.c
>+++ b/tools/dbus-launch.c
>@@ -756,31 +756,31 @@ pass_info (const char *runprog, const char *bus_address, pid_t bus_pid,
>       if (envvar == NULL || args == NULL)
>         goto oom;
> 
>-     args[0] = xstrdup (runprog);
>+      args[0] = xstrdup (runprog);
>       if (!args[0])
>         goto oom;
>-     for (i = 1; i <= (argc-remaining_args); i++)
>-      {
>-        size_t len = strlen (argv[remaining_args+i-1])+1;
>-        args[i] = malloc (len);
>-        if (!args[i])
>-          goto oom;
>-        strncpy (args[i], argv[remaining_args+i-1], len);
>-       }
>-     args[i] = NULL;
>+      for (i = 1; i <= (argc-remaining_args); i++)
>+        {
>+          size_t len = strlen (argv[remaining_args+i-1])+1;
>+          args[i] = malloc (len);
>+          if (!args[i])
>+            goto oom;
>+          strncpy (args[i], argv[remaining_args+i-1], len);
>+        }
>+      args[i] = NULL;
> 
>-     strcpy (envvar, "DBUS_SESSION_BUS_ADDRESS=");
>-     strcat (envvar, bus_address);
>-     putenv (envvar);
>+      strcpy (envvar, "DBUS_SESSION_BUS_ADDRESS=");
>+      strcat (envvar, bus_address);
>+      putenv (envvar);
> 
>-     execvp (runprog, args);
>-     fprintf (stderr, "Couldn't exec %s: %s\n", runprog, strerror (errno));
>-     exit (1);
>+      execvp (runprog, args);
>+      fprintf (stderr, "Couldn't exec %s: %s\n", runprog, strerror (errno));
>+      exit (1);
>     }
>    else
>     {
>       print_variables (bus_address, bus_pid, bus_wid, c_shell_syntax,
>-         bourne_shell_syntax, binary_syntax);
>+          bourne_shell_syntax, binary_syntax);
>     }
>   verbose ("dbus-launch exiting\n");
> 
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 66068: 81246 | 81247 | 81248 | 81249 | 81250 | 81467 | 81468 | 81470 | 81471 | 81519

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.