diff options
| author | Irene Rüngeler <I.Ruengeler@fh-muenster.de> | 2013-12-17 08:56:47 +0000 |
|---|---|---|
| committer | Irene Rüngeler <I.Ruengeler@fh-muenster.de> | 2013-12-17 08:56:47 +0000 |
| commit | 25a74d3f2aaff7c0273d66c0313ed172d3f37662 (patch) | |
| tree | b8e37257300ad5cacfbb666ceefbaff4070ac7c6 /ui | |
| parent | 555b8a581abdad4b88d15ecaf3ac5ab817f60478 (diff) | |
Fill the chunk statistics. Read line with fgets instead of getline.
svn path=/trunk/; revision=54166
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/sctp_chunk_statistics_dialog.cpp | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/ui/qt/sctp_chunk_statistics_dialog.cpp b/ui/qt/sctp_chunk_statistics_dialog.cpp index 45f48dac22..bd80afa85c 100644 --- a/ui/qt/sctp_chunk_statistics_dialog.cpp +++ b/ui/qt/sctp_chunk_statistics_dialog.cpp @@ -92,7 +92,6 @@ void SCTPChunkStatisticsDialog::initializeChunkMap() void SCTPChunkStatisticsDialog::fillTable(bool all) { -#if 0 FILE* fp; pref_t *pref = prefs_find_preference(prefs_find_module("sctp"),"statistics_chunk_types"); @@ -128,24 +127,23 @@ void SCTPChunkStatisticsDialog::fillTable(bool all) for (int i = 0; i < chunks.size(); i++) { if (chunks.value(i).hide) { ui->tableWidget->setRowCount(ui->tableWidget->rowCount()+1); - /* ui->tableWidget->setVerticalHeaderItem(j, new QTableWidgetItem(QString("%1").arg(chunks.value(i).name))); + ui->tableWidget->setVerticalHeaderItem(j, new QTableWidgetItem(QString("%1").arg(chunks.value(i).name))); ui->tableWidget->setItem(j,0, new QTableWidgetItem(QString("%1").arg(selected_assoc->chunk_count[chunks.value(i).id]))); ui->tableWidget->setItem(j,1, new QTableWidgetItem(QString("%1").arg(selected_assoc->ep1_chunk_count[chunks.value(i).id]))); - ui->tableWidget->setItem(j,2, new QTableWidgetItem(QString("%1").arg(selected_assoc->ep2_chunk_count[chunks.value(i).id])));*/ + ui->tableWidget->setItem(j,2, new QTableWidgetItem(QString("%1").arg(selected_assoc->ep2_chunk_count[chunks.value(i).id]))); ui->tableWidget->hideRow(j); j++; } } } else { - char* line = NULL; - size_t cap = 0; - ssize_t len; + char line[100]; + size_t cap = 100; char *token, id[5]; int i = 0, j = 0; struct chunkTypes temp; - getline(&line, &cap, fp); - while ((len = getline(&line, &cap, fp)) > 0 ) { + fgets(line, cap, fp); + while (fgets(line, cap, fp)) { token = strtok(line, ","); /* Get rid of the quotation marks */ QString ch = QString(token).mid(1, (int)strlen(token)-2); @@ -179,22 +177,16 @@ void SCTPChunkStatisticsDialog::fillTable(bool all) for (int i = 0; i < chunks.size(); i++) { if (chunks.value(i).hide) { ui->tableWidget->setRowCount(ui->tableWidget->rowCount()+1); - /* ui->tableWidget->setVerticalHeaderItem(j, new QTableWidgetItem(QString("%1").arg(chunks.value(i).name))); + ui->tableWidget->setVerticalHeaderItem(j, new QTableWidgetItem(QString("%1").arg(chunks.value(i).name))); ui->tableWidget->setItem(j,0, new QTableWidgetItem(QString("%1").arg(selected_assoc->chunk_count[chunks.value(i).id]))); ui->tableWidget->setItem(j,1, new QTableWidgetItem(QString("%1").arg(selected_assoc->ep1_chunk_count[chunks.value(i).id]))); - ui->tableWidget->setItem(j,2, new QTableWidgetItem(QString("%1").arg(selected_assoc->ep2_chunk_count[chunks.value(i).id])));*/ + ui->tableWidget->setItem(j,2, new QTableWidgetItem(QString("%1").arg(selected_assoc->ep2_chunk_count[chunks.value(i).id]))); ui->tableWidget->hideRow(j); j++; } } fclose(fp); } -#else - // FIXME IRENE - if (all) { - all = FALSE; - } -#endif } void SCTPChunkStatisticsDialog::contextMenuEvent( QContextMenuEvent * event) |