← Back to branch summary

~ubuntu-branches/ubuntu/saucy/sysstat/saucy

« back to all changes in this revision

Viewing changes to .pc/06-exec.patch/sar.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Luberda
  • Date: 2011-08-28 19:50:36 UTC
  • mfrom: (1.1.22 upstream) (2.1.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110828195036-5zk8yk5cbeeli0ml
Tags: 10.0.2-1
http://bugs.debian.org/619949
https://launchpad.net/bugs/342655
* New upstream (stable) release.
* debian/control: Set architecture to linux-any (closes: #619949).
* The debconf message has already been ixed in 8.1.8-2, (LP: #342655).

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/06-exec.patch/sar.c
392
392
                
393
393
                if (IS_SELECTED(act[i]->options) && (act[i]->nr > 0)) {
394
394
                        /* Display current average activity statistics */
395
 
                        if (NEEDS_GLOBAL_ITV(act[i]->options))
396
 
                                (*act[i]->f_print_avg)(act[i], 2, curr, g_itv);
397
 
                        else
398
 
                                (*act[i]->f_print_avg)(act[i], 2, curr, itv);
 
395
                        (*act[i]->f_print_avg)(act[i], 2, curr,
 
396
                                               NEED_GLOBAL_ITV(act[i]->options) ? g_itv : itv);
399
397
                }
400
398
        }
401
399
 
501
499
 
502
500
                if (IS_SELECTED(act[i]->options) && (act[i]->nr > 0)) {
503
501
                        /* Display current activity statistics */
504
 
                        if (NEEDS_GLOBAL_ITV(act[i]->options))
505
 
                                (*act[i]->f_print)(act[i], !curr, curr, g_itv);
506
 
                        else
507
 
                                (*act[i]->f_print)(act[i], !curr, curr, itv);
 
502
                        (*act[i]->f_print)(act[i], !curr, curr,
 
503
                                           NEED_GLOBAL_ITV(act[i]->options) ? g_itv : itv);
508
504
                }
509
505
        }
510
506