[libvirt] [PATCH 1/4] Fix some format specifiers for size_t vs ssize_t

[Laine Stump]

On 03/29/2012 05:53 AM, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange" <berrange at redhat.com>
>
> 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: Daniel P. Berrange <berrange at redhat.com>
> ---
>  src/remote/remote_driver.c |    6 +++---
>  src/util/xml.c             |    2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)

ACK

>
> diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
> index 8df690b..30ca6a5 100644
> --- a/src/remote/remote_driver.c
> +++ b/src/remote/remote_driver.c
> @@ -1839,7 +1839,7 @@ remoteDomainGetSecurityLabel (virDomainPtr domain, virSecurityLabelPtr seclabel)
>  
>      if (ret.label.label_val != NULL) {
>          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);
>              goto cleanup;
>          }
> @@ -1910,7 +1910,7 @@ remoteNodeGetSecurityModel (virConnectPtr conn, virSecurityModelPtr secmodel)
>  
>      if (ret.model.model_val != NULL) {
>          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);
>              goto cleanup;
>          }
> @@ -1919,7 +1919,7 @@ remoteNodeGetSecurityModel (virConnectPtr conn, virSecurityModelPtr secmodel)
>  
>      if (ret.doi.doi_val != NULL) {
>          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);
>              goto cleanup;
>          }
> diff --git a/src/util/xml.c b/src/util/xml.c
> index 1e0a48a..79a9d27 100644
> --- a/src/util/xml.c
> +++ b/src/util/xml.c
> @@ -107,7 +107,7 @@ virXPathStringLimit(const char *xpath,
>  
>      if (tmp != NULL && strlen(tmp) >= maxlen) {
>          virXMLError(VIR_ERR_INTERNAL_ERROR,
> -                    _("\'%s\' value longer than %zd bytes"),
> +                    _("\'%s\' value longer than %zu bytes"),
>                      xpath, maxlen);
>          VIR_FREE(tmp);
>          return NULL;