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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
