Skip to content

Commit 9f8d386

Browse files
jef-njef-n
committedMar 31, 2013
fix warnings on ignored return values
·
ltr-3_44archive/master_2
1 parent b99ff61 commit 9f8d386

File tree

5 files changed

+38
-38
lines changed

5 files changed

+38
-38
lines changed
 

‎src/app/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ void myMessageOutput( QtMsgType type, const char *msg )
201201
{
202202
fprintf( stderr, "Fatal: %s\n", msg );
203203
#if defined(linux) && !defined(ANDROID)
204-
write( STDERR_FILENO, "Stacktrace (run through c++filt):\n", 34 );
204+
( void ) write( STDERR_FILENO, "Stacktrace (run through c++filt):\n", 34 );
205205
void *buffer[256];
206206
int nptrs = backtrace( buffer, sizeof( buffer ) / sizeof( *buffer ) );
207207
backtrace_symbols_fd( buffer, nptrs, STDERR_FILENO );

‎src/plugins/grass/qtermwidget/BlockArray.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ bool BlockArray::setHistorySize( size_t newsize )
211211
else
212212
{
213213
decreaseBuffer( newsize );
214-
ftruncate( ion, length*blocksize );
214+
( void ) ftruncate( ion, length*blocksize );
215215
size = newsize;
216216

217217
return true;

‎src/plugins/grass/qtermwidget/k3process.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ class K3ProcessPrivate
8686
}
8787

8888
K3Process::Communication usePty;
89-
bool addUtmp : 1;
90-
bool useShell : 1;
89+
bool addUtmp : 1;
90+
bool useShell : 1;
9191

9292
KPty *pty;
9393

@@ -151,7 +151,7 @@ K3Process::setupEnvironment()
151151
}
152152
if ( !d->wd.isEmpty() )
153153
{
154-
chdir( QFile::encodeName( d->wd ).data() );
154+
( void ) chdir( QFile::encodeName( d->wd ).data() );
155155
}
156156
}
157157

@@ -356,7 +356,7 @@ bool K3Process::start( RunMode runmode, Communication comm )
356356
execvp( executable, arglist );
357357

358358
char resultByte = 1;
359-
write( fd[1], &resultByte, 1 );
359+
( void ) write( fd[1], &resultByte, 1 );
360360
_exit( -1 );
361361
}
362362
else if ( pid_ == -1 )

‎src/plugins/grass/qtermwidget/k3processcontroller.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ void K3ProcessController::theSigCHLDHandler( int arg )
209209
int saved_errno = errno;
210210

211211
char dummy = 0;
212-
::write( instance()->d->fd[1], &dummy, 1 );
212+
( void ) ::write( instance()->d->fd[1], &dummy, 1 );
213213

214214
#ifdef Q_OS_UNIX
215215
if ( Private::oldChildHandlerData.sa_handler != SIG_IGN &&
@@ -243,14 +243,14 @@ K3ProcessController::rescheduleCheck()
243243
{
244244
d->needcheck = false;
245245
char dummy = 0;
246-
::write( d->fd[1], &dummy, 1 );
246+
( void ) ::write( d->fd[1], &dummy, 1 );
247247
}
248248
}
249249

250250
void K3ProcessController::slotDoHousekeeping()
251251
{
252252
char dummy[16]; // somewhat bigger - just in case several have queued up
253-
::read( d->fd[0], dummy, sizeof( dummy ) );
253+
( void ) ::read( d->fd[0], dummy, sizeof( dummy ) );
254254

255255
int status;
256256
again:

‎src/plugins/grass/qtermwidget/kpty.cpp

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -248,22 +248,22 @@ bool KPty::open()
248248
{
249249
d->ttyName = ptsn;
250250
#else
251-
int ptyno;
252-
if ( !ioctl( d->masterFd, TIOCGPTN, &ptyno ) )
253-
{
254-
d->ttyName = QByteArray( "/dev/pts/" ) + QByteArray::number( ptyno );
251+
int ptyno;
252+
if ( !ioctl( d->masterFd, TIOCGPTN, &ptyno ) )
253+
{
254+
d->ttyName = QByteArray( "/dev/pts/" ) + QByteArray::number( ptyno );
255255
#endif
256256
#ifdef HAVE_GRANTPT
257-
if ( !grantpt( d->masterFd ) )
258-
goto grantedpt;
257+
if ( !grantpt( d->masterFd ) )
258+
goto grantedpt;
259259
#else
260260

261-
goto gotpty;
261+
goto gotpty;
262262
#endif
263+
}
264+
::close( d->masterFd );
265+
d->masterFd = -1;
263266
}
264-
::close( d->masterFd );
265-
d->masterFd = -1;
266-
}
267267
#endif // HAVE_PTSNAME || TIOCGPTN
268268

269269
// Linux device names, FIXME: Trouble on other systems?
@@ -299,8 +299,8 @@ bool KPty::open()
299299
p = getgrnam( "wheel" );
300300
gid_t gid = p ? p->gr_gid : getgid();
301301

302-
chown( d->ttyName.data(), getuid(), gid );
303-
chmod( d->ttyName.data(), S_IRUSR | S_IWUSR | S_IWGRP );
302+
( void ) chown( d->ttyName.data(), getuid(), gid );
303+
( void ) chmod( d->ttyName.data(), S_IRUSR | S_IWUSR | S_IWGRP );
304304
}
305305
goto gotpty;
306306
}
@@ -393,7 +393,7 @@ void KPty::close()
393393
struct stat st;
394394
if ( !stat( d->ttyName.data(), &st ) )
395395
{
396-
chown( d->ttyName.data(), 0, st.st_gid == getgid() ? 0 : -1 );
396+
( void ) chown( d->ttyName.data(), 0, st.st_gid == getgid() ? 0 : -1 );
397397
chmod( d->ttyName.data(), S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH );
398398
}
399399
}
@@ -556,29 +556,29 @@ void KPty::logout()
556556
if (( ut = getutxline( &l_struct ) ) )
557557
{
558558
# else
559-
utmpname( _PATH_UTMP );
560-
setutent();
561-
if (( ut = getutline( &l_struct ) ) )
562-
{
559+
utmpname( _PATH_UTMP );
560+
setutent();
561+
if (( ut = getutline( &l_struct ) ) )
562+
{
563563
# endif
564-
memset( ut->ut_name, 0, sizeof( *ut->ut_name ) );
565-
memset( ut->ut_host, 0, sizeof( *ut->ut_host ) );
564+
memset( ut->ut_name, 0, sizeof( *ut->ut_name ) );
565+
memset( ut->ut_host, 0, sizeof( *ut->ut_host ) );
566566
# ifdef HAVE_STRUCT_UTMP_UT_SYSLEN
567-
ut->ut_syslen = 0;
567+
ut->ut_syslen = 0;
568568
# endif
569569
# ifdef HAVE_STRUCT_UTMP_UT_TYPE
570-
ut->ut_type = DEAD_PROCESS;
570+
ut->ut_type = DEAD_PROCESS;
571571
# endif
572572
# ifdef HAVE_UTMPX
573-
gettimeofday( ut->ut_tv, 0 );
574-
pututxline( ut );
575-
}
576-
endutxent();
573+
gettimeofday( ut->ut_tv, 0 );
574+
pututxline( ut );
575+
}
576+
endutxent();
577577
# else
578-
ut->ut_time = time( 0 );
579-
pututline( ut );
580-
}
581-
endutent();
578+
ut->ut_time = time( 0 );
579+
pututline( ut );
580+
}
581+
endutent();
582582
# endif
583583
# endif
584584
#endif

0 commit comments

Comments
 (0)
Please sign in to comment.