equal
deleted
inserted
replaced
190 delete iDir; |
190 delete iDir; |
191 iDir = NULL; |
191 iDir = NULL; |
192 do |
192 do |
193 { |
193 { |
194 TRAP(err, iDirScan->NextL(iDir)); |
194 TRAP(err, iDirScan->NextL(iDir)); |
|
195 if( !iDir && !err ) |
|
196 { |
|
197 // if iDir NULL and no error, there are no |
|
198 // more directories in the structure |
|
199 // in this case there is no leaving functions called before |
|
200 // returning err has to be 0 |
|
201 break; |
|
202 } |
195 blocked = iObserver.IsPathBlockedL( iDirScan->FullPath() ); |
203 blocked = iObserver.IsPathBlockedL( iDirScan->FullPath() ); |
196 if( blocked ) |
204 if( blocked ) |
197 { |
205 { |
198 delete iDir; |
206 delete iDir; |
199 iDir = NULL; |
207 iDir = NULL; |
244 TInt err(KErrNone); |
252 TInt err(KErrNone); |
245 do |
253 do |
246 { |
254 { |
247 MPX_DEBUG1("CMPXFolderScanner::SetupNextDriveToScanL iDirScan->NextL()"); |
255 MPX_DEBUG1("CMPXFolderScanner::SetupNextDriveToScanL iDirScan->NextL()"); |
248 TRAP(err, iDirScan->NextL(iDir)); |
256 TRAP(err, iDirScan->NextL(iDir)); |
|
257 if( !iDir && !err ) |
|
258 { |
|
259 // if iDir NULL and no error, there are no |
|
260 // more directories in the structure |
|
261 // in this case there is no leaving functions called before |
|
262 // returning err has to be 0 |
|
263 break; |
|
264 } |
249 MPX_DEBUG2("CMPXFolderScanner::SetupNextDriveToScanL path %S", &iDirScan->FullPath()); |
265 MPX_DEBUG2("CMPXFolderScanner::SetupNextDriveToScanL path %S", &iDirScan->FullPath()); |
250 blocked = iObserver.IsPathBlockedL( iDirScan->FullPath() ); |
266 blocked = iObserver.IsPathBlockedL( iDirScan->FullPath() ); |
251 MPX_DEBUG2("CMPXFolderScanner::SetupNextDriveToScanL path blocked %i", blocked); |
267 MPX_DEBUG2("CMPXFolderScanner::SetupNextDriveToScanL path blocked %i", blocked); |
252 if( blocked ) |
268 if( blocked ) |
253 { |
269 { |