From 9c1ed84d28edfa4a2b5b0a327dccd83d1a1beef8 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 23 Dec 2012 23:36:00 +0100 Subject: sansapatcher: move sectorbuf pointer into sansa_t structure. Similar as the ipod_t structure for ipodpatcher the sansa_t structure holds all relevant information for sansapatcher. Put the global sansa_sectorbuf pointer into it as well. Change-Id: Iad08ef6aafc49609c3d0d556914246f230ee0179 --- rbutil/rbutilqt/base/autodetection.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'rbutil/rbutilqt/base/autodetection.cpp') diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/rbutil/rbutilqt/base/autodetection.cpp index 8fba1d8cea..a453fa8d60 100644 --- a/rbutil/rbutilqt/base/autodetection.cpp +++ b/rbutil/rbutilqt/base/autodetection.cpp @@ -167,9 +167,8 @@ bool Autodetection::detect() // try sansapatcher // initialize sector buffer. Needed. - sansa_sectorbuf = NULL; - sansa_alloc_buffer(&sansa_sectorbuf, BUFFER_SIZE); struct sansa_t sansa; + sansa_alloc_buffer(&sansa, BUFFER_SIZE); n = sansa_scan(&sansa); if(n == 1) { qDebug() << "[Autodetect] Sansa found:" << sansa.targetname << "at" << sansa.diskname; @@ -187,8 +186,8 @@ bool Autodetection::detect() else { qDebug() << "[Autodetect] sansapatcher: no Sansa found." << n; } - free(sansa_sectorbuf); - sansa_sectorbuf = NULL; + free(sansa.sectorbuf); + sansa.sectorbuf = NULL; if(m_mountpoint.isEmpty() && m_device.isEmpty() && m_errdev.isEmpty() && m_incompat.isEmpty()) -- cgit v1.2.3