summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce Harrington <bryce@canonical.com>2010-11-19 12:15:36 -0800
committerKristian Høgsberg <krh@bitplanet.net>2010-11-22 10:48:17 -0500
commit40269a6ed69a6619bf97e7276083b489104c8f7e (patch)
tree9375b1ca706f5561aa7fdc7a180963aead8c9be5
parent9f89a40ec17e84a70ab067b783d1d711a1307150 (diff)
Cleanup declared but unused variables.
Make was complaining about a bunch of unused variables that were being declared. Signed-off-by: Bryce Harrington <bryce@canonical.com>
-rw-r--r--clients/gears.c1
-rw-r--r--clients/smoke.c14
-rw-r--r--clients/window.c3
3 files changed, 5 insertions, 13 deletions
diff --git a/clients/gears.c b/clients/gears.c
index 86696834..17536cb2 100644
--- a/clients/gears.c
+++ b/clients/gears.c
@@ -341,7 +341,6 @@ static struct gears *
gears_create(struct display *display)
{
const int x = 200, y = 200, width = 450, height = 500;
- EGLint major, minor;
struct gears *gears;
int i;
diff --git a/clients/smoke.c b/clients/smoke.c
index edd036c4..246e3476 100644
--- a/clients/smoke.c
+++ b/clients/smoke.c
@@ -65,7 +65,6 @@ static void set_boundary(struct smoke *smoke, float x, float y, float *p)
static void diffuse(struct smoke *smoke, uint32_t time,
float *source, float *dest)
{
- cairo_t *cr;
float *s, *d;
int x, y, k, stride;
float t, a = 0.0002;
@@ -88,10 +87,9 @@ static void diffuse(struct smoke *smoke, uint32_t time,
static void advect(struct smoke *smoke, uint32_t time,
float *uu, float *vv, float *source, float *dest)
{
- cairo_t *cr;
float *s, *d;
float *u, *v;
- int x, y, k, stride;
+ int x, y, stride;
int i, j;
float px, py, fx, fy;
@@ -128,7 +126,7 @@ static void project(struct smoke *smoke, uint32_t time,
float *u, float *v, float *p, float *div)
{
int x, y, k, l, s;
- float h, *d, *q;
+ float h;
h = 1.0 / smoke->width;
s = smoke->width;
@@ -166,10 +164,8 @@ static void project(struct smoke *smoke, uint32_t time,
static void render(struct smoke *smoke)
{
- cairo_t *cr;
- unsigned char *source, *dest;
+ unsigned char *dest;
int x, y, width, height, stride;
- int k, t;
float *s;
uint32_t *d, c, a;
@@ -196,9 +192,7 @@ static void render(struct smoke *smoke)
static void
frame_callback(void *data, uint32_t time)
{
- cairo_surface_t *t;
struct smoke *smoke = data;
- static int i;
diffuse(smoke, time / 30, smoke->b[0].u, smoke->b[1].u);
diffuse(smoke, time / 30, smoke->b[0].v, smoke->b[1].v);
@@ -270,7 +264,7 @@ int main(int argc, char *argv[])
struct timespec ts;
struct smoke smoke;
struct display *d;
- int size, x, y;
+ int size;
d = display_create(&argc, &argv, NULL);
diff --git a/clients/window.c b/clients/window.c
index 9dfd3553..d5973484 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -203,7 +203,6 @@ display_create_drm_surface(struct display *display,
EGLDisplay dpy = display->dpy;
cairo_surface_t *surface;
struct wl_visual *visual;
- struct wl_buffer *buffer;
EGLint name, stride;
EGLint image_attribs[] = {
@@ -343,7 +342,7 @@ display_create_shm_surface(struct display *display,
struct shm_surface_data *data;
cairo_surface_t *surface;
struct wl_visual *visual;
- int stride, alloc, fd;
+ int stride, fd;
char filename[] = "/tmp/wayland-shm-XXXXXX";
data = malloc(sizeof *data);