Skip to content

Commit f337ba7

Browse files
authored
Merge pull request #31 from vgropp/prepare-0.6.3
feat: version bump to 0.6.3
2 parents b965470 + a034583 commit f337ba7

File tree

5 files changed

+22
-15
lines changed

5 files changed

+22
-15
lines changed

ChangeLog

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2021-01-10 (0.6.3) Volker Gropp <bwmng(at)gropp.org>
2+
3+
* remove outdated copyright and email
4+
* Merge pull request #25 from fweimer/patch-1 AC_QEF_C_NORETURN: Include <stdlib.h> for exit
5+
* Merge pull request #27 from ofalk/master Fix potential write to unallocated memory.
6+
* Merge pull request #28 from vgropp/#2-fix-csv-bits feat: #2 output bits in csv
7+
* Merge pull request #29 from vgropp/#2-fix-csv-bits fix(doc): #2 output bits in csv
8+
* Merge pull request #32 from vgropp/new-netstat-#5 feat: add support for newer (2016+) linux netstat #5
9+
110
2019-01-01 14:50 (0.6.2) Volker Gropp <bwmng(at)gropp.org>
211

312
* Merge pull request #22 from vgropp/issue-#13 to fix windows build

NEWS

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
Changes in 0.6.2:
2-
3-
- Merge pull request #22 from vgropp/issue-#13 to fix windows build
4-
- Merge pull request #20 from dreibh/master CSV file output: fix for timestamp inaccuracy and Y-2038 problem
5-
- Merge pull request #21 from vgropp/travisci add travisci
6-
- Merge pull request #17 from Himura2la/master Add the started time in "sum" mode
7-
- Merge pull request #18 from Himura2la/fix-dynamic Fix DYNAMIC and ANSIOUT in config
8-
- Merge pull request #10 from SoapGentoo/fixes Use `static inline` instead of `inline`
9-
- Merge pull request #9 from adventureloop/master Always fflush the pipe
10-
- Merge pull request #7 from samueloph/fsf_address_clean Update FSF address
11-
- Merge pull request #6 from samueloph/master Fix typos
12-
- fix nan and inf values on fast refresh (fixes debian bug #532331)
1+
Changes in 0.6.3:
132

3+
* remove outdated copyright and email
4+
* Merge pull request #25 from fweimer/patch-1 AC_QEF_C_NORETURN: Include <stdlib.h> for exit
5+
* Merge pull request #27 from ofalk/master Fix potential write to unallocated memory.
6+
* Merge pull request #28 from vgropp/#2-fix-csv-bits feat: #2 output bits in csv
7+
* Merge pull request #29 from vgropp/#2-fix-csv-bits fix(doc): #2 output bits in csv
8+
* Merge pull request #32 from vgropp/new-netstat-#5 feat: add support for newer (2016+) linux netstat #5

README

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
bwm-ng v0.6.2
2-
Copyright (C) 2004-2019 Volker Gropp ([email protected])
1+
bwm-ng v0.6.3
2+
Copyright (C) 2004-2021 Volker Gropp ([email protected])
33
http://www.gropp.org/?id=projects&sub=bwm-ng
44

55
What is this?

configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- Autoconf -*-
22
# Process this file with autoconf to produce a configure script.
33

4-
AC_INIT([bwm-ng],[0.6.2],[[email protected]],[bwm-ng])
4+
AC_INIT([bwm-ng],[0.6.3],[[email protected]],[bwm-ng])
55
AC_CONFIG_SRCDIR(src/bwm-ng.c)
66
AM_INIT_AUTOMAKE([gnu])
77
AC_CONFIG_HEADERS(config.h)

src/output.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,9 @@ void print_values(unsigned int y,unsigned int x,const char *if_name,t_iface_spee
560560
fprintf(tmp_out_file,"%.2f%c%.2f%c%llu%c%llu%c",stats_csv->errors.out*multiplier,csv_char,stats_csv->errors.in*multiplier,csv_char,stats_csv->errors.in,
561561
csv_char,stats_csv->errors.out,csv_char);
562562
/* show bits/s */
563+
#if !NETSTAT_BSD_BYTES && !NETSTAT_NETBSD && NETSTAT
564+
if (input_method!=NETSTAT_IN)
565+
#endif
563566
fprintf(tmp_out_file,"%.2f%c%.2f%c%.2f%c%llu%c%llu\n",(double)(stats_csv->bytes.out*multiplier*8),csv_char,(double)(stats_csv->bytes.in*multiplier*8),
564567
csv_char,(double)((stats_csv->bytes.out+stats_csv->bytes.in)*multiplier*8),csv_char,stats_csv->bytes.in*8,csv_char,stats_csv->bytes.out*8);
565568
fflush(tmp_out_file);

0 commit comments

Comments
 (0)