thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.4945: inconsistent use of white space

Browse Source 
Problem:    Inconsistent use of white space.
Solution:   Use Tabs and Spaces consistently.
This commit is contained in:
Bram Moolenaar
2022-05-12 20:35:35 +01:00
parent 3f32a5f160
commit 9f1983de4e
7 changed files with 68 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/os_amiga.c
View File

@@ -677,8 +677,8 @@ mch_get_user_name(char_u *s, int len)
if (pwd != NULL && pwd->pw_name && len > 0)
{
vim_strncpy(s, (char_u *)pwd->pw_name, len - 1);
return OK;
vim_strncpy(s, (char_u *)pwd->pw_name, len - 1);
return OK;
}
#endif
*s = NUL;
@@ -897,17 +897,17 @@ mch_can_exe(char_u *name, char_u **path UNUSED, int use_path)
BPTR seg = LoadSeg(name);
if (seg && GetSegListInfoTags(seg, GSLI_Native, NULL, TAG_DONE) !=
GetSegListInfoTags(seg, GSLI_68KHUNK, NULL, TAG_DONE))
GetSegListInfoTags(seg, GSLI_68KHUNK, NULL, TAG_DONE))
{
// Test if file permissions allow execution.
struct ExamineData *exd = ExamineObjectTags(EX_StringNameInput, name);
// Test if file permissions allow execution.
struct ExamineData *exd = ExamineObjectTags(EX_StringNameInput, name);
exe = (exd && !(exd->Protection & EXDF_NO_EXECUTE)) ? 1 : 0;
FreeDosObject(DOS_EXAMINEDATA, exd);
exe = (exd && !(exd->Protection & EXDF_NO_EXECUTE)) ? 1 : 0;
FreeDosObject(DOS_EXAMINEDATA, exd);
}
else
{
exe = 0;
exe = 0;
}
UnLoadSeg(seg);
@@ -915,21 +915,21 @@ mch_can_exe(char_u *name, char_u **path UNUSED, int use_path)
// Search for executable in path if applicable.
if (!exe && use_path)
{
// Save current working dir.
BPTR cwd = GetCurrentDir();
struct PathNode *head = DupCmdPathList(NULL);
// Save current working dir.
BPTR cwd = GetCurrentDir();
struct PathNode *head = DupCmdPathList(NULL);
// For each entry, recur to check for executable.
for(struct PathNode *tail = head; !exe && tail;
tail = (struct PathNode *) BADDR(tail->pn_Next))
{
SetCurrentDir(tail->pn_Lock);
exe = mch_can_exe(name, path, 0);
}
// For each entry, recur to check for executable.
for(struct PathNode *tail = head; !exe && tail;
tail = (struct PathNode *) BADDR(tail->pn_Next))
{
SetCurrentDir(tail->pn_Lock);
exe = mch_can_exe(name, path, 0);
}
// Go back to where we were.
FreeCmdPathList(head);
SetCurrentDir(cwd);
// Go back to where we were.
FreeCmdPathList(head);
SetCurrentDir(cwd);
}
#endif
return exe;
@@ -1052,38 +1052,38 @@ mch_settmode(tmode_T tmode)
mch_get_shellsize(void)
{
if (!term_console)
return FAIL;
return FAIL;
if (raw_in && raw_out)
{
// Save current console mode.
int old_tmode = cur_tmode;
char ctrl[] = "\x9b""0 q";
// Save current console mode.
int old_tmode = cur_tmode;
char ctrl[] = "\x9b""0 q";
// Set RAW mode.
mch_settmode(TMODE_RAW);
// Set RAW mode.
mch_settmode(TMODE_RAW);
// Write control sequence to console.
if (Write(raw_out, ctrl, sizeof(ctrl)) == sizeof(ctrl))
{
char scan[] = "\x9b""1;1;%d;%d r",
answ[sizeof(scan) + 8] = { '\0' };
// Write control sequence to console.
if (Write(raw_out, ctrl, sizeof(ctrl)) == sizeof(ctrl))
{
char scan[] = "\x9b""1;1;%d;%d r",
answ[sizeof(scan) + 8] = { '\0' };
// Read return sequence from input.
if (Read(raw_in, answ, sizeof(answ) - 1) > 0)
{
// Parse result and set Vim globals.
if (sscanf(answ, scan, &Rows, &Columns) == 2)
{
// Restore console mode.
mch_settmode(old_tmode);
return OK;
}
}
}
// Read return sequence from input.
if (Read(raw_in, answ, sizeof(answ) - 1) > 0)
{
// Parse result and set Vim globals.
if (sscanf(answ, scan, &Rows, &Columns) == 2)
{
// Restore console mode.
mch_settmode(old_tmode);
return OK;
}
}
}
// Restore console mode.
mch_settmode(old_tmode);
// Restore console mode.
mch_settmode(old_tmode);
}
// I/O error. Default size fallback.