gcc 4.1 police

2 files changed, 210 insertions, 1 deletions

diff --git a/sysutils/xuvmstat/distinfo b/sysutils/xuvmstat/distinfo
index 9eaffbfbe76..a0102ae91f4 100644
--- a/sysutils/xuvmstat/distinfo
+++ b/sysutils/xuvmstat/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/09/13 12:43:48 wiz Exp $
+$NetBSD: distinfo,v 1.7 2006/06/02 09:52:31 martin Exp $
 
 SHA1 (xuvmstat20050909.tar.gz) = b8118b1b11c260683ff14fe2200e9ee584f6b7c5
 RMD160 (xuvmstat20050909.tar.gz) = 6400ee7e396c410bf22ef9673b27b909f2a29a68
 Size (xuvmstat20050909.tar.gz) = 7661 bytes
+SHA1 (patch-aa) = bbc7cf4b0fe8b8ae1f79519ff19b4e31467bd0de
diff --git a/sysutils/xuvmstat/patches/patch-aa b/sysutils/xuvmstat/patches/patch-aa
new file mode 100644
index 00000000000..76d0b40d7b5
--- /dev/null
+++ b/sysutils/xuvmstat/patches/patch-aa
@@ -0,0 +1,208 @@
+$NetBSD: patch-aa,v 1.7 2006/06/02 09:52:31 martin Exp $
+
+--- xuvmstat.c.orig	2006-06-02 11:45:59.000000000 +0200
++++ xuvmstat.c	2006-06-02 11:46:59.000000000 +0200
+@@ -46,7 +46,7 @@ void redraw __P((struct xdpy *, Window, 
+ 
+ u_long black, white, red, green, blue, magenta, orange, purple;
+ XFontStruct *fnt_fixed, *fnt_8x13bold;
+-struct uvmexp cexp, oexp;	/* current, old */
++struct uvmexp curexp, oexp;	/* current, old */
+ struct timeval tv, otv;
+ struct graph *gp_faults, *gp_traps, *gp_intrs, *gp_ctx;
+ 
+@@ -100,7 +100,7 @@ char **argv;
+   XMapRaised(xdpy.dpy, win);
+   XFlush(xdpy.dpy);
+ 
+-  get_uvmexp(&cexp);
++  get_uvmexp(&curexp);
+   gettimeofday(&tv, NULL);
+   get_uvmexp(&oexp);
+   gettimeofday(&otv, NULL);
+@@ -135,8 +135,8 @@ char **argv;
+       if (retval == 0) {
+         timeradd(&now, &incr, &ping);
+         otv = tv;
+-        oexp = cexp;
+-        get_uvmexp(&cexp);
++        oexp = curexp;
++        get_uvmexp(&curexp);
+         gettimeofday(&tv, NULL);
+         /* NEW GRAPH DATA HERE */
+ 
+@@ -186,7 +186,7 @@ int was_timeout;
+ 
+   XSetFont(xdpy->dpy, gc, fnt_fixed->fid); 
+   snprintf(buf, sizeof(buf),"The UVM system manages %d %d-byte pages",
+-	   cexp.npages, cexp.pagesize);
++	   curexp.npages, curexp.pagesize);
+   XDrawImageString(xdpy->dpy, win, gc, 5, get_fontheight(fnt_fixed) + y,
+ 		   buf, strlen(buf)); 
+   y += get_fontheight(fnt_fixed) + 5;
+@@ -205,12 +205,12 @@ int was_timeout;
+       colors[4] = purple;
+     }
+  
+-    vals[0] = cexp.active;
+-    vals[1] = cexp.inactive;
+-    vals[2] = cexp.free;
+-    vals[3] = cexp.wired;
+-    vals[4] = cexp.npages - (vals[0]+vals[1]+vals[2]+vals[3]);
+-    y = draw_barbox(xdpy, win, gc, fnt_fixed, 5, 295, y, 5, cexp.npages, names,
++    vals[0] = curexp.active;
++    vals[1] = curexp.inactive;
++    vals[2] = curexp.free;
++    vals[3] = curexp.wired;
++    vals[4] = curexp.npages - (vals[0]+vals[1]+vals[2]+vals[3]);
++    y = draw_barbox(xdpy, win, gc, fnt_fixed, 5, 295, y, 5, curexp.npages, names,
+ 		  vals, colors, white);
+   }
+ 
+@@ -229,12 +229,12 @@ int was_timeout;
+       colors[4] = purple;
+     } 
+   
+-    vals[0] = cexp.filepages;
+-    vals[1] = cexp.anonpages;
+-    vals[2] = cexp.execpages;
+-    vals[3] = cexp.free;
+-    vals[4] = cexp.npages - (vals[0]+vals[1]+vals[2]+vals[3]);
+-    y = draw_barbox(xdpy, win, gc, fnt_fixed, 5, 295, y, 5, cexp.npages, names,
++    vals[0] = curexp.filepages;
++    vals[1] = curexp.anonpages;
++    vals[2] = curexp.execpages;
++    vals[3] = curexp.free;
++    vals[4] = curexp.npages - (vals[0]+vals[1]+vals[2]+vals[3]);
++    y = draw_barbox(xdpy, win, gc, fnt_fixed, 5, 295, y, 5, curexp.npages, names,
+                   vals, colors, white);
+   }
+ 
+@@ -245,11 +245,11 @@ int was_timeout;
+     u_long vals[3];
+     u_long colors[3];
+ 
+-    vals[0] = cexp.freemin;  colors[0] = black;
+-    vals[1] = cexp.freetarg; colors[1] = black;
+-    vals[2] = cexp.free;     colors[2] = green;
++    vals[0] = curexp.freemin;  colors[0] = black;
++    vals[1] = curexp.freetarg; colors[1] = black;
++    vals[2] = curexp.free;     colors[2] = green;
+ 
+-    y = draw_barlvl(xdpy, win, gc, fnt_fixed, 5, 295, y, 3, cexp.npages, names,
++    y = draw_barlvl(xdpy, win, gc, fnt_fixed, 5, 295, y, 3, curexp.npages, names,
+ 		vals, colors, white);
+   }
+ 
+@@ -260,10 +260,10 @@ int was_timeout;
+     u_long vals[2];
+     u_long colors[2];
+ 
+-    vals[0] = cexp.inactarg;  colors[0] = black;
+-    vals[1] = cexp.inactive;  colors[1] = blue;
++    vals[0] = curexp.inactarg;  colors[0] = black;
++    vals[1] = curexp.inactive;  colors[1] = blue;
+ 
+-    y = draw_barlvl(xdpy, win, gc, fnt_fixed, 5, 295, y, 2, cexp.npages, names,
++    y = draw_barlvl(xdpy, win, gc, fnt_fixed, 5, 295, y, 2, curexp.npages, names,
+ 		vals, colors, white);
+   }
+ 
+@@ -274,10 +274,10 @@ int was_timeout;
+     u_long vals[2];
+     u_long colors[2];
+ 
+-    vals[0] = cexp.wiredmax;  colors[0] = black;
+-    vals[1] = cexp.wired;     colors[1] = orange;
++    vals[0] = curexp.wiredmax;  colors[0] = black;
++    vals[1] = curexp.wired;     colors[1] = orange;
+ 
+-    y = draw_barlvl(xdpy, win, gc, fnt_fixed, 5, 295, y, 2, cexp.npages, names,
++    y = draw_barlvl(xdpy, win, gc, fnt_fixed, 5, 295, y, 2, curexp.npages, names,
+ 		vals, colors, white);
+   }
+ 
+@@ -292,12 +292,12 @@ int was_timeout;
+       static int *before[6], *after[6];
+       static u_long color[6];
+       init = 1;
+-      before[0] = &oexp.faults; after[0] = &cexp.faults; color[0] = black;
+-      before[1] = &oexp.flt_anon; after[1] = &cexp.flt_anon; color[1] = red;
+-      before[2] = &oexp.flt_acow; after[2] = &cexp.flt_acow; color[2] = blue;
+-      before[3] = &oexp.flt_obj; after[3] = &cexp.flt_obj; color[3] = green;
+-      before[4] = &oexp.flt_prcopy; after[4] = &cexp.flt_prcopy; color[4] = orange;
+-      before[5] = &oexp.flt_przero; after[5] = &cexp.flt_przero; color[5] = purple;
++      before[0] = &oexp.faults; after[0] = &curexp.faults; color[0] = black;
++      before[1] = &oexp.flt_anon; after[1] = &curexp.flt_anon; color[1] = red;
++      before[2] = &oexp.flt_acow; after[2] = &curexp.flt_acow; color[2] = blue;
++      before[3] = &oexp.flt_obj; after[3] = &curexp.flt_obj; color[3] = green;
++      before[4] = &oexp.flt_prcopy; after[4] = &curexp.flt_prcopy; color[4] = orange;
++      before[5] = &oexp.flt_przero; after[5] = &curexp.flt_przero; color[5] = purple;
+       gp_faults = create_graph(6, "FAULTS", names, before, after, color, white);
+     }  
+ 
+@@ -314,7 +314,7 @@ int was_timeout;
+       static int *before[1], *after[1];
+       static u_long color[1];
+       init = 1;
+-      before[0] = &oexp.traps; after[0] = &cexp.traps; color[0] = black;
++      before[0] = &oexp.traps; after[0] = &curexp.traps; color[0] = black;
+       gp_traps = create_graph(1, "TRAPS", names, before, after, color, white);
+     }  
+ 
+@@ -333,9 +333,9 @@ int was_timeout;
+       static int *before[3], *after[3];
+       static u_long color[3];
+       init = 1;
+-      before[0] = &oexp.intrs; after[0] = &cexp.intrs; color[0] = black;
+-      before[1] = &oexp.softs; after[1] = &cexp.softs; color[1] = blue;
+-      before[2] = &oexp.syscalls; after[2] = &cexp.syscalls; color[2] = red;
++      before[0] = &oexp.intrs; after[0] = &curexp.intrs; color[0] = black;
++      before[1] = &oexp.softs; after[1] = &curexp.softs; color[1] = blue;
++      before[2] = &oexp.syscalls; after[2] = &curexp.syscalls; color[2] = red;
+       gp_intrs = create_graph(3, "INTRS", names, before, after, color, white);
+     }  
+ 
+@@ -352,9 +352,9 @@ int was_timeout;
+       static int *before[3], *after[3];
+       static u_long color[3];
+       init = 1;
+-      before[0] = &oexp.swtch; after[0] = &cexp.swtch; color[0] = black;
+-      before[1] = &oexp.swapins; after[1] = &cexp.swapins; color[1] = green;
+-      before[2] = &oexp.swapouts; after[2] = &cexp.swapouts; color[2] = red;
++      before[0] = &oexp.swtch; after[0] = &curexp.swtch; color[0] = black;
++      before[1] = &oexp.swapins; after[1] = &curexp.swapins; color[1] = green;
++      before[2] = &oexp.swapouts; after[2] = &curexp.swapouts; color[2] = red;
+       gp_ctx = create_graph(3, "SWITCH/SWAP", names, before, after, color, white);
+     }  
+ 
+@@ -373,25 +373,25 @@ int was_timeout;
+     y += get_fontheight(fnt_fixed) + 5;
+ 
+     snprintf(buf, sizeof(buf), " woke=%d, revs=%d, swout=%d",
+-	cexp.pdwoke, cexp.pdrevs, cexp.pdswout);
++	curexp.pdwoke, curexp.pdrevs, curexp.pdswout);
+     XDrawImageString(xdpy->dpy, win, gc, 5, get_fontheight(fnt_fixed) + y,
+ 		   buf, strlen(buf)); 
+     y += get_fontheight(fnt_fixed) + 1;
+ 
+     snprintf(buf, sizeof(buf), " scans=%d, anon_scans=%d, obj_scans=%d",
+-	cexp.pdscans, cexp.pdanscan, cexp.pdobscan);
++	curexp.pdscans, curexp.pdanscan, curexp.pdobscan);
+     XDrawImageString(xdpy->dpy, win, gc, 5, get_fontheight(fnt_fixed) + y,
+ 		   buf, strlen(buf)); 
+     y += get_fontheight(fnt_fixed) + 1;
+ 
+     snprintf(buf, sizeof(buf), " busy=%d, freed=%d, pending=%d",
+-	cexp.pdbusy, cexp.pdfreed, cexp.pdpending);
++	curexp.pdbusy, curexp.pdfreed, curexp.pdpending);
+     XDrawImageString(xdpy->dpy, win, gc, 5, get_fontheight(fnt_fixed) + y,
+ 		   buf, strlen(buf)); 
+     y += get_fontheight(fnt_fixed) + 1;
+ 
+     snprintf(buf, sizeof(buf), " reactivate=%d, deactivate=%d, pageouts=%d",
+-	cexp.pdreact, cexp.pddeact, cexp.pdpageouts);
++	curexp.pdreact, curexp.pddeact, curexp.pdpageouts);
+     XDrawImageString(xdpy->dpy, win, gc, 5, get_fontheight(fnt_fixed) + y,
+ 		   buf, strlen(buf)); 
+     y += get_fontheight(fnt_fixed) + 1;