const correctness fixes, found by Arjan van de Ven and gcc.

2005-11-17  Matthias Clasen  <mclasen@redhat.com>

	* glib/gbacktrace.c:
	* glib/gdate.c:
	* glib/gthread.c: const correctness fixes, found
	by Arjan van de Ven and gcc.

diff --git a/ChangeLog b/ChangeLog
index 6da35d61aa0ea34897c5e3b2ec395151528175c7..c6e93d6004a0c530cef18aa4733e56d8a098ac33 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gbacktrace.c:
+       * glib/gdate.c:
+       * glib/gthread.c: const correctness fixes, found
+       by Arjan van de Ven and gcc.
+       
 2005-11-16  Behdad Esfahbod  <behdad@gnome.org>
 
        * docs/reference/glib/tmpl/unicode.sgml: Correct typo on mentioning

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6da35d61aa0ea34897c5e3b2ec395151528175c7..c6e93d6004a0c530cef18aa4733e56d8a098ac33 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gbacktrace.c:
+       * glib/gdate.c:
+       * glib/gthread.c: const correctness fixes, found
+       by Arjan van de Ven and gcc.
+       
 2005-11-16  Behdad Esfahbod  <behdad@gnome.org>
 
        * docs/reference/glib/tmpl/unicode.sgml: Correct typo on mentioning

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 6da35d61aa0ea34897c5e3b2ec395151528175c7..c6e93d6004a0c530cef18aa4733e56d8a098ac33 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+2005-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gbacktrace.c:
+       * glib/gdate.c:
+       * glib/gthread.c: const correctness fixes, found
+       by Arjan van de Ven and gcc.
+       
 2005-11-16  Behdad Esfahbod  <behdad@gnome.org>
 
        * docs/reference/glib/tmpl/unicode.sgml: Correct typo on mentioning

diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c
index 76bb5aa56716513108ee42c7a84f6e5757c413f8..5597b12c6bf8c0c2bf7f86a7d7944298b8ace2b4 100644 (file)
--- a/glib/gbacktrace.c
+++ b/glib/gbacktrace.c
@@ -92,9 +92,9 @@ void
 g_on_error_query (const gchar *prg_name)
 {
 #ifndef G_OS_WIN32
-  static const gchar *query1 = "[E]xit, [H]alt";
-  static const gchar *query2 = ", show [S]tack trace";
-  static const gchar *query3 = " or [P]roceed";
+  static const gchar * const query1 = "[E]xit, [H]alt";
+  static const gchar * const query2 = ", show [S]tack trace";
+  static const gchar * const query3 = " or [P]roceed";
   gchar buf[16];
 
   if (!prg_name)

diff --git a/glib/gdate.c b/glib/gdate.c
index 85c6171b99ce48cf1293a6d5459cf5ff7a8ab00c..3e9db33d8ecb9159e1eff2ca68956ddb353fc570 100644 (file)
--- a/glib/gdate.c
+++ b/glib/gdate.c
@@ -473,7 +473,7 @@ static GDateDMY dmy_order[3] =
  * are counted as in the year 1900.  
  */
 
-static GDateYear twodigit_start_year = 1930;
+static const GDateYear twodigit_start_year = 1930;
 
 /* It is impossible to enter a year between 1 AD and 99 AD with this
  * in effect.  

diff --git a/glib/gthread.c b/glib/gthread.c
index d39faa2c08155583e1451546e6af106b3a35ffe8..ee2dcbc9149819e3bc31c5ae545ccf368ac81b94 100644 (file)
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -201,7 +201,7 @@ g_once_impl (GOnce       *once,
 void 
 g_static_mutex_init (GStaticMutex *mutex)
 {
-  static GStaticMutex init_mutex = G_STATIC_MUTEX_INIT;
+  static const GStaticMutex init_mutex = G_STATIC_MUTEX_INIT;
 
   g_return_if_fail (mutex);
 
@@ -255,7 +255,7 @@ g_static_mutex_free (GStaticMutex* mutex)
 void     
 g_static_rec_mutex_init (GStaticRecMutex *mutex)
 {
-  static GStaticRecMutex init_mutex = G_STATIC_REC_MUTEX_INIT;
+  static const GStaticRecMutex init_mutex = G_STATIC_REC_MUTEX_INIT;
   
   g_return_if_fail (mutex);
 
@@ -723,7 +723,7 @@ g_thread_self (void)
 void
 g_static_rw_lock_init (GStaticRWLock* lock)
 {
-  static GStaticRWLock init_lock = G_STATIC_RW_LOCK_INIT;
+  static const GStaticRWLock init_lock = G_STATIC_RW_LOCK_INIT;
 
   g_return_if_fail (lock);
 

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index a35641a81908e18de33376875640259cdd70d4f2..fb3932cc48ca0b5ab57f731722585a571f7043d0 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib-genmarshal.c: const correctness fixes, found
+       by Arjan van de Ven and gcc.
+       
 Tue Nov  1 17:07:43 2005  Tim Janik  <timj@imendio.com>
 
        * gsignal.c: allocate signal handlers and handler match structures

diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c
index 1c4a4b0c40b7a9d86f4258468fa5163c3458b4e6..1403fb8b739b5e688f44e0fe5ab8d2544f01ca92 100644 (file)
--- a/gobject/glib-genmarshal.c
+++ b/gobject/glib-genmarshal.c
@@ -115,7 +115,7 @@ static GScannerConfig scanner_config_template =
   FALSE                 /* symbol_2_token */,
   FALSE                 /* scope_0_fallback */,
 };
-static gchar           *std_marshaller_prefix = "g_cclosure_marshal";
+static gchar           * const std_marshaller_prefix = "g_cclosure_marshal";
 static gchar           *marshaller_prefix = "g_cclosure_user_marshal";
 static GHashTable      *marshallers = NULL;
 static gboolean                 gen_cheader = FALSE;