adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.2.3561: cscope has a complicated way of giving an error message

Browse Source 
Problem:    Cscope has a complicated way of giving an error message.
Solution:   Use semsg(). (James McCoy, closes #9038)
This commit is contained in:
James McCoy
2021-10-24 14:50:07 +01:00
committed by Bram Moolenaar
parent 844fb64a60
commit 3c5904d2a5
2 changed files with 7 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/if_cscope.c
View File

@ -462,17 +462,8 @@ cs_add(exarg_T *eap UNUSED)
static void
cs_stat_emsg(char *fname)
{
char *stat_emsg = _("E563: stat(%s) error: %d");
char *buf = alloc(strlen(stat_emsg) + MAXPATHL + 10);
if (buf != NULL)
{
(void)sprintf(buf, stat_emsg, fname, errno);
(void)emsg(buf);
vim_free(buf);
}
else
(void)emsg(_("E563: stat error"));
int err = errno;
(void)semsg(_("E563: stat(%s) error: %d"), fname, err);
}
@ -1114,16 +1105,7 @@ cs_find_common(
// next symbol must be + or -
if (strchr(CSQF_FLAGS, *qfpos) == NULL)
{
char *nf = _("E469: invalid cscopequickfix flag %c for %c");
char *buf = alloc(strlen(nf));
// strlen will be enough because we use chars
if (buf != NULL)
{
sprintf(buf, nf, *qfpos, *(qfpos-1));
(void)emsg(buf);
vim_free(buf);
}
(void)semsg(_("E469: invalid cscopequickfix flag %c for %c"), *qfpos, *(qfpos - 1));
return FALSE;
}
@ -1177,24 +1159,8 @@ cs_find_common(
if (totmatches == 0)
{
char *nf = _("E259: no matches found for cscope query %s of %s");
char *buf;
if (!verbose)
{
vim_free(nummatches);
return FALSE;
}
buf = alloc(strlen(opt) + strlen(pat) + strlen(nf));
if (buf == NULL)
(void)emsg(nf);
else
{
sprintf(buf, nf, opt, pat);
(void)emsg(buf);
vim_free(buf);
}
if (verbose)
(void)semsg(_("E259: no matches found for cscope query %s of %s"), opt, pat);
vim_free(nummatches);
return FALSE;
}

2
src/version.c
View File

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