Attachment 129786 Details for Bug 99882 – patch: avoid -Wformat errors from clang

[patch] patch: avoid -Wformat errors from clang

xorg_llvm_format.patch (text/plain), 5.69 KB, created by Rin Okuyama on 2017-02-21 06:18:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rin Okuyama

Created: 2017-02-21 06:18:37 UTC

Size: 5.69 KB

patch

obsolete

>--- xorg/lib/libXfont/src/fc/fserve.c.orig	2017-01-09 12:09:01.970365539 +0900
>+++ xorg/lib/libXfont/src/fc/fserve.c	2017-01-09 17:41:38.176691310 +0900
>@@ -223,8 +223,8 @@
>             fprintf (stderr, "Error: %d Request: %s\n",                 \
>                      ((fsError *)rep)->request, #name);                 \
>         else                                                            \
>-            fprintf (stderr, "Bad Length for %s Reply: %d %s %d\n",     \
>-                     #name, rep->length, op, LENGTHOF(name));           \
>+            fprintf (stderr, "Bad Length for %s Reply: %u %s %d\n",     \
>+                     #name, (unsigned) rep->length, op, LENGTHOF(name));\
>     }                                                                   \
> } while (0)
> 
>@@ -915,8 +915,8 @@
> 	ret = -1;
> #ifdef DEBUG
> 	fprintf(stderr,
>-		"fsQueryXInfo: bufleft (%ld) / SIZEOF(fsPropOffset) < %d\n",
>-		bufleft, pi->num_offsets);
>+		"fsQueryXInfo: bufleft (%ld) / SIZEOF(fsPropOffset) < %u\n",
>+		bufleft, (unsigned) pi->num_offsets);
> #endif
> 	goto bail;
>     }
>@@ -929,8 +929,8 @@
> 	ret = -1;
> #ifdef DEBUG
> 	fprintf(stderr,
>-		"fsQueryXInfo: bufleft (%ld) < data_len (%d)\n",
>-		bufleft, pi->data_len);
>+		"fsQueryXInfo: bufleft (%ld) < data_len (%u)\n",
>+		bufleft, (unsigned) pi->data_len);
> #endif
> 	goto bail;
>     }
>@@ -1063,8 +1063,8 @@
> 			    / LENGTHOF(fsXCharInfo))) {
> #ifdef DEBUG
> 	fprintf(stderr,
>-		"fsQueryXExtents16: numExtents (%d) > (%d - %d) / %d\n",
>-		numExtents, rep->length,
>+		"fsQueryXExtents16: numExtents (%d) > (%u - %d) / %d\n",
>+		numExtents, (unsigned) rep->length,
> 		LENGTHOF(fsQueryXExtents16Reply), LENGTHOF(fsXCharInfo));
> #endif
> 	pCI = NULL;
>@@ -1946,8 +1946,8 @@
>     {
> #ifdef DEBUG
> 	fprintf(stderr,
>-		"fsQueryXBitmaps16: num_chars (%d) > bufleft (%ld) / %d\n",
>-		rep->num_chars, bufleft, SIZEOF (fsOffset32));
>+		"fsQueryXBitmaps16: num_chars (%u) > bufleft (%ld) / %d\n",
>+		(unsigned) rep->num_chars, bufleft, SIZEOF (fsOffset32));
> #endif
> 	err = AllocError;
> 	goto bail;
>@@ -1960,8 +1960,8 @@
>     {
> #ifdef DEBUG
> 	fprintf(stderr,
>-		"fsQueryXBitmaps16: nbytes (%d) > bufleft (%ld)\n",
>-		rep->nbytes, bufleft);
>+		"fsQueryXBitmaps16: nbytes (%u) > bufleft (%ld)\n",
>+		(unsigned) rep->nbytes, bufleft);
> #endif
> 	err = AllocError;
> 	goto bail;
>@@ -2567,8 +2567,8 @@
>     if (pi->num_offsets > (bufleft / SIZEOF (fsPropOffset))) {
> #ifdef DEBUG
> 	fprintf(stderr,
>-		"fsListFontsWithXInfo: offset length (%d * %d) > bufleft (%ld)\n",
>-		pi->num_offsets, (int) SIZEOF (fsPropOffset), bufleft);
>+		"fsListFontsWithXInfo: offset length (%u * %d) > bufleft (%ld)\n",
>+		(unsigned) pi->num_offsets, (int) SIZEOF (fsPropOffset), bufleft);
> #endif
> 	err = AllocError;
> 	goto done;
>@@ -2579,8 +2579,8 @@
>     if (pi->data_len > bufleft) {
> #ifdef DEBUG
> 	fprintf(stderr,
>-		"fsListFontsWithXInfo: data length (%d) > bufleft (%ld)\n",
>-		pi->data_len, bufleft);
>+		"fsListFontsWithXInfo: data length (%u) > bufleft (%ld)\n",
>+		(unsigned) pi->data_len, bufleft);
> #endif
> 	err = AllocError;
> 	goto done;
>--- xorg/lib/libXt/src/Convert.c.orig	2017-01-09 11:39:40.848786650 +0900
>+++ xorg/lib/libXt/src/Convert.c	2017-01-09 12:19:18.285077751 +0900
>@@ -514,7 +514,7 @@
> 	    }
> 	    (void) fprintf(stdout, "Index: %4d  Entries: %d\n", i, entries);
> 	    for (p = cacheHashTable[i]; p; p = p->next) {
>-		(void) fprintf(stdout, "    Size: %3d  Refs: %3d  '",
>+		(void) fprintf(stdout, "    Size: %3d  Refs: %3ld  '",
> 			       p->from.size,
> 			       p->has_ext ? CEXT(p)->ref_count : 0);
> 		(void) fprintf(stdout, "'\n");
>--- xorg/lib/libXt/src/ResConfig.c.orig	2017-01-09 11:44:24.122670470 +0900
>+++ xorg/lib/libXt/src/ResConfig.c	2017-01-09 17:45:55.206031368 +0900
>@@ -903,10 +903,10 @@
> 	XtPerDisplay	pd;
> 
> #ifdef DEBUG
>-	fprintf (stderr, "in _XtResourceConfiguationEH atom = %d\n",event->xproperty.atom);
>-	fprintf (stderr, "    window = %x\n", XtWindow (w));
>+	fprintf (stderr, "in _XtResourceConfiguationEH atom = %u\n",(unsigned) event->xproperty.atom);
>+	fprintf (stderr, "    window = %x\n", (unsigned) XtWindow (w));
> 	if (XtIsWidget (w))
>-		fprintf (stderr, "    widget = %x   name = %s\n", w, w->core.name);
>+		fprintf (stderr, "    widget = %zx   name = %s\n", (size_t)w, w->core.name);
> #endif
> 
> 	pd = _XtGetPerDisplay (XtDisplay (w));
>@@ -981,7 +981,7 @@
> 				resource = XtNewString (data_ptr);
> 				value = XtNewString (data_value);
> #ifdef DEBUG
>-				fprintf (stderr, "resource_len=%d\n",
>+				fprintf (stderr, "resource_len=%lu\n",
> 					 resource_len);
> 				fprintf (stderr, "resource = %s\t value = %s\n",
> 					 resource, value);
>--- xorg/lib/libxkbui/src/XKBui.c.orig	2017-01-09 12:04:08.779143092 +0900
>+++ xorg/lib/libxkbui/src/XKBui.c	2017-01-09 12:26:43.549666971 +0900
>@@ -96,7 +96,7 @@
> 	if (XAllocNamedColor(view->dpy,view->opts.cmap,spec,&sdef,&xdef)) {
> 	    xkb->geom->colors[i].pixel= sdef.pixel;
> #ifdef DEBUG
>-	    fprintf(stderr,"got pixel %d for \"%s\"\n",sdef.pixel,spec);
>+	    fprintf(stderr,"got pixel %lu for \"%s\"\n",sdef.pixel,spec);
> #endif
> 	    found= True;
> 	}
>@@ -108,7 +108,7 @@
> 	    if (XAllocNamedColor(view->dpy,view->opts.cmap,buf,&sdef,&xdef)) {
> 		xkb->geom->colors[i].pixel= sdef.pixel;
> #ifdef DEBUG
>-		fprintf(stderr,"got pixel %d for \"%s\"\n",sdef.pixel,spec);
>+		fprintf(stderr,"got pixel %lu for \"%s\"\n",sdef.pixel,spec);
> #endif
> 		found= True;
> 	    }
>--- xorg/lib/libxtrans/Xtranssock.c.orig	2017-01-09 11:34:34.503281927 +0900
>+++ xorg/lib/libxtrans/Xtranssock.c	2017-01-09 12:28:04.361587651 +0900
>@@ -1654,7 +1654,7 @@
> 	    tmpaddr = INADDR_NONE;
> 	}
> 
>-	prmsg (4,"SocketINETConnect() inet_addr(%s) = %x\n", host, tmpaddr);
>+	prmsg (4,"SocketINETConnect() inet_addr(%s) = %lx\n", host, tmpaddr);
> 
> 	if (tmpaddr == INADDR_NONE) {
> 	    if ((hostp = _XGethostbyname(host,hparams)) == NULL) {

Actions: View | Splinter Review

Attachments on bug 99882: 129786

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.