@@ -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