Skip to content

Commit c9fe92c

Browse files
committed
fix another bunch of warnings
1 parent 5d093f4 commit c9fe92c

File tree

5 files changed

+26
-13
lines changed

5 files changed

+26
-13
lines changed

src/plugins/grass/qtermwidget/BlockArray.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,10 @@ bool BlockArray::setHistorySize( size_t newsize )
211211
else
212212
{
213213
decreaseBuffer( newsize );
214-
( void ) ftruncate( ion, length*blocksize );
214+
if( ftruncate( ion, length*blocksize ) < 0 )
215+
{
216+
perror( "ftruncate" );
217+
}
215218
size = newsize;
216219

217220
return true;

src/plugins/grass/qtermwidget/k3process.cpp

+8-4
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ K3Process::setupEnvironment()
151151
}
152152
if ( !d->wd.isEmpty() )
153153
{
154-
( void ) chdir( QFile::encodeName( d->wd ).data() );
154+
if( chdir( QFile::encodeName( d->wd ).data() ) < 0 )
155+
perror( "chdir" );
155156
}
156157
}
157158

@@ -334,13 +335,15 @@ bool K3Process::start( RunMode runmode, Communication comm )
334335

335336
if ( !runPrivileged() )
336337
{
337-
setgid( getgid() );
338+
if( setgid( getgid() ) < 0 )
339+
perror( "setgid" );
338340
#ifdef HAVE_INITGROUPS
339341
if ( pw )
340342
initgroups( pw->pw_name, pw->pw_gid );
341343
#endif
342344
if ( geteuid() != getuid() )
343-
setuid( getuid() );
345+
if( setuid( getuid() ) < 0 )
346+
perror( "setuid" );
344347
if ( geteuid() != getuid() )
345348
_exit( 1 );
346349
}
@@ -356,7 +359,8 @@ bool K3Process::start( RunMode runmode, Communication comm )
356359
execvp( executable, arglist );
357360

358361
char resultByte = 1;
359-
( void ) write( fd[1], &resultByte, 1 );
362+
if( write( fd[1], &resultByte, 1 ) < 0 )
363+
perror( "write" );
360364
_exit( -1 );
361365
}
362366
else if ( pid_ == -1 )

src/plugins/grass/qtermwidget/k3processcontroller.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@ void K3ProcessController::theSigCHLDHandler( int arg )
209209
int saved_errno = errno;
210210

211211
char dummy = 0;
212-
( void ) ::write( instance()->d->fd[1], &dummy, 1 );
212+
if( ::write( instance()->d->fd[1], &dummy, 1 ) < 0 )
213+
perror( "write failed" );
213214

214215
#ifdef Q_OS_UNIX
215216
if ( Private::oldChildHandlerData.sa_handler != SIG_IGN &&
@@ -243,14 +244,16 @@ K3ProcessController::rescheduleCheck()
243244
{
244245
d->needcheck = false;
245246
char dummy = 0;
246-
( void ) ::write( d->fd[1], &dummy, 1 );
247+
if( ::write( d->fd[1], &dummy, 1 ) < 0 )
248+
perror( "write failed" );
247249
}
248250
}
249251

250252
void K3ProcessController::slotDoHousekeeping()
251253
{
252254
char dummy[16]; // somewhat bigger - just in case several have queued up
253-
( void ) ::read( d->fd[0], dummy, sizeof( dummy ) );
255+
if( ::read( d->fd[0], dummy, sizeof( dummy ) ) < 0 )
256+
perror( "read failed" );
254257

255258
int status;
256259
again:

src/plugins/grass/qtermwidget/kpty.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,10 @@ bool KPty::open()
303303
p = getgrnam( "wheel" );
304304
gid_t gid = p ? p->gr_gid : getgid();
305305

306-
( void ) chown( d->ttyName.data(), getuid(), gid );
307-
( void ) chmod( d->ttyName.data(), S_IRUSR | S_IWUSR | S_IWGRP );
306+
if( chown( d->ttyName.data(), getuid(), gid ) < 0 )
307+
perror( "chown" );
308+
if( chmod( d->ttyName.data(), S_IRUSR | S_IWUSR | S_IWGRP ) < 0 )
309+
perror( "chmod" );
308310
}
309311
goto gotpty;
310312
}
@@ -397,7 +399,8 @@ void KPty::close()
397399
struct stat st;
398400
if ( !stat( d->ttyName.data(), &st ) )
399401
{
400-
( void ) chown( d->ttyName.data(), 0, st.st_gid == getgid() ? 0 : -1 );
402+
if( chown( d->ttyName.data(), 0, st.st_gid == getgid() ? 0 : -1 ) < 0 )
403+
perror( "chown" );
401404
chmod( d->ttyName.data(), S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH );
402405
}
403406
}

src/providers/gpx/qgsgpxfeatureiterator.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ QgsGeometry* QgsGPXFeatureIterator::readTrackGeometry( const QgsTrack& trk )
431431

432432
// A track consists of several segments. Add all those segments into one.
433433
int totalPoints = 0;;
434-
for ( std::vector<QgsTrackSegment>::size_type i = 0; i < trk.segments.size(); i ++ )
434+
for ( int i = 0; i < trk.segments.size(); i ++ )
435435
{
436436
totalPoints += trk.segments[i].points.size();
437437
}
@@ -452,7 +452,7 @@ QgsGeometry* QgsGPXFeatureIterator::readTrackGeometry( const QgsTrack& trk )
452452
std::memcpy( geo + 5, &totalPoints, 4 );
453453

454454
int thisPoint = 0;
455-
for ( std::vector<QgsTrackSegment>::size_type k = 0; k < trk.segments.size(); k++ )
455+
for ( int k = 0; k < trk.segments.size(); k++ )
456456
{
457457
int nPoints = trk.segments[k].points.size();
458458
for ( int i = 0; i < nPoints; ++i )

0 commit comments

Comments
 (0)