revert to use of g_free to make future qemu integrations easier (#695)

* revert to use of g_free to make future qemu integrations easier

* bracing
This commit is contained in:
Chris Eagle
2016-12-21 06:28:36 -08:00
committed by Nguyen Anh Quynh
parent 6a2eb14ff3
commit fccbcfd4c2
48 changed files with 224 additions and 219 deletions

View File

@ -67,7 +67,7 @@ void error_set_errno(Error **errp, int os_errno, ErrorClass err_class,
msg1 = g_strdup_vprintf(fmt, ap);
if (os_errno != 0) {
err->msg = g_strdup_printf("%s: %s", msg1, strerror(os_errno));
free(msg1);
g_free(msg1);
} else {
err->msg = msg1;
}
@ -110,8 +110,8 @@ void error_set_win32(Error **errp, int win32_err, ErrorClass err_class,
char *msg2 = g_win32_error_message(win32_err);
err->msg = g_strdup_printf("%s: %s (error: %x)", msg1, msg2,
(unsigned)win32_err);
free(msg2);
free(msg1);
g_free(msg2);
g_free(msg1);
} else {
err->msg = msg1;
}
@ -152,8 +152,8 @@ const char *error_get_pretty(Error *err)
void error_free(Error *err)
{
if (err) {
free(err->msg);
free(err);
g_free(err->msg);
g_free(err);
}
}