| author | mickeyl <mickeyl> | 2005-06-22 14:12:45 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2005-06-22 14:12:45 (UTC) |
| commit | 4775588885d60ea208c667a5863244a847a69f94 (patch) (side-by-side diff) | |
| tree | ee6d5b1388a7b92dba2188af52995cefc4164d74 | |
| parent | c7d80acef0bab4babadac288796117987bb4e846 (diff) | |
| download | opie-4775588885d60ea208c667a5863244a847a69f94.zip opie-4775588885d60ea208c667a5863244a847a69f94.tar.gz opie-4775588885d60ea208c667a5863244a847a69f94.tar.bz2 | |
respect number of product strings in CIS data
| -rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp index 2b0c01d..a5725f1 100644 --- a/libopie2/opiecore/linux/opcmciasystem.cpp +++ b/libopie2/opiecore/linux/opcmciasystem.cpp @@ -339,11 +339,13 @@ bool OPcmciaSocket::reset() QStringList OPcmciaSocket::productIdentity() const { QStringList list; cistpl_vers_1_t *vers = &_ioctlarg.tuple_parse.parse.version_1; + vers->ns = 0; // number of strings if ( getTuple( CISTPL_VERS_1 ) ) { - for ( int i = 0; i < CISTPL_VERS_1_MAX_PROD_STRINGS; ++i ) + qDebug( " NUMBER_OF_PRODIDs = %d", vers->ns ); + for ( int i = 0; i < QMIN( CISTPL_VERS_1_MAX_PROD_STRINGS, vers->ns ); ++i ) { qDebug( " PRODID = '%s'", vers->str+vers->ofs[i] ); list += vers->str+vers->ofs[i]; } |