Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 611418 | Differences between
and this patch

Collapse All | Expand All

(-)a/panel-plugin/devperf.c (-7 / +6 lines)
Lines 69-75 static int DevGetPerfData1 (dev_t p_iDevice, struct devperf_t *p_poPerf) Link Here
69
	iMinorNo = minor(p_iDevice);
69
	iMinorNo = minor(p_iDevice);
70
    struct timeval  oTimeStamp;
70
    struct timeval  oTimeStamp;
71
    FILE           *pF;
71
    FILE           *pF;
72
    unsigned int    major, minor, rsect, wsect, ruse, wuse, use;
72
    unsigned int    majorNo, minorNo, rsect, wsect, ruse, wuse, use;
73
    int             running;
73
    int             running;
74
    char            acStats[128];
74
    char            acStats[128];
75
    int             c, n;
75
    int             c, n;
Lines 80-89 static int DevGetPerfData1 (dev_t p_iDevice, struct devperf_t *p_poPerf) Link Here
80
	return (-1);
80
	return (-1);
81
    }
81
    }
82
    while (1) {
82
    while (1) {
83
	n = fscanf (pF, "%u %u", &major, &minor);
83
	n = fscanf (pF, "%u %u", &majorNo, &minorNo);
84
	if (n != 2)
84
	if (n != 2)
85
	    goto Error;
85
	    goto Error;
86
	if ((major != iMajorNo) || (minor != iMinorNo)) {
86
	if ((majorNo != iMajorNo) || (minorNo != iMinorNo)) {
87
	    while ((c = fgetc (pF)) && (c != '\n'));	/* Goto next line */
87
	    while ((c = fgetc (pF)) && (c != '\n'));	/* Goto next line */
88
	    continue;
88
	    continue;
89
	}
89
	}
Lines 126-132 static int DevGetPerfData2 (dev_t p_iDevice, struct devperf_t *p_poPerf) Link Here
126
	iMinorNo = p_iDevice & 0xFF;
126
	iMinorNo = p_iDevice & 0xFF;
127
    struct timeval  oTimeStamp;
127
    struct timeval  oTimeStamp;
128
    FILE           *pF;
128
    FILE           *pF;
129
    unsigned int    major, minor, rsect, wsect, ruse, wuse, use;
129
    unsigned int    majorNo, minorNo, rsect, wsect, ruse, wuse, use;
130
    int             running;
130
    int             running;
131
    int             c, n;
131
    int             c, n;
132
132
Lines 138-146 static int DevGetPerfData2 (dev_t p_iDevice, struct devperf_t *p_poPerf) Link Here
138
    while ((c = fgetc (pF)) && (c != '\n'));	/* Skip the header line */
138
    while ((c = fgetc (pF)) && (c != '\n'));	/* Skip the header line */
139
    while ((n = fscanf (pF,
139
    while ((n = fscanf (pF,
140
			"%u %u %*u %*s %*u %*u %u %u %*u %*u %u %u %d %u %*u",
140
			"%u %u %*u %*s %*u %*u %u %u %*u %*u %u %u %d %u %*u",
141
			&major, &minor, &rsect, &ruse, &wsect,
141
			&majorNo, &minorNo, &rsect, &ruse, &wsect,
142
			&wuse, &running, &use)) == 8)
142
			&wuse, &running, &use)) == 8)
143
	if ((major == iMajorNo) && (minor == iMinorNo)) {
143
	if ((majorNo == iMajorNo) && (minorNo == iMinorNo)) {
144
	    fclose (pF);
144
	    fclose (pF);
145
	    gettimeofday (&oTimeStamp, 0);
145
	    gettimeofday (&oTimeStamp, 0);
146
	    p_poPerf->timestamp_ns =
146
	    p_poPerf->timestamp_ns =
147
- 

Return to bug 611418