SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always use our own MAX/MIN definitions

Browse Source 
code in src/shared/macro.h only defined MAX/MIN in case
they were not defined previously. however the MAX/MIN
macros implemented in glibc are not of the "safe" kind but defined
as:

define MIN(a,b) (((a)<(b))?(a):(b))
define MAX(a,b) (((a)>(b))?(a):(b))

Avoid nasty side effects by using our own versions instead.

Also fix the warnings derived from this change.

[zj: - modify MAX3 macro to fix warning about _a shadowing _a,
     - do bootchart/svg.c too,
     - remove unused MIN3.]
This commit is contained in:
Cristian Rodríguez
2013-04-01 23:43:48 -04:00
committed by Zbigniew Jędrzejewski-Szmek
parent e5ec62c569
commit 9607d9470e
7 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bootchart/svg.c
+8 -11
View File
@@ -44,9 +44,6 @@
#define kb_to_graph(m) ((m) * arg_scale_y * 0.0001)
#define to_color(n) (192.0 - ((n) * 192.0))
#define max(x, y) (((x) > (y)) ? (x) : (y))
#define min(x, y) (((x) < (y)) ? (x) : (y))
static char str[8092];
#define svg(a...) do { snprintf(str, 8092, ## a); fputs(str, of); fflush(of); } while (0)
@@ -441,8 +438,8 @@ static void svg_io_bi_bar(void) {
int stop;
double tot;
start = max(i - ((range / 2) - 1), 0);
stop = min(i + (range / 2), samples - 1);
start = MAX(i - ((range / 2) - 1), 0);
stop = MIN(i + (range / 2), samples - 1);
tot = (double)(blockstat[stop].bi - blockstat[start].bi)
/ (stop - start);
@@ -463,8 +460,8 @@ static void svg_io_bi_bar(void) {
double tot;
double pbi;
start = max(i - ((range / 2) - 1), 0);
stop = min(i + (range / 2), samples);
start = MAX(i - ((range / 2) - 1), 0);
stop = MIN(i + (range / 2), samples);
tot = (double)(blockstat[stop].bi - blockstat[start].bi)
/ (stop - start);
@@ -517,8 +514,8 @@ static void svg_io_bo_bar(void) {
int stop;
double tot;
start = max(i - ((range / 2) - 1), 0);
stop = min(i + (range / 2), samples - 1);
start = MAX(i - ((range / 2) - 1), 0);
stop = MIN(i + (range / 2), samples - 1);
tot = (double)(blockstat[stop].bi - blockstat[start].bi)
/ (stop - start);
@@ -539,8 +536,8 @@ static void svg_io_bo_bar(void) {
double tot;
double pbo;
start = max(i - ((range / 2) - 1), 0);
stop = min(i + (range / 2), samples);
start = MAX(i - ((range / 2) - 1), 0);
stop = MIN(i + (range / 2), samples);
tot = (double)(blockstat[stop].bo - blockstat[start].bo)
/ (stop - start);