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)

diff --git a/src/nbdebug.h b/src/nbdebug.h
index 6331f49c3ac410a675b31cc3d5136a3b01dda88d..16dd84798907e37f8182db40871f11b6e1a1af67 100644 (file)
--- a/src/nbdebug.h
+++ b/src/nbdebug.h
@@ -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);

diff --git a/src/netbeans.c b/src/netbeans.c
index 2682d1c0b6a3641f6860ff74c0fc0dbe8de7d458..e49797a3228f7530618459ec5418272cf1223b94 100644 (file)
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -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);
                }

diff --git a/src/version.c b/src/version.c
index a59e18565ad9888534cfa3ea419cbcffbe4c965f..b3244c168b40c4aa20d7e8e122d438a9c789a611 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -779,6 +779,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    944,
 /**/
     943,
 /**/