提交 73a5c94e 编写于 作者: J Jiri Denemark 提交者: Daniel P. Berrange

Add missing "%s" format string to constant error messages in lock manager

Updates the lock manager code so that it passes "%s" as the format
string whenever raising an error message with a const string.
上级 d1f8d6ed
...@@ -296,7 +296,7 @@ static int virLockManagerSanlockInit(unsigned int version, ...@@ -296,7 +296,7 @@ static int virLockManagerSanlockInit(unsigned int version,
goto error; goto error;
if (driver->autoDiskLease && !driver->hostID) { if (driver->autoDiskLease && !driver->hostID) {
virLockError(VIR_ERR_INTERNAL_ERROR, virLockError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Automatic disk lease mode enabled, but no host ID is set")); _("Automatic disk lease mode enabled, but no host ID is set"));
goto error; goto error;
} }
...@@ -338,7 +338,7 @@ static int virLockManagerSanlockNew(virLockManagerPtr lock, ...@@ -338,7 +338,7 @@ static int virLockManagerSanlockNew(virLockManagerPtr lock,
virCheckFlags(0, -1); virCheckFlags(0, -1);
if (!driver) { if (!driver) {
virLockError(VIR_ERR_INTERNAL_ERROR, virLockError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Sanlock plugin is not initialized")); _("Sanlock plugin is not initialized"));
return -1; return -1;
} }
...@@ -409,13 +409,13 @@ static int virLockManagerSanlockDiskLeaseName(const char *path, ...@@ -409,13 +409,13 @@ static int virLockManagerSanlockDiskLeaseName(const char *path,
int i; int i;
if (strbuflen < ((MD5_DIGEST_SIZE * 2) + 1)) { if (strbuflen < ((MD5_DIGEST_SIZE * 2) + 1)) {
virLockError(VIR_ERR_INTERNAL_ERROR, virLockError(VIR_ERR_INTERNAL_ERROR, "%s",
_("String length too small to store md5 checksum")); _("String length too small to store md5 checksum"));
return -1; return -1;
} }
if (!(md5_buffer(path, strlen(path), buf))) { if (!(md5_buffer(path, strlen(path), buf))) {
virLockError(VIR_ERR_INTERNAL_ERROR, virLockError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unable to compute md5 checksum")); _("Unable to compute md5 checksum"));
return -1; return -1;
} }
...@@ -499,7 +499,7 @@ static int virLockManagerSanlockAddDisk(virLockManagerPtr lock, ...@@ -499,7 +499,7 @@ static int virLockManagerSanlockAddDisk(virLockManagerPtr lock,
char *path = NULL; char *path = NULL;
if (nparams) { if (nparams) {
virLockError(VIR_ERR_INTERNAL_ERROR, virLockError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unexpected lock parameters for disk resource")); _("Unexpected lock parameters for disk resource"));
return -1; return -1;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册