diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-06-22 06:28:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-06-22 06:28:58 +0200 |
| commit | f506c5bb1c0c191511316b4b9b2e9a5af176d446 (patch) | |
| tree | b01e3afaefbe7db1a7ce9052d68396225053a190 /src/netbeans.c | |
| parent | 7cfea75ed6897c81dc129490dd894b1ddeebf433 (diff) | |
| download | vim-git-f506c5bb1c0c191511316b4b9b2e9a5af176d446.tar.gz | |
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
of int.
Diffstat (limited to 'src/netbeans.c')
| -rw-r--r-- | src/netbeans.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/netbeans.c b/src/netbeans.c index ff191d7d2..e674fd822 100644 --- a/src/netbeans.c +++ b/src/netbeans.c @@ -195,7 +195,7 @@ netbeans_close(void) #define NB_DEF_PASS "changeme" static int -netbeans_connect(char *params, int abort) +netbeans_connect(char *params, int doabort) { #ifdef INET_SOCKETS struct sockaddr_in server; @@ -366,7 +366,7 @@ netbeans_connect(char *params, int abort) { nbdebug(("retrying...\n")); sleep(5); - if (!abort) + if (!doabort) { ui_breakcheck(); if (got_int) @@ -388,7 +388,7 @@ netbeans_connect(char *params, int abort) /* Get here when the server can't be found. */ nbdebug(("Cannot connect to Netbeans #2\n")); PERROR(_("Cannot connect to Netbeans #2")); - if (abort) + if (doabort) getout(1); goto theend; } @@ -398,7 +398,7 @@ netbeans_connect(char *params, int abort) { nbdebug(("Cannot connect to Netbeans\n")); PERROR(_("Cannot connect to Netbeans")); - if (abort) + if (doabort) getout(1); goto theend; } @@ -2967,7 +2967,7 @@ netbeans_gui_register(void) * Tell netbeans that the window was opened, ready for commands. */ void -netbeans_open(char *params, int abort) +netbeans_open(char *params, int doabort) { char *cmd = "0:startupDone=0\n"; @@ -2977,7 +2977,7 @@ netbeans_open(char *params, int abort) return; } - if (netbeans_connect(params, abort) != OK) + if (netbeans_connect(params, doabort) != OK) return; #ifdef FEAT_GUI netbeans_gui_register(); |