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

Problem:    Cscope has a complicated way of giving an error message.
Solution:   Use semsg(). (James McCoy, closes #9038)

diff --git a/src/if_cscope.c b/src/if_cscope.c
index 7117a253f7794f018e329a42f33cabadf2c417a1..d587587c4298f043ec6c3ec8efb9d8a6d21053c4 100644 (file)
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -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;
     }

diff --git a/src/version.c b/src/version.c
index a1714ebf9a4e69a66e9641a5188ac85d2785c49d..7dc55ac95a8b2de80b2a8e4a83bbbd57c132dad3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3561,
 /**/
     3560,
 /**/