Mercurial > vim

comparison src/clientserver.c @ 31600:f1d5ad2b978e v9.0.1132

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1132: code is indented more than needed Commit: https://github.com/vim/vim/commit/dc4daa3a3915fba11ac87d27977240d9a5e0d47d Author: Yegappan Lakshmanan <yegappan@yahoo.com> Date: Mon Jan 2 16:54:53 2023 +0000 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)
author Bram Moolenaar <Bram@vim.org>
date Mon, 02 Jan 2023 18:00:04 +0100
parents fa309d9af73c
children b89cfd86e18e
comparison
equal deleted inserted replaced
31599:7eb3096f4493 31600:f1d5ad2b978e
189 * Do the client-server stuff, unless "--servername ''" was used. 189 * Do the client-server stuff, unless "--servername ''" was used.
190 */ 190 */
191 void 191 void
192 exec_on_server(mparm_T *parmp) 192 exec_on_server(mparm_T *parmp)
193 { 193 {
194 if (parmp->serverName_arg == NULL || *parmp->serverName_arg != NUL) 194 if (parmp->serverName_arg != NULL && *parmp->serverName_arg == NUL)
195 { 195 return;
196 # ifdef MSWIN 196
197 // Initialise the client/server messaging infrastructure. 197 # ifdef MSWIN
198 serverInitMessaging(); 198 // Initialise the client/server messaging infrastructure.
199 # endif 199 serverInitMessaging();
200 200 # endif
201 /* 201
202 * When a command server argument was found, execute it. This may 202 /*
203 * exit Vim when it was successful. Otherwise it's executed further 203 * When a command server argument was found, execute it. This may
204 * on. Remember the encoding used here in "serverStrEnc". 204 * exit Vim when it was successful. Otherwise it's executed further
205 */ 205 * on. Remember the encoding used here in "serverStrEnc".
206 if (parmp->serverArg) 206 */
207 { 207 if (parmp->serverArg)
208 cmdsrv_main(&parmp->argc, parmp->argv, 208 {
209 parmp->serverName_arg, &parmp->serverStr); 209 cmdsrv_main(&parmp->argc, parmp->argv,
210 parmp->serverStrEnc = vim_strsave(p_enc); 210 parmp->serverName_arg, &parmp->serverStr);
211 } 211 parmp->serverStrEnc = vim_strsave(p_enc);
212 212 }
213 // If we're still running, get the name to register ourselves. 213
214 // On Win32 can register right now, for X11 need to setup the 214 // If we're still running, get the name to register ourselves.
215 // clipboard first, it's further down. 215 // On Win32 can register right now, for X11 need to setup the
216 parmp->servername = serverMakeName(parmp->serverName_arg, 216 // clipboard first, it's further down.
217 parmp->argv[0]); 217 parmp->servername = serverMakeName(parmp->serverName_arg,
218 # ifdef MSWIN 218 parmp->argv[0]);
219 if (parmp->servername != NULL) 219 # ifdef MSWIN
220 { 220 if (parmp->servername != NULL)
221 serverSetName(parmp->servername); 221 {
222 vim_free(parmp->servername); 222 serverSetName(parmp->servername);
223 } 223 vim_free(parmp->servername);
224 # endif 224 }
225 } 225 # endif
226 } 226 }
227 227
228 /* 228 /*
229 * Prepare for running as a Vim server. 229 * Prepare for running as a Vim server.
230 */ 230 */