cleanup

[platform/upstream/glib.git] / gobject / gvaluecollector.h

diff --git a/gobject/gvaluecollector.h b/gobject/gvaluecollector.h
index 6d5190e..11a1ad8 100644 (file)
--- a/gobject/gvaluecollector.h
+++ b/gobject/gvaluecollector.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * gvaluecollector.h: GValue varargs stubs
  */
@@ -92,7 +90,7 @@ G_STMT_START {                                                                                \
   GValue *_val = (value);                                                              \
   guint _flags = (flags);                                                              \
   GTypeValueTable *_vtab = g_type_value_table_peek (_value_type);                      \
-  gchar *_collect_format = _vtab->collect_format;                                      \
+  const gchar *_collect_format = _vtab->collect_format;                                        \
   GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, };               \
   guint _n_values = 0;                                                                 \
                                                                                         \
@@ -161,7 +159,7 @@ G_STMT_START {                                                                              \
 #define G_VALUE_COLLECT_SKIP(_value_type, var_args)                                    \
 G_STMT_START {                                                                         \
   GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);                    \
-  gchar *_collect_format = _vtable->collect_format;                                    \
+  const gchar *_collect_format = _vtable->collect_format;                              \
                                                                                         \
   while (*_collect_format)                                                             \
     {                                                                                  \
@@ -207,7 +205,7 @@ G_STMT_START {                                                                              \
   guint _flags = (flags);                                                              \
   GType _value_type = G_VALUE_TYPE (_value);                                           \
   GTypeValueTable *_vtable = g_type_value_table_peek (_value_type);                    \
-  gchar *_lcopy_format = _vtable->lcopy_format;                                                \
+  const gchar *_lcopy_format = _vtable->lcopy_format;                                  \
   GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, };               \
   guint _n_values = 0;                                                                 \
                                                                                         \
@@ -246,7 +244,7 @@ G_STMT_START {                                                                              \
 /**
  * G_VALUE_COLLECT_FORMAT_MAX_LENGTH:
  * 
- * The maximal number of #GTypeCValue<!-- -->s which can be collected for a 
+ * The maximal number of #GTypeCValues which can be collected for a 
  * single #GValue.
  */
 #define        G_VALUE_COLLECT_FORMAT_MAX_LENGTH       (8)