]> xenbits.xensource.com Git - libvirt.git/commitdiff
src: Use VIR_STRDUP() wherever possible
authorAndrea Bolognani <abologna@redhat.com>
Fri, 20 Jul 2018 07:45:12 +0000 (09:45 +0200)
committerAndrea Bolognani <abologna@redhat.com>
Mon, 23 Jul 2018 12:27:23 +0000 (14:27 +0200)
virStrcpy() and friends are useful when the destination
buffer has already been allocated, eg. as part of a struct;
if we have to allocate it on the spot, VIR_STRDUP() is a
better choice.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
src/remote/remote_daemon_dispatch.c

index 4a93f09a7d12a509d85c539a1e62f09781f202fe..e62ebfb596778bffcdd597301fe05456996def47 100644 (file)
@@ -2309,9 +2309,7 @@ remoteDispatchDomainGetSecurityLabelList(virNetServerPtr server ATTRIBUTE_UNUSED
     for (i = 0; i < len; i++) {
         size_t label_len = strlen(seclabels[i].label) + 1;
         remote_domain_get_security_label_ret *cur = &ret->labels.labels_val[i];
-        if (VIR_ALLOC_N(cur->label.label_val, label_len) < 0)
-            goto cleanup;
-        if (virStrcpy(cur->label.label_val, seclabels[i].label, label_len) == NULL) {
+        if (VIR_STRDUP(cur->label.label_val, seclabels[i].label) < 0) {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                            _("failed to copy security label"));
             goto cleanup;