Fix for g_datalist_id_set_full() use (error is deeper down, some internal

Fix for g_datalist_id_set_full() use (error is deeper down, some internal
funcs weren't checking that things were initialized.)

diff --git a/ChangeLog b/ChangeLog
index 2db51030e41449290ed3376186ab7c2791438fdc..63f4d0a6ebafc53d2567872dfb1bff8095776f01 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Nov 18 1998 Elliot Lee <sopwith@redhat.com>
+       . gdataset.c: There was a code path into g_data_set_internal
+         through a function (g_datalist_id_set_full). Neither function
+         checked for g_dataset_init having been run, but
+         g_data_set_internal used the memchunk. I added
+         a check into g_data_set_internal so it will do the
+         initialization if needed. (There's probably a better way.)
+
 Mon Nov 16 07:48:06 1998  Tim Janik  <timj@gtk.org>
 
        * glib.h (g_bit_nth_msf): fixed off-by-one error, so we don't waste

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2db51030e41449290ed3376186ab7c2791438fdc..63f4d0a6ebafc53d2567872dfb1bff8095776f01 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Wed Nov 18 1998 Elliot Lee <sopwith@redhat.com>
+       . gdataset.c: There was a code path into g_data_set_internal
+         through a function (g_datalist_id_set_full). Neither function
+         checked for g_dataset_init having been run, but
+         g_data_set_internal used the memchunk. I added
+         a check into g_data_set_internal so it will do the
+         initialization if needed. (There's probably a better way.)
+
 Mon Nov 16 07:48:06 1998  Tim Janik  <timj@gtk.org>
 
        * glib.h (g_bit_nth_msf): fixed off-by-one error, so we don't waste

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2db51030e41449290ed3376186ab7c2791438fdc..63f4d0a6ebafc53d2567872dfb1bff8095776f01 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Wed Nov 18 1998 Elliot Lee <sopwith@redhat.com>
+       . gdataset.c: There was a code path into g_data_set_internal
+         through a function (g_datalist_id_set_full). Neither function
+         checked for g_dataset_init having been run, but
+         g_data_set_internal used the memchunk. I added
+         a check into g_data_set_internal so it will do the
+         initialization if needed. (There's probably a better way.)
+
 Mon Nov 16 07:48:06 1998  Tim Janik  <timj@gtk.org>
 
        * glib.h (g_bit_nth_msf): fixed off-by-one error, so we don't waste

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 2db51030e41449290ed3376186ab7c2791438fdc..63f4d0a6ebafc53d2567872dfb1bff8095776f01 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+Wed Nov 18 1998 Elliot Lee <sopwith@redhat.com>
+       . gdataset.c: There was a code path into g_data_set_internal
+         through a function (g_datalist_id_set_full). Neither function
+         checked for g_dataset_init having been run, but
+         g_data_set_internal used the memchunk. I added
+         a check into g_data_set_internal so it will do the
+         initialization if needed. (There's probably a better way.)
+
 Mon Nov 16 07:48:06 1998  Tim Janik  <timj@gtk.org>
 
        * glib.h (g_bit_nth_msf): fixed off-by-one error, so we don't waste

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2db51030e41449290ed3376186ab7c2791438fdc..63f4d0a6ebafc53d2567872dfb1bff8095776f01 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Wed Nov 18 1998 Elliot Lee <sopwith@redhat.com>
+       . gdataset.c: There was a code path into g_data_set_internal
+         through a function (g_datalist_id_set_full). Neither function
+         checked for g_dataset_init having been run, but
+         g_data_set_internal used the memchunk. I added
+         a check into g_data_set_internal so it will do the
+         initialization if needed. (There's probably a better way.)
+
 Mon Nov 16 07:48:06 1998  Tim Janik  <timj@gtk.org>
 
        * glib.h (g_bit_nth_msf): fixed off-by-one error, so we don't waste

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2db51030e41449290ed3376186ab7c2791438fdc..63f4d0a6ebafc53d2567872dfb1bff8095776f01 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Wed Nov 18 1998 Elliot Lee <sopwith@redhat.com>
+       . gdataset.c: There was a code path into g_data_set_internal
+         through a function (g_datalist_id_set_full). Neither function
+         checked for g_dataset_init having been run, but
+         g_data_set_internal used the memchunk. I added
+         a check into g_data_set_internal so it will do the
+         initialization if needed. (There's probably a better way.)
+
 Mon Nov 16 07:48:06 1998  Tim Janik  <timj@gtk.org>
 
        * glib.h (g_bit_nth_msf): fixed off-by-one error, so we don't waste

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2db51030e41449290ed3376186ab7c2791438fdc..63f4d0a6ebafc53d2567872dfb1bff8095776f01 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Wed Nov 18 1998 Elliot Lee <sopwith@redhat.com>
+       . gdataset.c: There was a code path into g_data_set_internal
+         through a function (g_datalist_id_set_full). Neither function
+         checked for g_dataset_init having been run, but
+         g_data_set_internal used the memchunk. I added
+         a check into g_data_set_internal so it will do the
+         initialization if needed. (There's probably a better way.)
+
 Mon Nov 16 07:48:06 1998  Tim Janik  <timj@gtk.org>
 
        * glib.h (g_bit_nth_msf): fixed off-by-one error, so we don't waste

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2db51030e41449290ed3376186ab7c2791438fdc..63f4d0a6ebafc53d2567872dfb1bff8095776f01 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Wed Nov 18 1998 Elliot Lee <sopwith@redhat.com>
+       . gdataset.c: There was a code path into g_data_set_internal
+         through a function (g_datalist_id_set_full). Neither function
+         checked for g_dataset_init having been run, but
+         g_data_set_internal used the memchunk. I added
+         a check into g_data_set_internal so it will do the
+         initialization if needed. (There's probably a better way.)
+
 Mon Nov 16 07:48:06 1998  Tim Janik  <timj@gtk.org>
 
        * glib.h (g_bit_nth_msf): fixed off-by-one error, so we don't waste

diff --git a/gdataset.c b/gdataset.c
index 35c7be821d909996d77f6e084e8507024be99416..c62a8cdaa1bdc949a2f1054c521aaf8707a96e14 100644 (file)
--- a/gdataset.c
+++ b/gdataset.c
@@ -174,6 +174,9 @@ g_data_set_internal (GData    **datalist,
 {
   register GData *list;
   
+  if (!g_dataset_location_ht)
+    g_data_initialize ();
+  
   list = *datalist;
   if (!data)
     {

diff --git a/glib/gdataset.c b/glib/gdataset.c
index 35c7be821d909996d77f6e084e8507024be99416..c62a8cdaa1bdc949a2f1054c521aaf8707a96e14 100644 (file)
--- a/glib/gdataset.c
+++ b/glib/gdataset.c
@@ -174,6 +174,9 @@ g_data_set_internal (GData    **datalist,
 {
   register GData *list;
   
+  if (!g_dataset_location_ht)
+    g_data_initialize ();
+  
   list = *datalist;
   if (!data)
     {