diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-08-18 11:09:23 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-08-18 11:09:23 +0100 |
| commit | bc77a466531fdbdd21e9354af567e5215a66edf9 (patch) | |
| tree | 3f97525ad3f97c692157dfb4028cdf7f53ec2585 | |
| parent | d1da2c71461798bb027a260ff8480b71ebffde26 (diff) | |
sna: Silence a couple of recent compiler warnings
sna_accel.c: In function 'sna_poly_fill_rect_extents':
sna_accel.c:11438:11: warning: unused variable 'v' [-Wunused-variable]
sna_blt.c: In function 'sna_blt_composite__convert':
sna_blt.c:1712:3: warning: format '%s' expects a matching 'char *' argument [-Wformat]
sna_blt.c:1738:3: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'CARD32' [-Wformat]
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_accel.c | 2 | ||||
| -rw-r--r-- | src/sna/sna_blt.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index cf82cc56..31a9d3db 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -11435,8 +11435,6 @@ sna_poly_fill_rect_extents(DrawablePtr drawable, GCPtr gc, r++; while (--n) { - int32_t v; - if (r->width == 0 || r->height == 0) goto slow; diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c index 2d7a4aa5..819d24ae 100644 --- a/src/sna/sna_blt.c +++ b/src/sna/sna_blt.c @@ -1709,7 +1709,7 @@ sna_blt_composite__convert(struct sna *sna, } if (tmp->src.transform) { - DBG(("%s: transforms not handled by the BLT\n")); + DBG(("%s: transforms not handled by the BLT\n", __FUNCTION__)); return false; } @@ -1738,7 +1738,7 @@ sna_blt_composite__convert(struct sna *sna, DBG(("%s: incompatible src/dst formats src=%08x, dst=%08x\n", __FUNCTION__, (unsigned)tmp->src.pict_format, - tmp->dst.format)); + (unsigned)tmp->dst.format)); return false; } |