From owner-svn-src-all@freebsd.org Sun May 29 00:40:30 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A6AB0B4FAAF; Sun, 29 May 2016 00:40:30 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5B2181DCB; Sun, 29 May 2016 00:40:30 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4T0eTkD071867; Sun, 29 May 2016 00:40:29 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4T0eTv7071865; Sun, 29 May 2016 00:40:29 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201605290040.u4T0eTv7071865@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sun, 29 May 2016 00:40:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300919 - in head: cddl/usr.sbin/zfsd sys/cddl/contrib/opensolaris/uts/common/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 May 2016 00:40:30 -0000 Author: bdrewery Date: Sun May 29 00:40:29 2016 New Revision: 300919 URL: https://svnweb.freebsd.org/changeset/base/300919 Log: Avoid more literal-suffix errors with C++11 Modified: head/cddl/usr.sbin/zfsd/case_file.cc head/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h Modified: head/cddl/usr.sbin/zfsd/case_file.cc ============================================================================== --- head/cddl/usr.sbin/zfsd/case_file.cc Sun May 29 00:10:23 2016 (r300918) +++ head/cddl/usr.sbin/zfsd/case_file.cc Sun May 29 00:40:29 2016 (r300919) @@ -455,7 +455,7 @@ CaseFile::ActivateSpare() { zpool_handle_t *zhp(zpl.empty() ? NULL : zpl.front()); if (zhp == NULL) { syslog(LOG_ERR, "CaseFile::ActivateSpare: Could not find pool " - "for pool_guid %"PRIu64".", (uint64_t)m_poolGUID); + "for pool_guid %" PRIu64".", (uint64_t)m_poolGUID); return (false); } poolname = zpool_get_name(zhp); @@ -639,7 +639,7 @@ CaseFile::DeSerializeSelector(const stru uint64_t vdevGUID; if (dirEntry->d_type == DT_REG - && sscanf(dirEntry->d_name, "pool_%"PRIu64"_vdev_%"PRIu64".case", + && sscanf(dirEntry->d_name, "pool_%" PRIu64 "_vdev_%" PRIu64 ".case", &poolGUID, &vdevGUID) == 2) return (1); return (0); @@ -657,7 +657,7 @@ CaseFile::DeSerializeFile(const char *fi uint64_t vdevGUID; nvlist_t *vdevConf; - sscanf(fileName, "pool_%"PRIu64"_vdev_%"PRIu64".case", + sscanf(fileName, "pool_%" PRIu64 "_vdev_%" PRIu64 ".case", &poolGUID, &vdevGUID); existingCaseFile = Find(Guid(poolGUID), Guid(vdevGUID)); if (existingCaseFile != NULL) { @@ -999,7 +999,7 @@ CaseFile::Replace(const char* vdev_type, zpool_handle_t *zhp(zpl.empty() ? NULL : zpl.front()); if (zhp == NULL) { syslog(LOG_ERR, "CaseFile::Replace: could not find pool for " - "pool_guid %"PRIu64".", (uint64_t)m_poolGUID); + "pool_guid %" PRIu64 ".", (uint64_t)m_poolGUID); return (false); } poolname = zpool_get_name(zhp); Modified: head/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h Sun May 29 00:10:23 2016 (r300918) +++ head/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h Sun May 29 00:40:29 2016 (r300919) @@ -76,8 +76,8 @@ extern "C" { #define SUNW_VENDOR "SUNW" #define SE_USR_PUB "usr:" #define SE_KERN_PUB "kern:" -#define SUNW_KERN_PUB SUNW_VENDOR":"SE_KERN_PUB -#define SUNW_USR_PUB SUNW_VENDOR":"SE_USR_PUB +#define SUNW_KERN_PUB SUNW_VENDOR ":" SE_KERN_PUB +#define SUNW_USR_PUB SUNW_VENDOR ":" SE_USR_PUB /* * Event header and attribute value limits