From owner-svn-src-projects@FreeBSD.ORG Wed Sep 7 00:16:37 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00D7D106566B; Wed, 7 Sep 2011 00:16:37 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E44128FC18; Wed, 7 Sep 2011 00:16:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p870GaEE007266; Wed, 7 Sep 2011 00:16:36 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p870GaZN007263; Wed, 7 Sep 2011 00:16:36 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201109070016.p870GaZN007263@svn.freebsd.org> From: Xin LI Date: Wed, 7 Sep 2011 00:16:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225427 - projects/zfsd/head/cddl/sbin/zfsd X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Sep 2011 00:16:37 -0000 Author: delphij Date: Wed Sep 7 00:16:36 2011 New Revision: 225427 URL: http://svn.freebsd.org/changeset/base/225427 Log: Use %s as format string when calling syslog(). Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Tue Sep 6 17:22:40 2011 (r225426) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Wed Sep 7 00:16:36 2011 (r225427) @@ -101,7 +101,7 @@ ParseException::Log(const string &parsed if (Type() == DISCARDED_EVENT_TYPE) priority = LOG_INFO; - syslog(priority, ToString(parsedBuffer).c_str()); + syslog(priority, "%s", ToString(parsedBuffer).c_str()); } /*-------------------------------- DevCtlEvent -------------------------------*/ @@ -236,7 +236,7 @@ DevCtlEvent::Print() const void DevCtlEvent::Log(int priority) const { - syslog(priority, ToString().c_str()); + syslog(priority, "%s", ToString().c_str()); } //- DevCtlEvent Virtual Public Methods ----------------------------------------- Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.cc Tue Sep 6 17:22:40 2011 (r225426) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd_exception.cc Wed Sep 7 00:16:36 2011 (r225427) @@ -152,6 +152,6 @@ ZfsdException::Log() const } output << m_log << endl; - syslog(LOG_ERR, output.str().c_str()); + syslog(LOG_ERR, "%s", output.str().c_str()); }