summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-05-25 19:03:26 (UTC)
committer mickeyl <mickeyl>2005-05-25 19:03:26 (UTC)
commit8d2d91b9b6e590e474fe3acd92f71e40779a493b (patch) (unidiff)
tree877bf0b4c6a23892ed0d2d2a0a3e3aa7b82ee2a1
parent5fdc5b4cba7743947a23840ba09fadcc7414309b (diff)
downloadopie-8d2d91b9b6e590e474fe3acd92f71e40779a493b.zip
opie-8d2d91b9b6e590e474fe3acd92f71e40779a493b.tar.gz
opie-8d2d91b9b6e590e474fe3acd92f71e40779a493b.tar.bz2
be nice to gcc 3.3
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp
index 7bd7178..0f7ff46 100644
--- a/libopie2/opiecore/linux/opcmciasystem.cpp
+++ b/libopie2/opiecore/linux/opcmciasystem.cpp
@@ -169,49 +169,49 @@ OPcmciaSystem::CardIterator OPcmciaSystem::iterator() const
169 *======================================================================================*/ 169 *======================================================================================*/
170 170
171OPcmciaSocket::OPcmciaSocket( int major, int socket, QObject* parent, const char* name ) 171OPcmciaSocket::OPcmciaSocket( int major, int socket, QObject* parent, const char* name )
172 :QObject( parent, name ), _major( major ), _socket( socket ) 172 :QObject( parent, name ), _major( major ), _socket( socket )
173{ 173{
174 qDebug( "OPcmciaSocket::OPcmciaSocket()" ); 174 qDebug( "OPcmciaSocket::OPcmciaSocket()" );
175 175
176 init(); 176 init();
177 buildInformation(); 177 buildInformation();
178} 178}
179 179
180 180
181OPcmciaSocket::~OPcmciaSocket() 181OPcmciaSocket::~OPcmciaSocket()
182{ 182{
183 qDebug( "OPcmciaSocket::~OPcmciaSocket()" ); 183 qDebug( "OPcmciaSocket::~OPcmciaSocket()" );
184 cleanup(); 184 cleanup();
185} 185}
186 186
187 187
188/* internal */ void OPcmciaSocket::init() 188/* internal */ void OPcmciaSocket::init()
189{ 189{
190 // open control socket and gather file descriptor 190 // open control socket and gather file descriptor
191 if ( _major ) 191 if ( _major )
192 { 192 {
193 dev_t dev = ::makedev( _major, _socket ); 193 dev_t dev = makedev( _major, _socket );
194 QString filename = QString().sprintf( "/tmp/opcmciasystem-%d", ::getpid() ); 194 QString filename = QString().sprintf( "/tmp/opcmciasystem-%d", ::getpid() );
195 if ( ::mknod( (const char*) filename, ( S_IFCHR|S_IREAD|S_IWRITE ), dev ) == 0 ) 195 if ( ::mknod( (const char*) filename, ( S_IFCHR|S_IREAD|S_IWRITE ), dev ) == 0 )
196 { 196 {
197 _fd = ::open( (const char*) filename, O_RDONLY); 197 _fd = ::open( (const char*) filename, O_RDONLY);
198 if ( !_fd ) 198 if ( !_fd )
199 { 199 {
200 qWarning( "OPcmciaSocket::init() - can't open control socket (%s)", strerror( errno ) ); 200 qWarning( "OPcmciaSocket::init() - can't open control socket (%s)", strerror( errno ) );
201 } 201 }
202 else 202 else
203 { 203 {
204 ::unlink( (const char*) filename ); 204 ::unlink( (const char*) filename );
205 } 205 }
206 } 206 }
207 else 207 else
208 { 208 {
209 qWarning( "OPcmciaSocket::init() - can't create device node (%s)", strerror( errno ) ); 209 qWarning( "OPcmciaSocket::init() - can't create device node (%s)", strerror( errno ) );
210 } 210 }
211 } 211 }
212} 212}
213 213
214/* internal */ void OPcmciaSocket::buildInformation() 214/* internal */ void OPcmciaSocket::buildInformation()
215{ 215{
216 cistpl_vers_1_t *vers = &_ioctlarg.tuple_parse.parse.version_1; 216 cistpl_vers_1_t *vers = &_ioctlarg.tuple_parse.parse.version_1;
217 cistpl_manfid_t *manfid = &_ioctlarg.tuple_parse.parse.manfid; 217 cistpl_manfid_t *manfid = &_ioctlarg.tuple_parse.parse.manfid;