luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-08 11:55:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed SIZEOF_LONG==4 assumption with ENABLE_MEM_CHECK, from Art Haas

Browse Source 
Fri May 19 09:00:44 2000  Tim Janik  <timj@gtk.org>

        * gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
        ENABLE_MEM_CHECK, from Art Haas <ahaas@neosoft.com>.

        * gslist.c (g_slist_reverse): shut up compiler.

        * gscanner.c (g_scanner_get_token_ll): removed inline assignment.

        * garray.c: remove index>=0 checks for unsigned indices.

        * gmain.c (g_idle_prepare): timeout assignment fix.

        * gtree.c (g_tree_node_rotate_right): shut up compiler.
This commit is contained in:
Tim Janik 2000-05-19 08:18:29 +00:00 committed by Tim Janik
parent 4b9a9eb8d3
commit 1e5d06d4ce
24 changed files with 160 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
ENABLE_MEM_CHECK, from Art Haas <ahaas@neosoft.com>.
* gslist.c (g_slist_reverse): shut up compiler.
* gscanner.c (g_scanner_get_token_ll): removed inline assignment.
* garray.c: remove index>=0 checks for unsigned indices.
* gmain.c (g_idle_prepare): timeout assignment fix.
* gtree.c (g_tree_node_rotate_right): shut up compiler.
2000-05-13 Tor Lillqvist <tml@iki.fi> 2000-05-13 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in * makefile.mingw.in

15
ChangeLog.pre-2-0
View File

@ -1,3 +1,18 @@
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
ENABLE_MEM_CHECK, from Art Haas <ahaas@neosoft.com>.
* gslist.c (g_slist_reverse): shut up compiler.
* gscanner.c (g_scanner_get_token_ll): removed inline assignment.
* garray.c: remove index>=0 checks for unsigned indices.
* gmain.c (g_idle_prepare): timeout assignment fix.
* gtree.c (g_tree_node_rotate_right): shut up compiler.
2000-05-13 Tor Lillqvist <tml@iki.fi> 2000-05-13 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in * makefile.mingw.in

15
ChangeLog.pre-2-10
View File

@ -1,3 +1,18 @@
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
ENABLE_MEM_CHECK, from Art Haas <ahaas@neosoft.com>.
* gslist.c (g_slist_reverse): shut up compiler.
* gscanner.c (g_scanner_get_token_ll): removed inline assignment.
* garray.c: remove index>=0 checks for unsigned indices.
* gmain.c (g_idle_prepare): timeout assignment fix.
* gtree.c (g_tree_node_rotate_right): shut up compiler.
2000-05-13 Tor Lillqvist <tml@iki.fi> 2000-05-13 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in * makefile.mingw.in

15
ChangeLog.pre-2-12
View File

@ -1,3 +1,18 @@
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
ENABLE_MEM_CHECK, from Art Haas <ahaas@neosoft.com>.
* gslist.c (g_slist_reverse): shut up compiler.
* gscanner.c (g_scanner_get_token_ll): removed inline assignment.
* garray.c: remove index>=0 checks for unsigned indices.
* gmain.c (g_idle_prepare): timeout assignment fix.
* gtree.c (g_tree_node_rotate_right): shut up compiler.
2000-05-13 Tor Lillqvist <tml@iki.fi> 2000-05-13 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in * makefile.mingw.in

15
ChangeLog.pre-2-2
View File

@ -1,3 +1,18 @@
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
ENABLE_MEM_CHECK, from Art Haas <ahaas@neosoft.com>.
* gslist.c (g_slist_reverse): shut up compiler.
* gscanner.c (g_scanner_get_token_ll): removed inline assignment.
* garray.c: remove index>=0 checks for unsigned indices.
* gmain.c (g_idle_prepare): timeout assignment fix.
* gtree.c (g_tree_node_rotate_right): shut up compiler.
2000-05-13 Tor Lillqvist <tml@iki.fi> 2000-05-13 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in * makefile.mingw.in

15
ChangeLog.pre-2-4
View File

@ -1,3 +1,18 @@
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
ENABLE_MEM_CHECK, from Art Haas <ahaas@neosoft.com>.
* gslist.c (g_slist_reverse): shut up compiler.
* gscanner.c (g_scanner_get_token_ll): removed inline assignment.
* garray.c: remove index>=0 checks for unsigned indices.
* gmain.c (g_idle_prepare): timeout assignment fix.
* gtree.c (g_tree_node_rotate_right): shut up compiler.
2000-05-13 Tor Lillqvist <tml@iki.fi> 2000-05-13 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in * makefile.mingw.in

15
ChangeLog.pre-2-6
View File

@ -1,3 +1,18 @@
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
ENABLE_MEM_CHECK, from Art Haas <ahaas@neosoft.com>.
* gslist.c (g_slist_reverse): shut up compiler.
* gscanner.c (g_scanner_get_token_ll): removed inline assignment.
* garray.c: remove index>=0 checks for unsigned indices.
* gmain.c (g_idle_prepare): timeout assignment fix.
* gtree.c (g_tree_node_rotate_right): shut up compiler.
2000-05-13 Tor Lillqvist <tml@iki.fi> 2000-05-13 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in * makefile.mingw.in

15
ChangeLog.pre-2-8
View File

@ -1,3 +1,18 @@
Fri May 19 09:00:44 2000 Tim Janik <timj@gtk.org>
* gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with
ENABLE_MEM_CHECK, from Art Haas <ahaas@neosoft.com>.
* gslist.c (g_slist_reverse): shut up compiler.
* gscanner.c (g_scanner_get_token_ll): removed inline assignment.
* garray.c: remove index>=0 checks for unsigned indices.
* gmain.c (g_idle_prepare): timeout assignment fix.
* gtree.c (g_tree_node_rotate_right): shut up compiler.
2000-05-13 Tor Lillqvist <tml@iki.fi> 2000-05-13 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in * makefile.mingw.in

8
garray.c
View File

@ -209,7 +209,7 @@ g_array_remove_index (GArray* farray,
g_return_val_if_fail (array, NULL); g_return_val_if_fail (array, NULL);
g_return_val_if_fail (index >= 0 && index < array->len, NULL); g_return_val_if_fail (index < array->len, NULL);
if (index != array->len - 1) if (index != array->len - 1)
g_memmove (g_array_elt_pos (array, index), g_memmove (g_array_elt_pos (array, index),
@ -235,7 +235,7 @@ g_array_remove_index_fast (GArray* farray,
g_return_val_if_fail (array, NULL); g_return_val_if_fail (array, NULL);
g_return_val_if_fail (index >= 0 && index < array->len, NULL); g_return_val_if_fail (index < array->len, NULL);
if (index != array->len - 1) if (index != array->len - 1)
g_memmove (g_array_elt_pos (array, index), g_memmove (g_array_elt_pos (array, index),
@ -410,7 +410,7 @@ g_ptr_array_remove_index (GPtrArray* farray,
g_return_val_if_fail (array, NULL); g_return_val_if_fail (array, NULL);
g_return_val_if_fail (index >= 0 && index < array->len, NULL); g_return_val_if_fail (index < array->len, NULL);
result = array->pdata[index]; result = array->pdata[index];
@ -436,7 +436,7 @@ g_ptr_array_remove_index_fast (GPtrArray* farray,
g_return_val_if_fail (array, NULL); g_return_val_if_fail (array, NULL);
g_return_val_if_fail (index >= 0 && index < array->len, NULL); g_return_val_if_fail (index < array->len, NULL);
result = array->pdata[index]; result = array->pdata[index];

2
gcompletion.c
View File

@ -123,7 +123,7 @@ completion_check_cache (GCompletion* cmp,
register gint len; register gint len;
register gint i; register gint i;
register gint plen; register gint plen;
gchar* postfix=NULL; gchar* postfix;
gchar* s; gchar* s;
if (!new_prefix) if (!new_prefix)

8
glib/garray.c
View File

@ -209,7 +209,7 @@ g_array_remove_index (GArray* farray,
g_return_val_if_fail (array, NULL); g_return_val_if_fail (array, NULL);
g_return_val_if_fail (index >= 0 && index < array->len, NULL); g_return_val_if_fail (index < array->len, NULL);
if (index != array->len - 1) if (index != array->len - 1)
g_memmove (g_array_elt_pos (array, index), g_memmove (g_array_elt_pos (array, index),
@ -235,7 +235,7 @@ g_array_remove_index_fast (GArray* farray,
g_return_val_if_fail (array, NULL); g_return_val_if_fail (array, NULL);
g_return_val_if_fail (index >= 0 && index < array->len, NULL); g_return_val_if_fail (index < array->len, NULL);
if (index != array->len - 1) if (index != array->len - 1)
g_memmove (g_array_elt_pos (array, index), g_memmove (g_array_elt_pos (array, index),
@ -410,7 +410,7 @@ g_ptr_array_remove_index (GPtrArray* farray,
g_return_val_if_fail (array, NULL); g_return_val_if_fail (array, NULL);
g_return_val_if_fail (index >= 0 && index < array->len, NULL); g_return_val_if_fail (index < array->len, NULL);
result = array->pdata[index]; result = array->pdata[index];
@ -436,7 +436,7 @@ g_ptr_array_remove_index_fast (GPtrArray* farray,
g_return_val_if_fail (array, NULL); g_return_val_if_fail (array, NULL);
g_return_val_if_fail (index >= 0 && index < array->len, NULL); g_return_val_if_fail (index < array->len, NULL);
result = array->pdata[index]; result = array->pdata[index];

2
glib/gcompletion.c
View File

@ -123,7 +123,7 @@ completion_check_cache (GCompletion* cmp,
register gint len; register gint len;
register gint i; register gint i;
register gint plen; register gint plen;
gchar* postfix=NULL; gchar* postfix;
gchar* s; gchar* s;
if (!new_prefix) if (!new_prefix)

3
glib/gmain.c
View File

@ -1352,7 +1352,8 @@ g_idle_prepare (gpointer source_data,
gint *timeout, gint *timeout,
gpointer user_data) gpointer user_data)
{ {
timeout = 0; *timeout = 0;
return TRUE; return TRUE;
} }

6
glib/gmem.c
View File

@ -402,11 +402,11 @@ g_free (gpointer mem)
#ifdef ENABLE_MEM_CHECK #ifdef ENABLE_MEM_CHECK
t = (gulong*) ((guchar*) mem - SIZEOF_LONG); t = (gulong*) ((guchar*) mem - SIZEOF_LONG);
if (*t >= 1) if (*t >= 1)
g_warning ("freeing previously freed memory\n"); g_warning ("freeing previously freed (%lu times) memory\n", *t);
*t += 1; *t += 1;
mem = t; mem = t;
memset ((guchar*) mem + 8, 0, size); memset ((guchar*) mem + 2 * SIZEOF_LONG, 0, size);
#else /* ENABLE_MEM_CHECK */ #else /* ENABLE_MEM_CHECK */
free (mem); free (mem);
#endif /* ENABLE_MEM_CHECK */ #endif /* ENABLE_MEM_CHECK */
@ -456,7 +456,7 @@ g_mem_check (gpointer mem)
t = (gulong*) ((guchar*) mem - SIZEOF_LONG - SIZEOF_LONG); t = (gulong*) ((guchar*) mem - SIZEOF_LONG - SIZEOF_LONG);
if (*t >= 1) if (*t >= 1)
g_warning ("mem: 0x%08x has been freed %lu times\n", (gulong) mem, *t); g_warning ("mem: 0x%08lx has been freed %lu times\n", (gulong) mem, *t);
#endif /* ENABLE_MEM_CHECK */ #endif /* ENABLE_MEM_CHECK */
} }

7
glib/gscanner.c
View File

@ -1614,9 +1614,8 @@ g_scanner_get_token_ll (GScanner *scanner,
token = G_TOKEN_COMMENT_SINGLE; token = G_TOKEN_COMMENT_SINGLE;
in_comment_single = TRUE; in_comment_single = TRUE;
gstring = g_string_new (""); gstring = g_string_new ("");
while ((ch = g_scanner_get_char (scanner, ch = g_scanner_get_char (scanner, line_p, position_p);
line_p, while (ch != 0)
position_p)) != 0)
{ {
if (ch == config->cpair_comment_single[1]) if (ch == config->cpair_comment_single[1])
{ {
@ -1626,7 +1625,7 @@ g_scanner_get_token_ll (GScanner *scanner,
} }
gstring = g_string_append_c (gstring, ch); gstring = g_string_append_c (gstring, ch);
ch = 0; ch = g_scanner_get_char (scanner, line_p, position_p);
} }
} }
else if (config->scan_identifier && ch && else if (config->scan_identifier && ch &&

4
glib/gslist.c
View File

@ -390,11 +390,11 @@ GSList*
g_slist_reverse (GSList *list) g_slist_reverse (GSList *list)
{ {
GSList *prev = NULL; GSList *prev = NULL;
GSList *next = NULL;
while (list) while (list)
{ {
next = list->next; GSList *next = list->next;
list->next = prev; list->next = prev;
prev = list; prev = list;

2
glib/gtree.c
View File

@ -693,12 +693,10 @@ static GTreeNode*
g_tree_node_rotate_right (GTreeNode *node) g_tree_node_rotate_right (GTreeNode *node)
{ {
GTreeNode *left; GTreeNode *left;
GTreeNode *right;
gint a_bal; gint a_bal;
gint b_bal; gint b_bal;
left = node->left; left = node->left;
right = node->right;
node->left = left->right; node->left = left->right;
left->right = node; left->right = node;

3
gmain.c
View File

@ -1352,7 +1352,8 @@ g_idle_prepare (gpointer source_data,
gint *timeout, gint *timeout,
gpointer user_data) gpointer user_data)
{ {
timeout = 0; *timeout = 0;
return TRUE; return TRUE;
} }

6
gmem.c
View File

@ -402,11 +402,11 @@ g_free (gpointer mem)
#ifdef ENABLE_MEM_CHECK #ifdef ENABLE_MEM_CHECK
t = (gulong*) ((guchar*) mem - SIZEOF_LONG); t = (gulong*) ((guchar*) mem - SIZEOF_LONG);
if (*t >= 1) if (*t >= 1)
g_warning ("freeing previously freed memory\n"); g_warning ("freeing previously freed (%lu times) memory\n", *t);
*t += 1; *t += 1;
mem = t; mem = t;
memset ((guchar*) mem + 8, 0, size); memset ((guchar*) mem + 2 * SIZEOF_LONG, 0, size);
#else /* ENABLE_MEM_CHECK */ #else /* ENABLE_MEM_CHECK */
free (mem); free (mem);
#endif /* ENABLE_MEM_CHECK */ #endif /* ENABLE_MEM_CHECK */
@ -456,7 +456,7 @@ g_mem_check (gpointer mem)
t = (gulong*) ((guchar*) mem - SIZEOF_LONG - SIZEOF_LONG); t = (gulong*) ((guchar*) mem - SIZEOF_LONG - SIZEOF_LONG);
if (*t >= 1) if (*t >= 1)
g_warning ("mem: 0x%08x has been freed %lu times\n", (gulong) mem, *t); g_warning ("mem: 0x%08lx has been freed %lu times\n", (gulong) mem, *t);
#endif /* ENABLE_MEM_CHECK */ #endif /* ENABLE_MEM_CHECK */
} }

7
gscanner.c
View File

@ -1614,9 +1614,8 @@ g_scanner_get_token_ll (GScanner *scanner,
token = G_TOKEN_COMMENT_SINGLE; token = G_TOKEN_COMMENT_SINGLE;
in_comment_single = TRUE; in_comment_single = TRUE;
gstring = g_string_new (""); gstring = g_string_new ("");
while ((ch = g_scanner_get_char (scanner, ch = g_scanner_get_char (scanner, line_p, position_p);
line_p, while (ch != 0)
position_p)) != 0)
{ {
if (ch == config->cpair_comment_single[1]) if (ch == config->cpair_comment_single[1])
{ {
@ -1626,7 +1625,7 @@ g_scanner_get_token_ll (GScanner *scanner,
} }
gstring = g_string_append_c (gstring, ch); gstring = g_string_append_c (gstring, ch);
ch = 0; ch = g_scanner_get_char (scanner, line_p, position_p);
} }
} }
else if (config->scan_identifier && ch && else if (config->scan_identifier && ch &&

4
gslist.c
View File

@ -390,11 +390,11 @@ GSList*
g_slist_reverse (GSList *list) g_slist_reverse (GSList *list)
{ {
GSList *prev = NULL; GSList *prev = NULL;
GSList *next = NULL;
while (list) while (list)
{ {
next = list->next; GSList *next = list->next;
list->next = prev; list->next = prev;
prev = list; prev = list;

2
gtree.c
View File

@ -693,12 +693,10 @@ static GTreeNode*
g_tree_node_rotate_right (GTreeNode *node) g_tree_node_rotate_right (GTreeNode *node)
{ {
GTreeNode *left; GTreeNode *left;
GTreeNode *right;
gint a_bal; gint a_bal;
gint b_bal; gint b_bal;
left = node->left; left = node->left;
right = node->right;
node->left = left->right; node->left = left->right;
left->right = node; left->right = node;

7
testgdate.c
View File

@ -47,7 +47,6 @@ int main(int argc, char** argv)
GDateDay day; GDateDay day;
gchar buf[101]; gchar buf[101];
gchar* loc; gchar* loc;
/* Try to get all the leap year cases. */ /* Try to get all the leap year cases. */
GDateYear check_years[] = { GDateYear check_years[] = {
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
@ -63,11 +62,9 @@ int main(int argc, char** argv)
2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
3000, 3001, 3002, 3998, 3999, 4000, 4001, 4002, 4003 3000, 3001, 3002, 3998, 3999, 4000, 4001, 4002, 4003
}; };
guint n_check_years = sizeof(check_years)/sizeof(GDateYear); guint n_check_years = sizeof(check_years)/sizeof(GDateYear);
guint i;
guint i = 0; gboolean discontinuity;
gboolean discontinuity = FALSE;
g_print("checking GDate..."); g_print("checking GDate...");

7
tests/testgdate.c
View File

@ -47,7 +47,6 @@ int main(int argc, char** argv)
GDateDay day; GDateDay day;
gchar buf[101]; gchar buf[101];
gchar* loc; gchar* loc;
/* Try to get all the leap year cases. */ /* Try to get all the leap year cases. */
GDateYear check_years[] = { GDateYear check_years[] = {
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
@ -63,11 +62,9 @@ int main(int argc, char** argv)
2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
3000, 3001, 3002, 3998, 3999, 4000, 4001, 4002, 4003 3000, 3001, 3002, 3998, 3999, 4000, 4001, 4002, 4003
}; };
guint n_check_years = sizeof(check_years)/sizeof(GDateYear); guint n_check_years = sizeof(check_years)/sizeof(GDateYear);
guint i;
guint i = 0; gboolean discontinuity;
gboolean discontinuity = FALSE;
g_print("checking GDate..."); g_print("checking GDate...");