d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid more literal-suffix errors with C++11

Browse Source
This commit is contained in:
Bryan Drewery 2016-05-29 00:40:29 +00:00
parent 727dd78afa
commit fdd9048a63
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cddl/usr.sbin/zfsd/case_file.cc
View File

@ -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);

4
sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h
View File

@ -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