Somewhat more pedantic fix.

This commit is contained in:
espie 2001-08-21 13:43:34 +00:00
parent 9917e245b7
commit 2b14d32111

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-kcontrol_info_info_openbsd_cpp,v 1.3 2001/08/20 23:42:08 espie Exp $ $OpenBSD: patch-kcontrol_info_info_openbsd_cpp,v 1.4 2001/08/21 13:43:34 espie Exp $
--- kcontrol/info/info_openbsd.cpp.orig Mon Aug 20 23:06:21 2001 --- kcontrol/info/info_openbsd.cpp.orig Mon Aug 20 23:06:21 2001
+++ kcontrol/info/info_openbsd.cpp Mon Aug 20 23:42:29 2001 +++ kcontrol/info/info_openbsd.cpp Mon Aug 20 23:42:29 2001
@@ -122,7 +122,7 @@ static bool GetDmesgInfo(QListView *lBox @@ -122,7 +122,7 @@ static bool GetDmesgInfo(QListView *lBox
@ -6,7 +6,7 @@ $OpenBSD: patch-kcontrol_info_info_openbsd_cpp,v 1.3 2001/08/20 23:42:08 espie E
QListViewItem *olditem = NULL; QListViewItem *olditem = NULL;
- while((s = t->readLine()) != "") { - while((s = t->readLine()) != "") {
+ while((s = t->readLine()) != "" && s != NULL) { + while (!(s = t->readLine()).isNull()) {
if (!seencpu) { if (!seencpu) {
if (s.contains("cpu")) if (s.contains("cpu"))
seencpu = true; seencpu = true;
@ -15,7 +15,7 @@ $OpenBSD: patch-kcontrol_info_info_openbsd_cpp,v 1.3 2001/08/20 23:42:08 espie E
QListViewItem *olditem = 0; QListViewItem *olditem = 0;
- while ((s = t->readLine()) != "") { - while ((s = t->readLine()) != "") {
+ while ((s = t->readLine()) != "" && s != NULL) { + while (!(s = t->readLine()).isNull()) {
orig_line = line = strdup(s.latin1()); orig_line = line = strdup(s.latin1());
device = strsep(&line, " "); device = strsep(&line, " ");