summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Jarosch <thomas.jarosch@intra2net.com>2011-10-05 22:15:17 +0200
committerDanny Kukawka <danny.kukawka@web.de>2011-10-30 13:42:02 +0100
commit08e7d577151227199fc7c83a4a917ea1b922b14d (patch)
tree95da45d22bf5177fbba1aeac5f45178f6067a17f
parent38cb713132a60758b07380c8d555c61d06eb0195 (diff)
Fix mismatching allocation/deallocationHEADmaster
Detected by "cppcheck" Please CC: comments. Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com> Signed-off-by: Danny Kukawka <danny.kukawka@web.de>
-rw-r--r--hald/freebsd/probing/freebsd_dvd_rw_utils.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/hald/freebsd/probing/freebsd_dvd_rw_utils.c b/hald/freebsd/probing/freebsd_dvd_rw_utils.c
index c004916c..130d8a31 100644
--- a/hald/freebsd/probing/freebsd_dvd_rw_utils.c
+++ b/hald/freebsd/probing/freebsd_dvd_rw_utils.c
@@ -45,7 +45,7 @@ scsi_command_new_from_cdrom (HFPCDROM *cdrom)
static void
scsi_command_free (ScsiCommand * cmd)
{
- free (cmd);
+ g_free (cmd);
}
static void
@@ -107,7 +107,7 @@ get_dvd_r_rw_profile (HFPCDROM *cdrom)
if (scsi_command_transport (cmd, READ, list, len)) {
/* GET CONFIGURATION failed */
scsi_command_free (cmd);
- free (list);
+ g_free (list);
return -1;
}
@@ -170,7 +170,7 @@ get_dvd_r_rw_profile (HFPCDROM *cdrom)
}
scsi_command_free (cmd);
- free (list);
+ g_free (list);
return retval;
@@ -230,7 +230,7 @@ pull_page2a_from_cdrom (HFPCDROM *cdrom)
if (scsi_command_transport (cmd, READ, page2A, len)) {
/* MODE SENSE failed */
scsi_command_free (cmd);
- free (page2A);
+ g_free (page2A);
return NULL;
}
@@ -330,7 +330,7 @@ get_write_speeds (const unsigned char *p, int length, int max_speed)
}
free_tmpspeeds:
- free (tmpspeeds);
+ g_free (tmpspeeds);
return result;
}
@@ -462,7 +462,7 @@ get_disc_capacity_cdr (HFPCDROM *cdrom, guint64 *size)
if (scsi_command_transport (cmd, READ, atip, len)) {
/* READ TOC failed */
- free (atip);
+ g_free (atip);
goto done;
}
@@ -473,7 +473,7 @@ get_disc_capacity_cdr (HFPCDROM *cdrom, guint64 *size)
}
retval = 0;
- free (atip);
+ g_free (atip);
done:
scsi_command_free (cmd);