Module Name:    src
Committed By:   bouyer
Date:           Sat Nov 28 16:03:26 UTC 2009

Modified Files:
        src/dist/nvi/ex [netbsd-5]: ex_cscope.c ex_tag.c

Log Message:
Pull up following revision(s) (requested by tnozaki in ticket #1159):
        dist/nvi/ex/ex_cscope.c: revision 1.5
        dist/nvi/ex/ex_tag.c: revision 1.7
don't use pathname directly as msgq()'s first argument of format string.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2.6.2 -r1.1.1.2.6.3 src/dist/nvi/ex/ex_cscope.c
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/dist/nvi/ex/ex_tag.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/dist/nvi/ex/ex_cscope.c
diff -u src/dist/nvi/ex/ex_cscope.c:1.1.1.2.6.2 src/dist/nvi/ex/ex_cscope.c:1.1.1.2.6.3
--- src/dist/nvi/ex/ex_cscope.c:1.1.1.2.6.2	Tue Jan 20 02:47:43 2009
+++ src/dist/nvi/ex/ex_cscope.c	Sat Nov 28 16:03:26 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ex_cscope.c,v 1.1.1.2.6.2 2009/01/20 02:47:43 snj Exp $ */
+/*	$NetBSD: ex_cscope.c,v 1.1.1.2.6.3 2009/11/28 16:03:26 bouyer Exp $ */
 
 /*-
  * Copyright (c) 1994, 1996
@@ -242,14 +242,14 @@
 	 * name regardless so that we can use it as a base for searches.
 	 */
 	if (stat(np, &sb)) {
-		msgq(sp, M_SYSERR, np);
+		msgq(sp, M_SYSERR, "%s", np);
 		return (1);
 	}
 	if (S_ISDIR(sb.st_mode)) {
 		(void)snprintf(path, sizeof(path),
 		    "%s/%s", np, CSCOPE_DBFILE);
 		if (stat(path, &sb)) {
-			msgq(sp, M_SYSERR, path);
+			msgq(sp, M_SYSERR, "%s", path);
 			return (1);
 		}
 		dbname = CSCOPE_DBFILE;

Index: src/dist/nvi/ex/ex_tag.c
diff -u src/dist/nvi/ex/ex_tag.c:1.3.2.2 src/dist/nvi/ex/ex_tag.c:1.3.2.3
--- src/dist/nvi/ex/ex_tag.c:1.3.2.2	Tue Jan 20 02:47:43 2009
+++ src/dist/nvi/ex/ex_tag.c	Sat Nov 28 16:03:26 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ex_tag.c,v 1.3.2.2 2009/01/20 02:47:43 snj Exp $ */
+/*	$NetBSD: ex_tag.c,v 1.3.2.3 2009/11/28 16:03:26 bouyer Exp $ */
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -244,7 +244,7 @@
 	if (tqp->current->msg) {
 	    INT2CHAR(sp, tqp->current->msg, tqp->current->mlen + 1,
 		     np, nlen);
-	    msgq(sp, M_INFO, np);
+	    msgq(sp, M_INFO, "%s", np);
 	}
 	return (0);
 }
@@ -820,7 +820,7 @@
 	if (tqp->current->msg) {
 	    INT2CHAR(sp, tqp->current->msg, tqp->current->mlen + 1,
 		     np, nlen);
-	    msgq(sp, M_INFO, np);
+	    msgq(sp, M_INFO, "%s", np);
 	}
 
 	/*

Reply via email to