summaryrefslogtreecommitdiff
path: root/libopie2
authormickeyl <mickeyl>2004-04-23 10:37:55 (UTC)
committer mickeyl <mickeyl>2004-04-23 10:37:55 (UTC)
commit85bfee8e542805ff7df67d9786bb291f7d2b34f3 (patch) (unidiff)
treede85a9669e09aadc81ea868d3d88154834cca912 /libopie2
parentd84d16cffe92bfafc5f2433f646dcfa00e6cd7f6 (diff)
downloadopie-85bfee8e542805ff7df67d9786bb291f7d2b34f3.zip
opie-85bfee8e542805ff7df67d9786bb291f7d2b34f3.tar.gz
opie-85bfee8e542805ff7df67d9786bb291f7d2b34f3.tar.bz2
gcc 3.4 fixlet and kill a warning
Diffstat (limited to 'libopie2') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/ofilenotify.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libopie2/opiecore/ofilenotify.cpp b/libopie2/opiecore/ofilenotify.cpp
index 5f2a1cc..b576c4f 100644
--- a/libopie2/opiecore/ofilenotify.cpp
+++ b/libopie2/opiecore/ofilenotify.cpp
@@ -116,13 +116,13 @@ int OFileNotification::start( const QString& path, bool sshot, OFileNotification
116 result = ::fcntl( fd, F_SETSIG, SIGRTMIN ); 116 result = ::fcntl( fd, F_SETSIG, SIGRTMIN );
117 if ( result == -1 ) 117 if ( result == -1 )
118 { 118 {
119 qWarning( "OFileNotification::start(): Can't subscribe to '%s': %s.", (const char*) dirpath, strerror( errno ) ); 119 qWarning( "OFileNotification::start(): Can't subscribe to '%s': %s.", (const char*) dirpath, strerror( errno ) );
120 return -1; 120 return -1;
121 } 121 }
122 if ( !sshot ) (int) type |= (int) Multi; 122 if ( !sshot ) type = static_cast<OFileNotificationType>( (int) type | (int) Multi );
123 result = ::fcntl( fd, F_NOTIFY, type ); 123 result = ::fcntl( fd, F_NOTIFY, type );
124 if ( result == -1 ) 124 if ( result == -1 )
125 { 125 {
126 qWarning( "OFileNotification::start(): Can't subscribe to '%s': %s.", (const char*) dirpath, strerror( errno ) ); 126 qWarning( "OFileNotification::start(): Can't subscribe to '%s': %s.", (const char*) dirpath, strerror( errno ) );
127 return -1; 127 return -1;
128 } 128 }
@@ -296,12 +296,13 @@ bool OFileNotification::registerSignalHandler()
296 if ( ::sigaction( SIGRTMIN, &act, NULL ) == -1 ) 296 if ( ::sigaction( SIGRTMIN, &act, NULL ) == -1 )
297 { 297 {
298 qWarning( "OFileNotification::registerSignalHandler(): couldn't register signal handler: %s", strerror( errno ) ); 298 qWarning( "OFileNotification::registerSignalHandler(): couldn't register signal handler: %s", strerror( errno ) );
299 return false; 299 return false;
300 } 300 }
301 qDebug( "OFileNotification::registerSignalHandler(): done" ); 301 qDebug( "OFileNotification::registerSignalHandler(): done" );
302 return true;
302} 303}
303 304
304 305
305void OFileNotification::unregisterSignalHandler() 306void OFileNotification::unregisterSignalHandler()
306{ 307{
307 struct sigaction act; 308 struct sigaction act;