philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use strlcat, rather than strmcat, in fix_status_buffer(). Remove unused

Browse Source 
blocks of ifdeffed out code.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@412 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Tim Cava
2013-10-26 02:20:19 +00:00
parent 95235006ab
commit 26e070565e
1 changed files with 1 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
source/status.c
View File

@@ -528,17 +528,6 @@ int in_rhs = 0,
(*ptr == ALL_OFF) || (*ptr == BOLD_TOG) || (*ptr == ALL_OFF) || (*ptr == BOLD_TOG) ||
(*ptr == BLINK_TOG)) (*ptr == BLINK_TOG))
*cp++ = *ptr++; *cp++ = *ptr++;
#if 0
else if (*ptr == 9) /* TAB */
{
fillchar[0] = ' ';
fillchar[1] = 0;
do
*cp++ = ' ';
while (++(*prc) % 8);
ptr++;
}
#endif
/* /*
* So it is a printable character. * So it is a printable character.
* Or maybe its a tab. ;-) * Or maybe its a tab. ;-)
@@ -559,40 +548,8 @@ int in_rhs = 0,
} }
} }
*cp = 0; *cp = 0;
#if 0
/* What will we be filling with? */
if (get_int_var(STATUS_NO_REPEAT_VAR))
{
lhs_fillchar[0] = ' ';
lhs_fillchar[1] = 0;
rhs_fillchar[0] = ' ';
rhs_fillchar[1] = 0;
}
/*
* Now if we have a rhs, then we have to adjust it.
*/
if (start_rhs)
{
int numf = 0;
numf = win->screen->co - pr_lhs - pr_rhs -1;
while (numf-- >= 0)
strmcat(lhs_buffer, lhs_fillchar,
BIG_BUFFER_SIZE);
}
/*
* No rhs? If the user wants us to pad it out, do so.
*/
else if (get_int_var(FULL_STATUS_LINE_VAR))
{
int chars = win->screen->co - pr_lhs - 1;
while (chars-- >= 0)
strmcat(lhs_buffer, lhs_fillchar,
BIG_BUFFER_SIZE);
}
#endif
strcpy(buffer, lhs_buffer); strcpy(buffer, lhs_buffer);
strmcat(buffer, rhs_buffer, BIG_BUFFER_SIZE); strlcat(buffer, rhs_buffer, sizeof buffer);
new_free(&str); new_free(&str);
} }