From fdd9048a6342503ce46137e32f289edb23ac16be Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Sun, 29 May 2016 00:40:29 +0000 Subject: [PATCH] Avoid more literal-suffix errors with C++11 --- cddl/usr.sbin/zfsd/case_file.cc | 8 ++++---- sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cddl/usr.sbin/zfsd/case_file.cc b/cddl/usr.sbin/zfsd/case_file.cc index 21e49c2e5e81..e7a4eb1be40c 100644 --- a/cddl/usr.sbin/zfsd/case_file.cc +++ b/cddl/usr.sbin/zfsd/case_file.cc @@ -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 struct dirent *dirEntry) 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 *fileName) 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, const char* path, bool isspare) { 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); diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h b/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h index 777d7480cf08..9a259828fc1f 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h @@ -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