commit b8b5c06

Michael Forney  ·  2013-07-25 05:20:49 +0000 UTC
parent aa44529
Be explicit about staticness
3 files changed,  +24, -21
+8, -8
 1@@ -124,8 +124,8 @@ struct wld_drawable * wld_intel_create_drawable
 2     return &intel->drm.base;
 3 }
 4 
 5-void intel_fill_rectangle(struct wld_drawable * drawable, uint32_t color,
 6-                          pixman_rectangle16_t * rectangle)
 7+static void intel_fill_rectangle(struct wld_drawable * drawable, uint32_t color,
 8+                                 pixman_rectangle16_t * rectangle)
 9 {
10     struct intel_drawable * intel = (void *) drawable;
11 
12@@ -135,10 +135,10 @@ void intel_fill_rectangle(struct wld_drawable * drawable, uint32_t color,
13                  rectangle->y + rectangle->height, color);
14 }
15 
16-void intel_draw_text_utf8(struct wld_drawable * drawable,
17-                          struct font * font, uint32_t color,
18-                          int32_t x, int32_t y,
19-                          const char * text, int32_t length)
20+static void intel_draw_text_utf8(struct wld_drawable * drawable,
21+                                 struct font * font, uint32_t color,
22+                                 int32_t x, int32_t y,
23+                                 const char * text, int32_t length)
24 {
25     struct intel_drawable * intel = (void *) drawable;
26     int ret;
27@@ -199,14 +199,14 @@ void intel_draw_text_utf8(struct wld_drawable * drawable,
28     }
29 }
30 
31-void intel_flush(struct wld_drawable * drawable)
32+static void intel_flush(struct wld_drawable * drawable)
33 {
34     struct intel_drawable * intel = (void *) drawable;
35 
36     intel_batch_flush(&intel->context->batch);
37 }
38 
39-void intel_destroy(struct wld_drawable * drawable)
40+static void intel_destroy(struct wld_drawable * drawable)
41 {
42     struct intel_drawable * intel = (void *) drawable;
43     drm_intel_bo_unreference(intel->bo);
+2, -2
 1@@ -239,11 +239,11 @@ static void pixman_draw_text_utf8(struct wld_drawable * drawable,
 2     pixman_image_unref(solid);
 3 }
 4 
 5-void pixman_flush(struct wld_drawable * drawable)
 6+static void pixman_flush(struct wld_drawable * drawable)
 7 {
 8 }
 9 
10-void pixman_destroy(struct wld_drawable * drawable)
11+static void pixman_destroy(struct wld_drawable * drawable)
12 {
13     struct pixman_drawable * pixman = (void *) drawable;
14 
+14, -11
 1@@ -254,17 +254,20 @@ void sync_done(void * data, struct wl_callback * callback, uint32_t msecs)
 2 
 3     *done = true;
 4 }
 5-void wayland_fill_rectangle(struct wld_drawable * drawable, uint32_t color,
 6-                            pixman_rectangle16_t * rectangle)
 7+
 8+static void wayland_fill_rectangle(struct wld_drawable * drawable,
 9+                                   uint32_t color,
10+                                   pixman_rectangle16_t * rectangle)
11 {
12     struct wayland_drawable * wayland = (void *) drawable;
13 
14     wld_fill_rectangle(BACKBUF(wayland).drawable, color, rectangle);
15 }
16 
17-void wayland_fill_rectangles(struct wld_drawable * drawable, uint32_t color,
18-                             pixman_rectangle16_t * rectangles,
19-                             uint32_t num_rectangles)
20+static void wayland_fill_rectangles(struct wld_drawable * drawable,
21+                                    uint32_t color,
22+                                    pixman_rectangle16_t * rectangles,
23+                                    uint32_t num_rectangles)
24 {
25     struct wayland_drawable * wayland = (void *) drawable;
26 
27@@ -272,10 +275,10 @@ void wayland_fill_rectangles(struct wld_drawable * drawable, uint32_t color,
28                         rectangles, num_rectangles);
29 }
30 
31-void wayland_draw_text_utf8(struct wld_drawable * drawable,
32-                            struct font * font, uint32_t color,
33-                            int32_t x, int32_t y,
34-                            const char * text, int32_t length)
35+static void wayland_draw_text_utf8(struct wld_drawable * drawable,
36+                                   struct font * font, uint32_t color,
37+                                   int32_t x, int32_t y,
38+                                   const char * text, int32_t length)
39 {
40     struct wayland_drawable * wayland = (void *) drawable;
41 
42@@ -283,7 +286,7 @@ void wayland_draw_text_utf8(struct wld_drawable * drawable,
43                          x, y, text, length);
44 }
45 
46-void wayland_flush(struct wld_drawable * drawable)
47+static void wayland_flush(struct wld_drawable * drawable)
48 {
49     struct wayland_drawable * wayland = (void *) drawable;
50 
51@@ -293,7 +296,7 @@ void wayland_flush(struct wld_drawable * drawable)
52     wayland->front_buffer ^= 1;
53 }
54 
55-void wayland_destroy(struct wld_drawable * drawable)
56+static void wayland_destroy(struct wld_drawable * drawable)
57 {
58     struct wayland_drawable * wayland = (void *) drawable;
59