patch 9.0.1132: code is indented more than needed
Problem: Code is indented more than needed.
Solution: Use an early return to reduce indentation. (Yegappan Lakshmanan,
closes #11769)
diff --git a/src/clientserver.c b/src/clientserver.c
index ccb7238..2a091a6 100644
--- a/src/clientserver.c
+++ b/src/clientserver.c
@@ -191,38 +191,38 @@
void
exec_on_server(mparm_T *parmp)
{
- if (parmp->serverName_arg == NULL || *parmp->serverName_arg != NUL)
+ if (parmp->serverName_arg != NULL && *parmp->serverName_arg == NUL)
+ return;
+
+# ifdef MSWIN
+ // Initialise the client/server messaging infrastructure.
+ serverInitMessaging();
+# endif
+
+ /*
+ * When a command server argument was found, execute it. This may
+ * exit Vim when it was successful. Otherwise it's executed further
+ * on. Remember the encoding used here in "serverStrEnc".
+ */
+ if (parmp->serverArg)
{
-# ifdef MSWIN
- // Initialise the client/server messaging infrastructure.
- serverInitMessaging();
-# endif
-
- /*
- * When a command server argument was found, execute it. This may
- * exit Vim when it was successful. Otherwise it's executed further
- * on. Remember the encoding used here in "serverStrEnc".
- */
- if (parmp->serverArg)
- {
- cmdsrv_main(&parmp->argc, parmp->argv,
- parmp->serverName_arg, &parmp->serverStr);
- parmp->serverStrEnc = vim_strsave(p_enc);
- }
-
- // If we're still running, get the name to register ourselves.
- // On Win32 can register right now, for X11 need to setup the
- // clipboard first, it's further down.
- parmp->servername = serverMakeName(parmp->serverName_arg,
- parmp->argv[0]);
-# ifdef MSWIN
- if (parmp->servername != NULL)
- {
- serverSetName(parmp->servername);
- vim_free(parmp->servername);
- }
-# endif
+ cmdsrv_main(&parmp->argc, parmp->argv,
+ parmp->serverName_arg, &parmp->serverStr);
+ parmp->serverStrEnc = vim_strsave(p_enc);
}
+
+ // If we're still running, get the name to register ourselves.
+ // On Win32 can register right now, for X11 need to setup the
+ // clipboard first, it's further down.
+ parmp->servername = serverMakeName(parmp->serverName_arg,
+ parmp->argv[0]);
+# ifdef MSWIN
+ if (parmp->servername != NULL)
+ {
+ serverSetName(parmp->servername);
+ vim_free(parmp->servername);
+ }
+# endif
}
/*