CVS commit: xsrc/external/mit/xrandr/dist

[matthew green]

Module Name:    xsrc
Committed By:   mrg
Date:           Sat Jul 23 06:01:57 UTC 2011

Modified Files:
        xsrc/external/mit/xrandr/dist: xrandr.c
Removed Files:
        xsrc/external/mit/xrandr/dist: xrandr.man

Log Message:
merge xrandr 1.3.5


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xrandr/dist/xrandr.c
cvs rdiff -u -r1.1.1.5 -r0 xsrc/external/mit/xrandr/dist/xrandr.man

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: xsrc/external/mit/xrandr/dist/xrandr.c
diff -u xsrc/external/mit/xrandr/dist/xrandr.c:1.5 xsrc/external/mit/xrandr/dist/xrandr.c:1.6
--- xsrc/external/mit/xrandr/dist/xrandr.c:1.5	Sun Nov 21 03:49:11 2010
+++ xsrc/external/mit/xrandr/dist/xrandr.c	Sat Jul 23 06:01:57 2011
@@ -90,7 +90,7 @@
     { NULL,	    0 }
 };
 
-static void
+static void _X_NORETURN
 usage(void)
 {
     fprintf(stderr, "usage: %s [options]\n", program_name);
@@ -107,6 +107,7 @@
     fprintf(stderr, "  -y        (reflect in y)\n");
     fprintf(stderr, "  --screen <screen>\n");
     fprintf(stderr, "  --verbose\n");
+    fprintf(stderr, "  --current\n");
     fprintf(stderr, "  --dryrun\n");
     fprintf(stderr, "  --nograb\n");
     fprintf(stderr, "  --prop or --properties\n");
@@ -147,7 +148,7 @@
     /*NOTREACHED*/
 }
 
-static void
+static void _X_NORETURN
 fatal (const char *format, ...)
 {
     va_list ap;
@@ -741,7 +742,6 @@
 		bestDist = dist;
 		best = mode;
 	    }
-	    break;
 	}
     }
     return best;
@@ -1510,7 +1510,7 @@
  * the configuration. Revert to the previous configuration
  * and bail
  */
-static void
+static void _X_NORETURN
 panic (Status s, crtc_t *crtc)
 {
     int	    c = crtc->crtc.index;
@@ -2756,7 +2756,7 @@
 	    {
 		Atom		name = XInternAtom (dpy, prop->name, False);
 		Atom		type;
-		int		format;
+		int		format = 0;
 		unsigned char	*data;
 		int		nelements;
 		int		int_value;
@@ -2768,7 +2768,6 @@
 		XRRPropertyInfo *propinfo;
 
 		type = AnyPropertyType;
-		format=0;
 		
 		if (XRRGetOutputProperty (dpy, output->output.xid, name,
 					  0, 100, False, False,
@@ -2798,7 +2797,6 @@
 		    ulong_value = XInternAtom (dpy, prop->value, False);
 		    data = (unsigned char *) &ulong_value;
 		    nelements = 1;
-		    format = 32;
 		}
 		else if ((type == XA_STRING || type == AnyPropertyType))
 		{
@@ -2966,7 +2964,6 @@
 		    if ((rotations >> i) & 1) {
 			if (!first) printf (" "); first = False;
 			printf("%s", direction[i]);
-			first = False;
 		    }
 		}
 		if (rotations & RR_Reflect_X)
@@ -2976,7 +2973,7 @@
 		}
 		if (rotations & RR_Reflect_Y)
 		{
-		    if (!first) printf (" "); first = False;
+		    if (!first) printf (" ");
 		    printf ("y axis");
 		}
 		printf (")");