^((po|tests)/|docs/.*py$$|tools/(virsh|console)\.c$$)
exclude_file_name_regexp--sc_prohibit_raw_allocation = \
- ^(src/util/memory\.[ch]|(examples|python|tests)/.*)$$
+ ^(src/util/memory\.[ch]|(examples|python)/.*)$$
exclude_file_name_regexp--sc_prohibit_readlink = ^src/util/util\.c$$
/*
* commandhelper.c: Auxiliary program for commandtest
*
- * Copyright (C) 2010-2011 Red Hat, Inc.
+ * Copyright (C) 2010-2012 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
char *akey = strndup(astr, aeq - astr);
char *bkey = strndup(bstr, beq - bstr);
int ret = strcmp(akey, bkey);
- free(akey);
- free(bkey);
+ VIR_FREE(akey);
+ VIR_FREE(bkey);
return ret;
}
cleanup:
xmlXPathFreeContext(ctxt);
xmlFreeDoc(doc);
- free(xml);
+ VIR_FREE(xml);
return cpu;
}
goto error;
n = virXPathNodeSet("/cpuTest/cpu", ctxt, &nodes);
- if (n <= 0 || !(cpus = calloc(n, sizeof(virCPUDefPtr))))
+ if (n <= 0 || (VIR_ALLOC_N(cpus, n) < 0))
goto error;
for (i = 0; i < n; i++) {
*count = n;
cleanup:
- free(xml);
- free(nodes);
+ VIR_FREE(xml);
+ VIR_FREE(nodes);
xmlXPathFreeContext(ctxt);
xmlFreeDoc(doc);
return cpus;
if (cpus) {
for (i = 0; i < n; i++)
virCPUDefFree(cpus[i]);
- free(cpus);
+ VIR_FREE(cpus);
cpus = NULL;
}
goto cleanup;
ret = 0;
cleanup:
- free(xml);
- free(expected);
- free(actual);
+ VIR_FREE(xml);
+ VIR_FREE(expected);
+ VIR_FREE(actual);
return ret;
}
if (cpus) {
for (i = 0; i < ncpus; i++)
virCPUDefFree(cpus[i]);
- free(cpus);
+ VIR_FREE(cpus);
}
virCPUDefFree(baseline);
- free(result);
+ VIR_FREE(result);
return ret;
}
cleanup:
virCPUDefFree(host);
virCPUDefFree(cpu);
- free(result);
+ VIR_FREE(result);
return ret;
}
cpuTestRun(const char *name, const struct data *data)
{
char *label = NULL;
+ char *tmp;
if (virAsprintf(&label, "CPU %s(%s): %s", apis[data->api], data->arch, name) < 0)
return -1;
- free(virtTestLogContentAndReset());
+ tmp = virtTestLogContentAndReset();
+ VIR_FREE(tmp);
if (virtTestRun(label, 1, cpuTest[data->api], data) < 0) {
if (virTestGetDebug()) {
if ((log = virtTestLogContentAndReset()) &&
strlen(log) > 0)
fprintf(stderr, "\n%s\n", log);
- free(log);
+ VIR_FREE(log);
}
- free(label);
+ VIR_FREE(label);
return -1;
}
- free(label);
+ VIR_FREE(label);
return 0;
}
if (virAsprintf(&map, "%s/src/cpu/cpu_map.xml", abs_top_srcdir) < 0 ||
cpuMapOverride(map) < 0) {
- free(map);
+ VIR_FREE(map);
return EXIT_FAILURE;
}
DO_TEST_GUESTDATA("x86", "host", "host+host-model-nofallback",
models, "Penryn", -1);
- free(map);
+ VIR_FREE(map);
return (ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
ret = 0;
fail:
- free(inXmlData);
- free(actual);
+ VIR_FREE(inXmlData);
+ VIR_FREE(actual);
virDomainSnapshotDefFree(def);
return ret;
}
ret = testCompareXMLToXMLFiles(xml_in, info->uuid, info->internal);
cleanup:
- free(xml_in);
+ VIR_FREE(xml_in);
return ret;
}
ret = 0;
fail:
- free(xmlData);
- free(actual);
+ VIR_FREE(xmlData);
+ VIR_FREE(actual);
virInterfaceDefFree(dev);
return ret;
}
result = testCompareXMLToXMLFiles(xml);
- free (xml);
+ VIR_FREE(xml);
return result;
}
ret = 0;
fail:
- free(inXmlData);
- free(outArgvData);
- free(actual);
+ VIR_FREE(inXmlData);
+ VIR_FREE(outArgvData);
+ VIR_FREE(actual);
VIR_FREE(pidfile);
virCommandFree(cmd);
virNetworkObjFree(obj);
result = testCompareXMLToArgvFiles(inxml, outxml);
cleanup:
- free(inxml);
- free(outxml);
+ VIR_FREE(inxml);
+ VIR_FREE(outxml);
return result;
}
ret = 0;
fail:
- free(inXmlData);
- free(outXmlData);
- free(actual);
+ VIR_FREE(inXmlData);
+ VIR_FREE(outXmlData);
+ VIR_FREE(actual);
virNetworkDefFree(dev);
return ret;
}
result = testCompareXMLToXMLFiles(inxml, outxml, info->flags);
cleanup:
- free(inxml);
- free(outxml);
+ VIR_FREE(inxml);
+ VIR_FREE(outxml);
return result;
}
ret = 0;
fail:
- free(xmlData);
- free(actual);
+ VIR_FREE(xmlData);
+ VIR_FREE(actual);
virNodeDeviceDefFree(dev);
return ret;
}
result = testCompareXMLToXMLFiles(xml);
- free(xml);
+ VIR_FREE(xml);
return result;
}
ret = 0;
fail:
- free(expectData);
- free(actualData);
+ VIR_FREE(expectData);
+ VIR_FREE(actualData);
return ret;
}
result = linuxTestCompareFiles(cpuinfo, sysfs_cpuinfo, output);
cleanup:
- free(cpuinfo);
- free(output);
- free(sysfs_cpuinfo);
+ VIR_FREE(cpuinfo);
+ VIR_FREE(output);
+ VIR_FREE(sysfs_cpuinfo);
return result;
}
ret = 0;
fail:
- free(inXmlData);
- free(outXmlData);
- free(actual);
+ VIR_FREE(inXmlData);
+ VIR_FREE(outXmlData);
+ VIR_FREE(actual);
virNWFilterDefFree(dev);
return ret;
}
result = testCompareXMLToXMLFiles(inxml, outxml, tp->expect_warning);
cleanup:
- free(inxml);
- free(outxml);
+ VIR_FREE(inxml);
+ VIR_FREE(outxml);
return result;
}
if ((log = virtTestLogContentAndReset()) == NULL)
goto fail;
if ((*log != '\0') != expect_warning) {
- free(log);
+ VIR_FREE(log);
goto fail;
}
- free(log);
+ VIR_FREE(log);
if (!(actualxml = virDomainDefFormat(vmdef, 0)))
goto fail;
ret = 0;
fail:
- free(expectxml);
- free(actualxml);
- free(cmd);
+ VIR_FREE(expectxml);
+ VIR_FREE(actualxml);
+ VIR_FREE(cmd);
virDomainDefFree(vmdef);
return ret;
}
result = testCompareXMLToArgvFiles(xml, args, !!info->extraFlags);
cleanup:
- free(xml);
- free(args);
+ VIR_FREE(xml);
+ VIR_FREE(args);
return result;
}
driver.vncTLSx509certdir = strdup("/etc/pki/tls/qemu");
DO_TEST("graphics-vnc-tls");
driver.vncSASL = driver.vncTLSx509verify = driver.vncTLS = 0;
- free(driver.vncSASLdir);
- free(driver.vncTLSx509certdir);
+ VIR_FREE(driver.vncSASLdir);
+ VIR_FREE(driver.vncTLSx509certdir);
driver.vncSASLdir = driver.vncTLSx509certdir = NULL;
DO_TEST("graphics-sdl");
DO_TEST_FULL("qemu-ns-no-env", 1, NULL);
- free(driver.stateDir);
+ VIR_FREE(driver.stateDir);
virCapabilitiesFree(driver.caps);
return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
if (vmdef->emulator && STRPREFIX(vmdef->emulator, "/.")) {
if (!(emulator = strdup(vmdef->emulator + 1)))
goto out;
- free(vmdef->emulator);
+ VIR_FREE(vmdef->emulator);
vmdef->emulator = NULL;
if (virAsprintf(&vmdef->emulator, "%s/qemuxml2argvdata/%s",
abs_srcdir, emulator) < 0)
qemuDomainPCIAddressSetFree(pciaddrs);
}
-
- free(virtTestLogContentAndReset());
+ log = virtTestLogContentAndReset();
+ VIR_FREE(log);
virResetLastError();
/* We do not call qemuCapsExtractVersionInfo() before calling
ret = 0;
out:
- free(log);
- free(emulator);
- free(expectargv);
- free(actualargv);
+ VIR_FREE(log);
+ VIR_FREE(emulator);
+ VIR_FREE(expectargv);
+ VIR_FREE(actualargv);
virCommandFree(cmd);
virDomainDefFree(vmdef);
virUnrefConnect(conn);
info->expectFailure);
cleanup:
- free(xml);
- free(args);
+ VIR_FREE(xml);
+ VIR_FREE(args);
return result;
}
return EXIT_FAILURE;
if (virAsprintf(&map, "%s/src/cpu/cpu_map.xml", abs_top_srcdir) < 0 ||
cpuMapOverride(map) < 0) {
- free(map);
+ VIR_FREE(map);
return EXIT_FAILURE;
}
driver.vncTLSx509certdir = strdup("/etc/pki/tls/qemu");
DO_TEST("graphics-vnc-tls", false, NONE);
driver.vncSASL = driver.vncTLSx509verify = driver.vncTLS = 0;
- free(driver.vncSASLdir);
- free(driver.vncTLSx509certdir);
+ VIR_FREE(driver.vncSASLdir);
+ VIR_FREE(driver.vncTLSx509certdir);
driver.vncSASLdir = driver.vncTLSx509certdir = NULL;
DO_TEST("graphics-sdl", false, NONE);
DO_TEST("pseries-vio-address-clash", true, QEMU_CAPS_DRIVE,
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
- free(driver.stateDir);
+ VIR_FREE(driver.stateDir);
virCapabilitiesFree(driver.caps);
- free(map);
+ VIR_FREE(map);
return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
ret = 0;
fail:
- free(inXmlData);
- free(outXmlData);
- free(actual);
+ VIR_FREE(inXmlData);
+ VIR_FREE(outXmlData);
+ VIR_FREE(actual);
virDomainDefFree(def);
return ret;
}
}
cleanup:
- free(xml_in);
- free(xml_out);
+ VIR_FREE(xml_in);
+ VIR_FREE(xml_out);
return ret;
}
if (vmdef->emulator && STRPREFIX(vmdef->emulator, "/.")) {
if (!(emulator = strdup(vmdef->emulator + 1)))
goto fail;
- free(vmdef->emulator);
+ VIR_FREE(vmdef->emulator);
vmdef->emulator = NULL;
if (virAsprintf(&vmdef->emulator, "%s/qemuxml2argvdata/%s",
abs_srcdir, emulator) < 0)
}
- free(virtTestLogContentAndReset());
+ log = virtTestLogContentAndReset();
+ VIR_FREE(log);
virResetLastError();
/* We do not call qemuCapsExtractVersionInfo() before calling
ret = 0;
fail:
- free(log);
- free(emulator);
- free(expectargv);
- free(actualargv);
+ VIR_FREE(log);
+ VIR_FREE(emulator);
+ VIR_FREE(expectargv);
+ VIR_FREE(actualargv);
virCommandFree(cmd);
virDomainDefFree(vmdef);
virUnrefConnect(conn);
info->json, info->expectError);
cleanup:
- free(xml);
- free(args);
+ VIR_FREE(xml);
+ VIR_FREE(args);
return result;
}
return EXIT_FAILURE;
if (virAsprintf(&map, "%s/src/cpu/cpu_map.xml", abs_top_srcdir) < 0 ||
cpuMapOverride(map) < 0) {
- free(map);
+ VIR_FREE(map);
return EXIT_FAILURE;
}
DO_TEST("qemu-ns-commandline-ns0", false, NONE);
DO_TEST("qemu-ns-commandline-ns1", false, NONE);
- free(driver.stateDir);
+ VIR_FREE(driver.stateDir);
virCapabilitiesFree(driver.caps);
- free(map);
+ VIR_FREE(map);
return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
ret = 0;
fail:
- free(output);
+ VIR_FREE(output);
free_qparam_set(actual);
return ret;
}
ret = 0;
fail:
- free(xmlData);
- free(sexprData);
- free(gotxml);
+ VIR_FREE(xmlData);
+ VIR_FREE(sexprData);
+ VIR_FREE(gotxml);
virDomainDefFree(def);
if (conn)
virUnrefConnect(conn);
result = testCompareFiles(xml, args, info->version);
cleanup:
- free(xml);
- free(args);
+ VIR_FREE(xml);
+ VIR_FREE(args);
return result;
}
ret = 0;
fail:
- free(inXmlData);
- free(outXmlData);
- free(actual);
+ VIR_FREE(inXmlData);
+ VIR_FREE(outXmlData);
+ VIR_FREE(actual);
virStoragePoolDefFree(dev);
return ret;
}
result = testCompareXMLToXMLFiles(inxml, outxml);
cleanup:
- free(inxml);
- free(outxml);
+ VIR_FREE(inxml);
+ VIR_FREE(outxml);
return result;
}
ret = 0;
fail:
- free(poolXmlData);
- free(inXmlData);
- free(outXmlData);
- free(actual);
+ VIR_FREE(poolXmlData);
+ VIR_FREE(inXmlData);
+ VIR_FREE(outXmlData);
+ VIR_FREE(actual);
virStoragePoolDefFree(pool);
virStorageVolDefFree(dev);
return ret;
result = testCompareXMLToXMLFiles(poolxml, inxml, outxml);
cleanup:
- free(poolxml);
- free(inxml);
- free(outxml);
+ VIR_FREE(poolxml);
+ VIR_FREE(inxml);
+ VIR_FREE(outxml);
return result;
}
fprintf(stderr, "%2d) %-65s ... ", testCounter, title);
}
- if (nloops > 1 && (ts = calloc(nloops,
- sizeof(double)))==NULL)
+ if (nloops > 1 && (VIR_ALLOC_N(ts, nloops) < 0))
return -1;
for (i=0; i < nloops; i++) {
}
}
- free(ts);
+ VIR_FREE(ts);
return ret;
}
if (ferror(fp)) {
fprintf (stderr, "%s: read failed: %s\n", file, strerror(errno));
VIR_FORCE_FCLOSE(fp);
- free(*buf);
+ VIR_FREE(*buf);
return -1;
}
}
if (symbols[i])
fprintf(stderr, " TRACE: %s\n", symbols[i]);
}
- free(symbols);
+ VIR_FREE(symbols);
}
}
#endif
/*
* utils.c: test utils
*
- * Copyright (C) 2005, 2008-2011 Red Hat, Inc.
+ * Copyright (C) 2005, 2008-2012 Red Hat, Inc.
*
* See COPYING.LIB for the License of this software
*
# define __VIT_TEST_UTILS_H__
# include <stdio.h>
+# include "memory.h"
# define EXIT_AM_SKIP 77 /* tell Automake we're skipping a test */
# define EXIT_AM_HARDFAIL 99 /* tell Automake that the framework is broken */
result = 0;
cleanup:
- free(actualData);
+ VIR_FREE(actualData);
return result;
}
# undef DO_TEST
- free(custom_uri);
+ VIR_FREE(custom_uri);
return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
ret = 0;
fail:
- free(expectxml);
- free(actualxml);
- free(xml);
- free(cpuinfo);
- free(capabilities);
+ VIR_FREE(expectxml);
+ VIR_FREE(actualxml);
+ VIR_FREE(xml);
+ VIR_FREE(cpuinfo);
+ VIR_FREE(capabilities);
VIR_FORCE_FCLOSE(fp1);
VIR_FORCE_FCLOSE(fp2);
ret = 0;
fail:
- free(xmlData);
- free(xmcfgData);
- free(gotxmcfgData);
+ VIR_FREE(xmlData);
+ VIR_FREE(xmcfgData);
+ VIR_FREE(gotxmcfgData);
if (conf)
virConfFree(conf);
virDomainDefFree(def);
result = testCompareFormatXML(cfg, xml, info->version);
cleanup:
- free(xml);
- free(cfg);
+ VIR_FREE(xml);
+ VIR_FREE(cfg);
return result;
}
ret = 0;
fail:
- free(xmlData);
- free(sexprData);
- free(gotsexpr);
+ VIR_FREE(xmlData);
+ VIR_FREE(sexprData);
+ VIR_FREE(gotsexpr);
virDomainDefFree(def);
return ret;
result = testCompareFiles(xml, args, info->version);
cleanup:
- free(xml);
- free(args);
+ VIR_FREE(xml);
+ VIR_FREE(args);
return result;
}
projects / thirdparty / libvirt.git / commitdiff
