aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 7.4.1302

Browse Source 
Problem:    Typo in struct field name. (Ken Takata)
Solution:   Rename jf_pi to jv_pi.
This commit is contained in:
Bram Moolenaar
2016-02-11 12:48:36 +01:00
parent 39b21272d5
commit 6119e6156e
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/eval.c
View File

@@ -21622,7 +21622,7 @@ get_tv_string_buf_chk(typval_T *varp, char_u *buf)
"process %ld %s", (long)job->jv_pid, status); "process %ld %s", (long)job->jv_pid, status);
# elif defined(WIN32) # elif defined(WIN32)
vim_snprintf((char *)buf, NUMBUFLEN, vim_snprintf((char *)buf, NUMBUFLEN,
"process %ld %s", (long)job->jf_pi.dwProcessId, "process %ld %s", (long)job->jv_pi.dwProcessId,
status); status);
# else # else
/* fall-back */ /* fall-back */

12
src/os_win32.c
View File

@@ -5050,7 +5050,7 @@ mch_start_job(char *cmd, job_T *job)
job->jv_status = JOB_FAILED; job->jv_status = JOB_FAILED;
else else
{ {
job->jf_pi = pi; job->jv_pi = pi;
job->jv_status = JOB_STARTED; job->jv_status = JOB_STARTED;
} }
} }
@@ -5060,12 +5060,12 @@ mch_job_status(job_T *job)
{ {
DWORD dwExitCode = 0; DWORD dwExitCode = 0;
if (!GetExitCodeProcess(job->jf_pi.hProcess, &dwExitCode)) if (!GetExitCodeProcess(job->jv_pi.hProcess, &dwExitCode))
return "dead"; return "dead";
if (dwExitCode != STILL_ACTIVE) if (dwExitCode != STILL_ACTIVE)
{ {
CloseHandle(job->jf_pi.hProcess); CloseHandle(job->jv_pi.hProcess);
CloseHandle(job->jf_pi.hThread); CloseHandle(job->jv_pi.hThread);
return "dead"; return "dead";
} }
return "run"; return "run";
@@ -5075,12 +5075,12 @@ mch_job_status(job_T *job)
mch_stop_job(job_T *job, char_u *how) mch_stop_job(job_T *job, char_u *how)
{ {
if (STRCMP(how, "kill") == 0) if (STRCMP(how, "kill") == 0)
TerminateProcess(job->jf_pi.hProcess, 0); TerminateProcess(job->jv_pi.hProcess, 0);
else else
return GenerateConsoleCtrlEvent( return GenerateConsoleCtrlEvent(
STRCMP(how, "hup") == 0 ? STRCMP(how, "hup") == 0 ?
CTRL_BREAK_EVENT : CTRL_C_EVENT, CTRL_BREAK_EVENT : CTRL_C_EVENT,
job->jf_pi.dwProcessId) ? OK : FAIL; job->jv_pi.dwProcessId) ? OK : FAIL;
return OK; return OK;
} }
#endif #endif

2
src/structs.h
View File

@@ -1249,7 +1249,7 @@ struct jobvar_S
int jv_exitval; int jv_exitval;
#endif #endif
#ifdef WIN32 #ifdef WIN32
PROCESS_INFORMATION jf_pi; PROCESS_INFORMATION jv_pi;
#endif #endif
jobstatus_T jv_status; jobstatus_T jv_status;

2
src/version.c
View File

@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1302,
/**/ /**/
1301, 1301,
/**/ /**/