[cairo-commit] cairo/src cairo-font.c, 1.72, 1.73 cairo-ft-font.c, 1.105, 1.106 cairo-gstate.c, 1.166, 1.167 cairo-pattern.c, 1.60, 1.61 cairo-ps-surface.c, 1.48, 1.49 cairo-xlib-surface.c, 1.114, 1.115

[Owen Taylor]

Committed by: otaylor

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv12886/src

Modified Files:
	cairo-font.c cairo-ft-font.c cairo-gstate.c cairo-pattern.c 
	cairo-ps-surface.c cairo-xlib-surface.c 
Log Message:
2005-08-22  Owen Taylor  <otaylor at redhat.com>

        * src/cairo-ft-font.c: Make cairo_ft_unscaled_font_backend static.

        * src/cairo-gstate.c (_cairo_gstate_fini): Add missing static.

        * src/cairo-pattern.c (_cairo_pattern_init_gradient):
        * src/cairo-ps-surface.c (_cairo_ps_surface_finish):
        * src/cairo-xlib-surface.c (_get_image_surface): Use
        NULL, not 0.

        * src/cairo-font.c (_cairo_lock,unlock,get_global_image_glyph_cache):
        Use void in the definition of void functions, not ().

        * src/cairo-pattern.c: Make non-exported
        cairo_pattern_nil_* static.


Index: cairo-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-font.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- cairo-font.c	19 Aug 2005 20:00:23 -0000	1.72
+++ cairo-font.c	23 Aug 2005 03:43:23 -0000	1.73
@@ -1235,13 +1235,13 @@
 _global_image_glyph_cache = NULL;
 
 void
-_cairo_lock_global_image_glyph_cache()
+_cairo_lock_global_image_glyph_cache (void)
 {
     CAIRO_MUTEX_LOCK (_global_image_glyph_cache_mutex);
 }
 
 void
-_cairo_unlock_global_image_glyph_cache()
+_cairo_unlock_global_image_glyph_cache (void)
 {
     if (_global_image_glyph_cache) {
 	_cairo_cache_shrink_to (_global_image_glyph_cache, 
@@ -1251,7 +1251,7 @@
 }
 
 cairo_cache_t *
-_cairo_get_global_image_glyph_cache ()
+_cairo_get_global_image_glyph_cache (void)
 {
     if (_global_image_glyph_cache == NULL) {
 	_global_image_glyph_cache = malloc (sizeof (cairo_cache_t));

Index: cairo-ft-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-ft-font.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- cairo-ft-font.c	22 Aug 2005 22:19:03 -0000	1.105
+++ cairo-ft-font.c	23 Aug 2005 03:43:23 -0000	1.106
@@ -130,7 +130,7 @@
     cairo_ft_font_face_t *next;
 };
 
-const cairo_unscaled_font_backend_t cairo_ft_unscaled_font_backend;
+static const cairo_unscaled_font_backend_t cairo_ft_unscaled_font_backend;
 
 /*
  * We maintain a hash table to map file/id => cairo_ft_unscaled_font_t.
@@ -1285,7 +1285,7 @@
     return status;
 }
 
-const cairo_unscaled_font_backend_t cairo_ft_unscaled_font_backend = {
+static const cairo_unscaled_font_backend_t cairo_ft_unscaled_font_backend = {
     _cairo_ft_unscaled_font_destroy,
     _cairo_ft_unscaled_font_create_glyph
 };

Index: cairo-gstate.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-gstate.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- cairo-gstate.c	19 Aug 2005 19:02:14 -0000	1.166
+++ cairo-gstate.c	23 Aug 2005 03:43:23 -0000	1.167
@@ -179,7 +179,7 @@
     return CAIRO_STATUS_NO_MEMORY;
 }
 
-void
+static void
 _cairo_gstate_fini (cairo_gstate_t *gstate)
 {
     if (gstate->font_face)

Index: cairo-pattern.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-pattern.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- cairo-pattern.c	21 Aug 2005 21:10:39 -0000	1.60
+++ cairo-pattern.c	23 Aug 2005 03:43:23 -0000	1.61
@@ -59,7 +59,7 @@
       CAIRO_EXTEND_DEFAULT },	/* extend */
 };
 
-const cairo_solid_pattern_t cairo_pattern_nil_null_pointer = {
+static const cairo_solid_pattern_t cairo_pattern_nil_null_pointer = {
     { CAIRO_PATTERN_SOLID, 	/* type */
       (unsigned int)-1,		/* ref_count */
       CAIRO_STATUS_NULL_POINTER,/* status */
@@ -68,7 +68,7 @@
       CAIRO_EXTEND_DEFAULT },	/* extend */
 };
 
-const cairo_solid_pattern_t cairo_pattern_nil_file_not_found = {
+static const cairo_solid_pattern_t cairo_pattern_nil_file_not_found = {
     { CAIRO_PATTERN_SOLID, 	/* type */
       (unsigned int)-1,		/* ref_count */
       CAIRO_STATUS_FILE_NOT_FOUND, /* status */
@@ -77,7 +77,7 @@
       CAIRO_EXTEND_DEFAULT },	/* extend */
 };
 
-const cairo_solid_pattern_t cairo_pattern_nil_read_error = {
+static const cairo_solid_pattern_t cairo_pattern_nil_read_error = {
     { CAIRO_PATTERN_SOLID, 	/* type */
       (unsigned int)-1,		/* ref_count */
       CAIRO_STATUS_READ_ERROR,	/* status */
@@ -263,7 +263,7 @@
 {
     _cairo_pattern_init (&pattern->base, type);
 
-    pattern->stops   = 0;
+    pattern->stops   = NULL;
     pattern->n_stops = 0;
 }
 

Index: cairo-ps-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-ps-surface.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- cairo-ps-surface.c	19 Aug 2005 17:36:44 -0000	1.48
+++ cairo-ps-surface.c	23 Aug 2005 03:43:23 -0000	1.49
@@ -185,7 +185,7 @@
     int i;
     time_t now;
 
-    now = time (0);
+    now = time (NULL);
 
     /* Document header */
     _cairo_output_stream_printf (surface->stream,

Index: cairo-xlib-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-xlib-surface.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- cairo-xlib-surface.c	21 Aug 2005 15:11:24 -0000	1.114
+++ cairo-xlib-surface.c	23 Aug 2005 03:43:23 -0000	1.115
@@ -374,7 +374,7 @@
     else
     {
 	surface->use_pixmap--;
-	ximage = 0;
+	ximage = NULL;
     }
     
     if (!ximage)