提交 5d7929af 编写于 作者: D Daniel P. Berrange

Fix some format specifiers for size_t vs ssize_t

A handful of places used %zd for format specifiers even
though the args was size_t, not ssize_t.

* src/remote/remote_driver.c, src/util/xml.c: s/%zd/%zu/
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
上级 814fcb9e
...@@ -1839,7 +1839,7 @@ remoteDomainGetSecurityLabel (virDomainPtr domain, virSecurityLabelPtr seclabel) ...@@ -1839,7 +1839,7 @@ remoteDomainGetSecurityLabel (virDomainPtr domain, virSecurityLabelPtr seclabel)
if (ret.label.label_val != NULL) { if (ret.label.label_val != NULL) {
if (strlen (ret.label.label_val) >= sizeof seclabel->label) { if (strlen (ret.label.label_val) >= sizeof seclabel->label) {
remoteError(VIR_ERR_RPC, _("security label exceeds maximum: %zd"), remoteError(VIR_ERR_RPC, _("security label exceeds maximum: %zu"),
sizeof seclabel->label - 1); sizeof seclabel->label - 1);
goto cleanup; goto cleanup;
} }
...@@ -1910,7 +1910,7 @@ remoteNodeGetSecurityModel (virConnectPtr conn, virSecurityModelPtr secmodel) ...@@ -1910,7 +1910,7 @@ remoteNodeGetSecurityModel (virConnectPtr conn, virSecurityModelPtr secmodel)
if (ret.model.model_val != NULL) { if (ret.model.model_val != NULL) {
if (strlen (ret.model.model_val) >= sizeof secmodel->model) { if (strlen (ret.model.model_val) >= sizeof secmodel->model) {
remoteError(VIR_ERR_RPC, _("security model exceeds maximum: %zd"), remoteError(VIR_ERR_RPC, _("security model exceeds maximum: %zu"),
sizeof secmodel->model - 1); sizeof secmodel->model - 1);
goto cleanup; goto cleanup;
} }
...@@ -1919,7 +1919,7 @@ remoteNodeGetSecurityModel (virConnectPtr conn, virSecurityModelPtr secmodel) ...@@ -1919,7 +1919,7 @@ remoteNodeGetSecurityModel (virConnectPtr conn, virSecurityModelPtr secmodel)
if (ret.doi.doi_val != NULL) { if (ret.doi.doi_val != NULL) {
if (strlen (ret.doi.doi_val) >= sizeof secmodel->doi) { if (strlen (ret.doi.doi_val) >= sizeof secmodel->doi) {
remoteError(VIR_ERR_RPC, _("security doi exceeds maximum: %zd"), remoteError(VIR_ERR_RPC, _("security doi exceeds maximum: %zu"),
sizeof secmodel->doi - 1); sizeof secmodel->doi - 1);
goto cleanup; goto cleanup;
} }
......
...@@ -107,7 +107,7 @@ virXPathStringLimit(const char *xpath, ...@@ -107,7 +107,7 @@ virXPathStringLimit(const char *xpath,
if (tmp != NULL && strlen(tmp) >= maxlen) { if (tmp != NULL && strlen(tmp) >= maxlen) {
virXMLError(VIR_ERR_INTERNAL_ERROR, virXMLError(VIR_ERR_INTERNAL_ERROR,
_("\'%s\' value longer than %zd bytes"), _("\'%s\' value longer than %zu bytes"),
xpath, maxlen); xpath, maxlen);
VIR_FREE(tmp); VIR_FREE(tmp);
return NULL; return NULL;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册