1
0
forked from aniani/vim

patch 8.1.0944: format of nbdbg() arguments is not checked

Problem:    Format of nbdbg() arguments is not checked.
Solution:   Add format attribute.  Fix reported problems. (Dominique Pelle,
            closes #3992)
This commit is contained in:
Bram Moolenaar
2019-02-17 19:12:21 +01:00
parent 749f07c0db
commit c85c8fcb9f
3 changed files with 12 additions and 6 deletions

View File

@@ -42,7 +42,11 @@ typedef enum {
} WtWait;
void nbdbg(char *, ...);
void nbdbg(char *, ...)
#ifdef USE_PRINTF_FORMAT_ATTRIBUTE
__attribute__((format(printf, 1, 2)))
#endif
;
void nbdebug_wait(u_int wait_flags, char *wait_var, u_int wait_secs);
void nbdebug_log_init(char *log_var, char *level_var);

View File

@@ -934,7 +934,7 @@ nb_partialremove(linenr_T lnum, colnr_T first, colnr_T last)
{
mch_memmove(newtext, oldtext, first);
STRMOVE(newtext + first, oldtext + lastbyte + 1);
nbdebug((" NEW LINE %d: %s\n", lnum, newtext));
nbdebug((" NEW LINE %ld: %s\n", lnum, newtext));
ml_replace(lnum, newtext, FALSE);
}
}
@@ -1166,7 +1166,7 @@ nb_do_cmd(
return FAIL;
}
first = *pos;
nbdebug((" FIRST POS: line %d, col %d\n",
nbdebug((" FIRST POS: line %ld, col %d\n",
first.lnum, first.col));
pos = off2pos(buf->bufp, off+count-1);
if (!pos)
@@ -1178,7 +1178,7 @@ nb_do_cmd(
return FAIL;
}
last = *pos;
nbdebug((" LAST POS: line %d, col %d\n",
nbdebug((" LAST POS: line %ld, col %d\n",
last.lnum, last.col));
del_from_lnum = first.lnum;
del_to_lnum = last.lnum;
@@ -1264,7 +1264,7 @@ nb_do_cmd(
}
}
nbdebug((" Deleting lines %d through %d\n",
nbdebug((" Deleting lines %ld through %ld\n",
del_from_lnum, del_to_lnum));
curwin->w_cursor.lnum = del_from_lnum;
curwin->w_cursor.col = 0;
@@ -1540,7 +1540,7 @@ nb_do_cmd(
{
if (!buf->bufp->b_netbeans_file)
{
nbdebug(("E658: NetBeans connection lost for buffer %ld\n", buf->bufp->b_fnum));
nbdebug(("E658: NetBeans connection lost for buffer %d\n", buf->bufp->b_fnum));
semsg(_("E658: NetBeans connection lost for buffer %d"),
buf->bufp->b_fnum);
}

View File

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