Kaydet (Commit) 69fd971e authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#1326953 RV: Bad use of return value

and

coverity#1326954 RV: Bad use of return value
coverity#1326955 RV: Bad use of return value
coverity#1326956 RV: Bad use of return value
coverity#1326957 RV: Bad use of return value
coverity#1326958 RV: Bad use of return value
coverity#1326959 RV: Bad use of return value
coverity#1326960 RV: Bad use of return value
coverity#1326961 RV: Bad use of return value
coverity#1326962 RV: Bad use of return value

Change-Id: I02c2f7a5214e348f06a12b78a9400d8501b00e57
üst 7dd73ab0
......@@ -738,21 +738,27 @@ public class OfficeProvider implements AppProvider
}
}
private void deleteFilesAndDirector(File file)
private void deleteFilesAndDirector(File file)
{
File f = file;
if(f.isDirectory())
{
File f = file;
if(f.isDirectory())
File files[] = f.listFiles();
for(int i = 0; i < files.length; i++)
{
File files[] = f.listFiles();
for(int i = 0; i < files.length; i++)
{
deleteFilesAndDirector(files[i]);
}
f.delete();
deleteFilesAndDirector(files[i]);
}
else if (f.isFile())
{
f.delete();
boolean bDeleteOk = f.delete();
if (!bDeleteOk) {
System.out.println("delete failed");
}
}
else if (f.isFile())
{
boolean bDeleteOk = f.delete();
if (!bDeleteOk) {
System.out.println("delete failed");
}
}
}
}
......@@ -113,11 +113,15 @@ public class DataSource
if ( docURL.length() == 0 )
{
final java.io.File tempFile = java.io.File.createTempFile( _registrationName + "_", ".odb" );
if ( tempFile.exists() )
if ( tempFile.exists() ) {
// we did not really want to create that file, we just wanted its local name, but
// createTempFile actually creates it => throw it away
// (This is necessary since some JVM/platform combinations seem to actually lock the file)
tempFile.delete();
boolean bDeleteOk = tempFile.delete();
if (!bDeleteOk) {
System.out.println("delete failed");
}
}
String localPart = tempFile.toURI().toURL().toString();
localPart = localPart.substring( localPart.lastIndexOf( '/' ) + 1 );
docURL = util.utils.getOfficeTemp( m_orb ) + localPart;
......
......@@ -120,8 +120,12 @@ public class _XPrintJobBroadcaster extends MultiMethodTest {
public void reset() {
File f = new File(printFileName);
if (f.exists())
f.delete();
if (f.exists()) {
boolean bDeleteOk = f.delete();
if (!bDeleteOk) {
System.out.println("delete failed");
}
}
eventCalled = false;
}
......
......@@ -522,8 +522,9 @@ public class ORowSet extends TestCase {
private final void impl_deleteFile( final String _file )
{
java.io.File file = new java.io.File( _file );
file.delete();
if ( file.exists() )
boolean bDeleteOk = file.delete();
if (!bDeleteOk && file.exists())
file.deleteOnExit();
}
......
......@@ -88,8 +88,17 @@ public class NestedRegistry extends TestCase {
File srcF = new File(src) ;
File dstF = new File(dst) ;
if (dstF.exists()) dstF.delete() ;
dstF.createNewFile() ;
if (dstF.exists()) {
boolean bDeleteOk = dstF.delete();
if (!bDeleteOk) {
System.out.println("delete failed");
}
}
boolean bCreateOk = dstF.createNewFile();
if (!bCreateOk) {
System.out.println("create failed");
}
dstF.deleteOnExit() ;
......
......@@ -85,8 +85,17 @@ public class NestedRegistry extends TestCase {
File srcF = new File(src) ;
File dstF = new File(dst) ;
if (dstF.exists()) dstF.delete() ;
dstF.createNewFile() ;
if (dstF.exists()) {
boolean bDeleteOk = dstF.delete();
if (!bDeleteOk) {
System.out.println("delete failed");
}
}
boolean bCreateOk = dstF.createNewFile() ;
if (!bCreateOk) {
System.out.println("create failed");
}
dstF.deleteOnExit() ;
......
......@@ -195,7 +195,10 @@ public class ScModelObj extends TestCase {
String fileName = utils.getOfficeTempDirSys(Param.getMSF())+"printfile.prt" ;
File f = new File(fileName);
if (f.exists()) {
f.delete();
boolean bDeleteOk = f.delete();
if (!bDeleteOk) {
System.out.println("delete failed");
}
}
_XPrintJobBroadcaster.MyPrintJobListener listener = new _XPrintJobBroadcaster.MyPrintJobListener(oObj, fileName);
tEnv.addObjRelation("XPrintJobBroadcaster.XPrintJobListener", listener);
......
......@@ -156,7 +156,10 @@ public class SdXImpressDocument extends TestCase {
String fileName = utils.getOfficeTempDirSys(Param.getMSF())+"printfile.prt" ;
File f = new File(fileName);
if (f.exists()) {
f.delete();
boolean bDeleteOk = f.delete();
if (!bDeleteOk) {
System.out.println("delete failed");
}
}
_XPrintJobBroadcaster.MyPrintJobListener listener = new _XPrintJobBroadcaster.MyPrintJobListener(xImpressDoc, fileName);
tEnv.addObjRelation("XPrintJobBroadcaster.XPrintJobListener", listener);
......
......@@ -62,9 +62,19 @@ public class SimpleRegistry extends TestCase {
File dstF = new File(dst) ;
System.out.println("H1");
if (dstF.exists()) dstF.delete() ;
if (dstF.exists()) {
boolean bDeleteOk = dstF.delete();
if (!bDeleteOk) {
System.out.println("delete failed");
}
}
System.out.println("H2");
dstF.createNewFile() ;
boolean bCreateOk = dstF.createNewFile();
if (!bCreateOk) {
System.out.println("create failed");
}
dstF.deleteOnExit() ;
System.out.println("H3");
......
......@@ -65,9 +65,19 @@ public class SimpleRegistry extends TestCase {
File dstF = new File(dst) ;
log.println("H1");
if (dstF.exists()) dstF.delete() ;
log.println("H2");
dstF.createNewFile() ;
if (dstF.exists()) {
boolean bDeleteOk = dstF.delete();
if (!bDeleteOk) {
System.out.println("delete failed");
}
}
System.out.println("H2");
boolean bCreateOk = dstF.createNewFile();
if (!bCreateOk) {
System.out.println("create failed");
}
dstF.deleteOnExit() ;
log.println("H3");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment