[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: g_hook.c
User: ahvezda
Date: 06/07/15 14:51:42
Modified: . g_hook.c g_keys.c g_rc.c gschem.c i_basic.c
i_callbacks.c o_complex.c o_misc.c o_net.c
o_picture.c o_slot.c o_text.c o_undo.c
x_attribedit.c x_color.c x_dialog.c x_fileselect.c
x_grid.c x_image.c x_menus.c x_pagesel.c x_print.c
x_stroke.c x_window.c
Log:
Converted all free, ?alloc, and strdup calls to use g_free, g_?alloc,
and g_strdup. This is the first phase in fixing the slice crash under
glib 2.10.x.
Revision Changes Path
1.5 +2 -2 eda/geda/gaf/gschem/src/g_hook.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: g_hook.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/g_hook.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- g_hook.c 14 Jul 2006 02:23:54 -0000 1.4
+++ g_hook.c 15 Jul 2006 18:51:40 -0000 1.5
@@ -99,7 +99,7 @@
o_text_change(world, o_attrib, new_string, o_attrib->visibility, o_attrib->show_name_value);
- free(new_string);
+ g_free(new_string);
return returned;
}
@@ -396,7 +396,7 @@
object_smob, SCM_ARG1, "get-object-bounds");
if (!include_attribs) {
- new_object = (OBJECT *) malloc(sizeof(OBJECT));
+ new_object = (OBJECT *) g_malloc(sizeof(OBJECT));
memcpy (new_object, object, sizeof(OBJECT));
new_object->attribs = NULL;
new_object->next = NULL;
1.2 +2 -2 eda/geda/gaf/gschem/src/g_keys.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: g_keys.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/g_keys.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- g_keys.c 14 Jul 2006 02:23:54 -0000 1.1
+++ g_keys.c 15 Jul 2006 18:51:40 -0000 1.2
@@ -96,8 +96,8 @@
printf("_%s_\n", guile_string);
#endif
scm_c_eval_string (guile_string);
- free(guile_string);
- free(modifier);
+ g_free(guile_string);
+ g_free(modifier);
#if 0 /* playing with thi's guile stuff */
gh_eval_str("(display (reverse last-command-sequence))");
1.36 +18 -18 eda/geda/gaf/gschem/src/g_rc.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: g_rc.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/g_rc.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- g_rc.c 14 Jul 2006 02:23:54 -0000 1.35
+++ g_rc.c 15 Jul 2006 18:51:40 -0000 1.36
@@ -200,75 +200,75 @@
DEFINE_G_RC_COLOR(g_rc_attribute_color,
"attribute-color",
- default_attribute_color);
+ default_attribute_color)
DEFINE_G_RC_COLOR(g_rc_detachedattr_color,
"detached-attribute-color",
- default_detachattr_color);
+ default_detachattr_color)
DEFINE_G_RC_COLOR(g_rc_text_color,
"text-color",
- default_text_color);
+ default_text_color)
DEFINE_G_RC_COLOR(g_rc_net_color,
"net-color",
- default_net_color);
+ default_net_color)
DEFINE_G_RC_COLOR(g_rc_bus_color,
"bus-color",
- default_bus_color);
+ default_bus_color)
DEFINE_G_RC_COLOR(g_rc_pin_color,
"pin-color",
- default_pin_color);
+ default_pin_color)
DEFINE_G_RC_COLOR(g_rc_graphic_color,
"graphic-color",
- default_graphic_color);
+ default_graphic_color)
DEFINE_G_RC_COLOR(g_rc_grid_color,
"grid-color",
- default_grid_color);
+ default_grid_color)
DEFINE_G_RC_COLOR(g_rc_background_color,
"background-color",
- default_background_color);
+ default_background_color)
DEFINE_G_RC_COLOR(g_rc_select_color,
"select-color",
- default_select_color);
+ default_select_color)
DEFINE_G_RC_COLOR(g_rc_boundingbox_color,
"boundingbox-color",
- default_bb_color);
+ default_bb_color)
DEFINE_G_RC_COLOR(g_rc_zoom_box_color,
"zoom-box-color",
- default_zoom_box_color);
+ default_zoom_box_color)
DEFINE_G_RC_COLOR(g_rc_net_endpoint_color,
"net-endpoint-color",
- default_net_endpoint_color);
+ default_net_endpoint_color)
DEFINE_G_RC_COLOR(g_rc_logic_bubble_color,
"logic-bubble-color",
- default_logic_bubble_color);
+ default_logic_bubble_color)
DEFINE_G_RC_COLOR(g_rc_lock_color,
"lock-color",
- default_lock_color);
+ default_lock_color)
DEFINE_G_RC_COLOR(g_rc_output_color_background,
"output-color-background",
- default_print_color_background);
+ default_print_color_background)
DEFINE_G_RC_COLOR(g_rc_stroke_color,
"stroke-color",
- default_stroke_color);
+ default_stroke_color)
DEFINE_G_RC_COLOR(g_rc_freestyle_color,
"freestyle-color",
- default_dummy);
+ default_dummy)
#if 0
/*! \deprecated Currently unused.
1.33 +5 -5 eda/geda/gaf/gschem/src/gschem.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: gschem.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/gschem.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- gschem.c 14 Jul 2006 02:23:54 -0000 1.32
+++ gschem.c 15 Jul 2006 18:51:41 -0000 1.33
@@ -201,7 +201,7 @@
fprintf(stderr,
_("Failed to read init scm file [%s]\n"), input_str);
}
- free(input_str);
+ g_free(input_str);
/* At end, complete set up of window. */
colormap = gdk_colormap_get_system ();
@@ -235,7 +235,7 @@
if (first_page) {
if (w_current->page_current->page_filename) {
- free(w_current->page_current->page_filename);
+ g_free(w_current->page_current->page_filename);
}
/* Page structure has already been created...
@@ -292,11 +292,11 @@
i++;
}
- free(cwd);
+ free(cwd); /* allocated from getcwd, should be regular free */
if (argv[argv_index] == NULL) {
if (w_current->page_current->page_filename) {
- free(w_current->page_current->page_filename);
+ g_free(w_current->page_current->page_filename);
}
w_current->cwd = g_get_current_dir ();
@@ -305,7 +305,7 @@
#endif
w_current->page_current->page_filename =
- malloc(sizeof(char) * (
+ g_malloc(sizeof(char) * (
strlen(w_current->cwd) +
strlen(w_current->untitled_name) +
strlen("/_##########.sch") +
1.13 +7 -7 eda/geda/gaf/gschem/src/i_basic.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: i_basic.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/i_basic.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- i_basic.c 14 Jul 2006 02:23:54 -0000 1.12
+++ i_basic.c 15 Jul 2006 18:51:41 -0000 1.13
@@ -122,7 +122,7 @@
return _("Pan Mode");
case STARTPASTE:
case ENDPASTE:
- if (buf) free(buf);
+ if (buf) g_free(buf);
buf = g_strdup_printf(_("Paste %d Mode"), w_current->buffer_number+1);
return buf;
case STARTDRAWNET:
@@ -188,27 +188,27 @@
if ( message != NULL) {
if ( message && message[0] ) {
buf = g_strdup_printf("%s - ", message);
- if (aux) free(aux);
+ if (aux) g_free(aux);
aux = buf;
}
}
if ( !w_current->snap ) {
buf = g_strdup_printf("%s%s - ", buf, _("Snap Off"));
- if (aux) free(aux);
+ if (aux) g_free(aux);
aux = buf;
}
if ( w_current->show_hidden_text ) {
buf = g_strdup_printf("%s%s - ", buf, _("Show Hidden"));
- if (aux) free(aux);
+ if (aux) g_free(aux);
aux = buf;
}
if (buf != NULL) {
if (strlen(buf) > 0) {
buf = g_strdup_printf("%s%s", buf, state_string);
- if (aux) free(aux);
+ if (aux) g_free(aux);
aux = buf;
what_to_say = buf;
} else {
@@ -220,7 +220,7 @@
}
i_update_status(w_current, what_to_say);
- if (buf != NULL) free(buf);
+ if (buf != NULL) g_free(buf);
}
/*! \todo Finish function documentation!!!
@@ -315,7 +315,7 @@
gtk_label_set(GTK_LABEL(w_current->middle_label),
temp_string);
w_current->last_callback = func_ptr;
- free(temp_string);
+ g_free(temp_string);
break;
}
1.58 +12 -12 eda/geda/gaf/gschem/src/i_callbacks.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: i_callbacks.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/i_callbacks.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- i_callbacks.c 14 Jul 2006 02:23:54 -0000 1.57
+++ i_callbacks.c 15 Jul 2006 18:51:41 -0000 1.58
@@ -80,7 +80,7 @@
fname_new = g_strdup (p);
} else {
len = (p - fname); /* + 1; this extra was causing grief */
- fname_new = (char *) malloc(sizeof(char) * (len + 1));
+ fname_new = (char *) g_malloc(sizeof(char) * (len + 1));
if(fname_new == NULL) {
return NULL;
}
@@ -462,7 +462,7 @@
/* add ".ps" tp the base filename */
ps_filename = fnameext_add(base, ".ps");
- free(base);
+ g_free(base);
if (output_filename) {
x_print_setup(w_current, output_filename);
@@ -471,7 +471,7 @@
}
if (ps_filename) {
- free(ps_filename);
+ g_free(ps_filename);
}
}
@@ -515,7 +515,7 @@
/* add ".png" tp the base filename */
img_filename = fnameext_add(base, ".png");
- free(base);
+ g_free(base);
if (output_filename) {
x_image_setup(w_current, output_filename);
@@ -524,7 +524,7 @@
}
if (img_filename) {
- free(img_filename);
+ g_free(img_filename);
}
}
@@ -3043,17 +3043,17 @@
loaded_flag = TRUE;
}
- free(current_filename);
+ g_free(current_filename);
pcount++;
current_filename = u_basic_breakup_string(attrib, ',', pcount);
}
if (attrib) {
- free(attrib);
+ g_free(attrib);
}
if (current_filename) {
- free(current_filename);
+ g_free(current_filename);
}
count++;
@@ -3140,7 +3140,7 @@
o_redraw_all(w_current);
x_pagesel_update (w_current);
i_update_menus(w_current);
- free(filename);
+ g_free(filename);
}
}
}
@@ -3211,9 +3211,9 @@
object->complex_basename,
object->complex_clib);
- if (attrib_doc) free(attrib_doc);
- if (attrib_device) free(attrib_device);
- if (attrib_value) free(attrib_value);
+ if (attrib_doc) g_free(attrib_doc);
+ if (attrib_device) g_free(attrib_device);
+ if (attrib_value) g_free(attrib_value);
}
}
}
1.27 +4 -4 eda/geda/gaf/gschem/src/o_complex.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_complex.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_complex.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- o_complex.c 14 Jul 2006 02:23:54 -0000 1.26
+++ o_complex.c 15 Jul 2006 18:51:41 -0000 1.27
@@ -291,7 +291,7 @@
o_cue_draw_list(w_current, connected_objects);
g_list_free(connected_objects);
- free(include_filename);
+ g_free(include_filename);
if (w_current->actionfeedback_mode == OUTLINE) {
#if 0
@@ -382,7 +382,7 @@
if (w_current->embed_complex) {
char* new_basename;
- free(o_current->complex_clib);
+ g_free(o_current->complex_clib);
o_current->complex_clib = g_strdup ("EMBEDDED");
@@ -390,11 +390,11 @@
o_current->complex_basename,
NULL);
- free(o_current->complex_basename);
+ g_free(o_current->complex_basename);
o_current->complex_basename = g_strdup (new_basename);
- free(new_basename);
+ g_free(new_basename);
}
/* check for nulls in all this hack */
1.33 +7 -7 eda/geda/gaf/gschem/src/o_misc.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_misc.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_misc.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- o_misc.c 14 Jul 2006 02:23:55 -0000 1.32
+++ o_misc.c 15 Jul 2006 18:51:41 -0000 1.33
@@ -577,7 +577,7 @@
{
/* change the clib of complex to "EMBEDDED" */
if (o_current->complex_clib) {
- free (o_current->complex_clib);
+ g_free (o_current->complex_clib);
}
o_current->complex_clib = g_strdup ("EMBEDDED");
@@ -585,7 +585,7 @@
new_basename = g_strconcat ("EMBEDDED",
o_current->complex_basename,
NULL);
- free (o_current->complex_basename);
+ g_free (o_current->complex_basename);
o_current->complex_basename = new_basename;
s_log_message (_("Component [%s] has been embedded\n"),
@@ -638,11 +638,11 @@
} else {
/* set the object new basename */
- free (o_current->complex_basename);
+ g_free (o_current->complex_basename);
o_current->complex_basename = new_basename;
/* set the object new clib */
- free (o_current->complex_clib);
+ g_free (o_current->complex_clib);
if (g_slist_next (clibs)) {
s_log_message (_("More than one component found with name [%s]\n"),
new_basename);
@@ -1359,7 +1359,7 @@
for (item=o_list; item != NULL; item=g_slist_next(item)) {
o_current= item->data;
- free(o_current->text->string);
+ g_free(o_current->text->string);
while (*used != NULL && *currentnumber > GPOINTER_TO_INT((*used)->data)) {
*used=(*used)->next;
@@ -1377,9 +1377,9 @@
ss = g_strdup_printf("%s%d", stext, (*currentnumber)++);
/* printf("%s\n", ss); */
o_current->text->string =
- (char *) malloc(sizeof(char) * (strlen(ss) + 1));
+ (char *) g_malloc(sizeof(char) * (strlen(ss) + 1));
strcpy(o_current->text->string, ss);
- free(ss);
+ g_free(ss);
o_text_erase(w_current, o_current);
o_text_recreate(w_current, o_current);
o_text_draw(w_current, o_current);
1.27 +1 -1 eda/geda/gaf/gschem/src/o_net.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_net.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_net.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- o_net.c 14 Jul 2006 02:23:55 -0000 1.26
+++ o_net.c 15 Jul 2006 18:51:41 -0000 1.27
@@ -117,7 +117,7 @@
tempstring,
strlen(tempstring));
gdk_font_unref(font);
- free(tempstring);
+ g_free(tempstring);
#endif
}
1.2 +8 -8 eda/geda/gaf/gschem/src/o_picture.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_picture.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_picture.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- o_picture.c 14 Jul 2006 02:23:55 -0000 1.1
+++ o_picture.c 15 Jul 2006 18:51:41 -0000 1.2
@@ -291,7 +291,7 @@
o_picture_set_pixbuf(w_current, pixbuf, (char *) selected_filename);
/* o_picture_set_pixbuf allocates memory for filename, so free the pointer */
- free((char *)selected_filename);
+ g_free((char *)selected_filename);
w_current->page_current->CHANGED=1;
@@ -472,7 +472,7 @@
*/
if (o_current->picture->displayed_picture != NULL) {
- free(o_current->picture->displayed_picture);
+ g_free(o_current->picture->displayed_picture);
o_current->picture->displayed_picture = NULL;
}
/* If it's not drawing using the background color then draw the image */
@@ -490,7 +490,7 @@
temp_pixbuf2 = gdk_pixbuf_mirror_flip(temp_pixbuf1,
o_current->picture->mirrored, FALSE);
- free(temp_pixbuf1);
+ g_free(temp_pixbuf1);
if (temp_pixbuf2 == NULL) {
fprintf(stderr, "Couldn't get enough memory for mirroring the picture\n");
@@ -504,7 +504,7 @@
abs(o_current->picture->screen_lower_y -
o_current->picture->screen_upper_y),
GDK_INTERP_BILINEAR);
- free(temp_pixbuf2);
+ g_free(temp_pixbuf2);
if (o_current->picture->displayed_picture == NULL) {
fprintf(stderr, "Couldn't get enough memory for scaling the picture\n");
@@ -813,12 +813,12 @@
/* Change picture attributes */
if (object->picture->original_picture != NULL) {
- free(object->picture->original_picture);
+ g_free(object->picture->original_picture);
object->picture->original_picture=NULL;
}
if (object->picture->filename != NULL) {
- free(object->picture->filename);
+ g_free(object->picture->filename);
object->picture->filename=NULL;
}
/* Create a copy of the pixbuf rotated */
@@ -841,8 +841,8 @@
list = list->next;
}
- free ((char *) selected_filename);
- free(pixbuf);
+ g_free ((char *) selected_filename);
+ g_free(pixbuf);
w_current->page_current->CHANGED=1;
i_allow_expose();
1.19 +15 -15 eda/geda/gaf/gschem/src/o_slot.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_slot.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_slot.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- o_slot.c 14 Jul 2006 02:23:55 -0000 1.18
+++ o_slot.c 15 Jul 2006 18:51:41 -0000 1.19
@@ -70,7 +70,7 @@
#endif
slot_edit_dialog(w_current,
slot_text_object->text->string);
- free(slot_value);
+ g_free(slot_value);
} else {
/* we didn't find an attached slot=? attribute */
@@ -80,7 +80,7 @@
if (default_slot_value) {
/* two is for null and equals sign */
- slot_value = (char *) malloc(sizeof(char)*(
+ slot_value = (char *) g_malloc(sizeof(char)*(
strlen("slot")+
strlen(default_slot_value)+
2));
@@ -98,8 +98,8 @@
#endif
slot_edit_dialog(w_current, slot_value);
- free(slot_value);
- free(default_slot_value);
+ g_free(slot_value);
+ g_free(default_slot_value);
}
}
}
@@ -138,13 +138,13 @@
s_log_message(_("numslots attribute missing\n"));
s_log_message(
_("Slotting not allowed for this component\n"));
- if (name) free(name);
- if (value) free(value);
+ if (name) g_free(name);
+ if (value) g_free(value);
return;
}
numslots = atoi(numslots_value);
- free(numslots_value);
+ g_free(numslots_value);
new_slot_number = atoi(value);
@@ -154,8 +154,8 @@
if (new_slot_number > numslots || new_slot_number <=0 ) {
s_log_message(_("New slot number out of range\n"));
- if (name) free(name);
- if (value) free(value);
+ if (name) g_free(name);
+ if (value) g_free(value);
return;
}
@@ -165,7 +165,7 @@
if (slot_value) {
if (slot_text_object->text->string) {
- free(slot_text_object->text->string);
+ g_free(slot_text_object->text->string);
}
slot_text_object->text->string = g_strdup (string);
@@ -186,7 +186,7 @@
o_redraw_single(w_current,temp);
}
- free(slot_value);
+ g_free(slot_value);
} else {
/* here you need to do the add the slot
@@ -233,14 +233,14 @@
w_current->page_current->CHANGED = 1;
o_undo_savestate(w_current, UNDO_ALL);
- if (name) free(name);
- if (value) free(value);
+ if (name) g_free(name);
+ if (value) g_free(value);
} else {
fprintf(stderr,
_("uggg! you tried to slot edit something that doesn't exist!\n"));
- if (name) free(name);
- if (value) free(value);
+ if (name) g_free(name);
+ if (value) g_free(value);
exit(-1);
}
}
1.18 +3 -3 eda/geda/gaf/gschem/src/o_text.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_text.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_text.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- o_text.c 14 Jul 2006 02:23:55 -0000 1.17
+++ o_text.c 15 Jul 2006 18:51:41 -0000 1.18
@@ -639,13 +639,13 @@
/* only change text string if there is only ONE text object selected */
if (numselect == 1 && string) {
if (object->text->string) {
- free(object->text->string);
+ g_free(object->text->string);
}
/* Kazu <kazu@xxxxxxxx> on August 5, 1999 - I am not
sure if strlen(string) == len. If so, activate the
second part of this "if".*/
#if 1
- object->text->string = malloc(sizeof(char) * len + 1);
+ object->text->string = g_malloc(sizeof(char) * len + 1);
strcpy(object->text->string, string);
#else
object->text->string = g_strdup (string);
@@ -698,7 +698,7 @@
/* second change the real object */
if (object->text->string) {
- free(object->text->string);
+ g_free(object->text->string);
}
object->text->string = g_strdup (string);
1.7 +7 -7 eda/geda/gaf/gschem/src/o_undo.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_undo.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_undo.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- o_undo.c 14 Jul 2006 02:23:55 -0000 1.6
+++ o_undo.c 15 Jul 2006 18:51:41 -0000 1.7
@@ -107,7 +107,7 @@
/* 32 is? for max length of pid and index */
- filename = malloc(sizeof(char)*(strlen("/gschem.save_.sch")+
+ filename = g_malloc(sizeof(char)*(strlen("/gschem.save_.sch")+
strlen(TMP)+32));
sprintf(filename, "%s%cgschem.save%d_%d.sch", TMP, G_DIR_SEPARATOR,
@@ -177,7 +177,7 @@
#endif
if (filename) {
- free(filename);
+ g_free(filename);
}
/* Now go through and see if we need to free/remove some undo levels */
@@ -210,7 +210,7 @@
printf("Freeing: %s\n", u_current->filename);
#endif
unlink(u_current->filename);
- free(u_current->filename);
+ g_free(u_current->filename);
}
if (u_current->object_head) {
@@ -223,7 +223,7 @@
u_current->next = NULL;
u_current->prev = NULL;
- free(u_current);
+ g_free(u_current);
u_current = u_current_next;
levels--;
@@ -424,7 +424,7 @@
do_logging = save_logging;
/* set filename right */
- free(w_current->page_current->page_filename);
+ g_free(w_current->page_current->page_filename);
w_current->page_current->page_filename = save_filename;
/* final redraw */
@@ -506,11 +506,11 @@
filename = g_strdup_printf("%s%cgschem.save%d_%d.sch", TMP, G_DIR_SEPARATOR,
prog_pid, i);
unlink(filename);
- free(filename);
+ g_free(filename);
}
if (freeTMP) {
- free(TMP);
+ g_free(TMP);
TMP = NULL;
}
}
1.2 +3 -3 eda/geda/gaf/gschem/src/x_attribedit.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_attribedit.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_attribedit.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- x_attribedit.c 14 Jul 2006 02:23:55 -0000 1.1
+++ x_attribedit.c 15 Jul 2006 18:51:41 -0000 1.2
@@ -263,7 +263,7 @@
gtk_grab_remove(w_current->aewindow);
gtk_widget_destroy(w_current->aewindow);
w_current->aewindow = NULL;
- free(newtext);
+ g_free(newtext);
}
/*! \todo Finish function documentation!!!
@@ -672,8 +672,8 @@
gtk_widget_grab_focus(attrib_combo_entry);
}
- if (name) free(name);
- if (val) free(val);
+ if (name) g_free(name);
+ if (val) g_free(val);
}
/***************** End of Attrib Edit dialog box **********************/
1.9 +2 -2 eda/geda/gaf/gschem/src/x_color.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_color.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_color.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- x_color.c 14 Jul 2006 02:23:55 -0000 1.8
+++ x_color.c 15 Jul 2006 18:51:41 -0000 1.9
@@ -49,7 +49,7 @@
for (i = 0; i < MAX_COLORS; i++) {
if (colors[i].color_name) {
colors[i].gtk_color = (GdkColor *)
- malloc(sizeof(GdkColor));
+ g_malloc(sizeof(GdkColor));
error = gdk_color_parse(colors[i].color_name,
colors[i].gtk_color);
@@ -86,7 +86,7 @@
if (colors[i].outline_color_name) {
colors[i].gtk_outline_color = (GdkColor *)
- malloc(sizeof(GdkColor));
+ g_malloc(sizeof(GdkColor));
error = gdk_color_parse(colors[i].outline_color_name,
colors[i].gtk_outline_color);
1.57 +30 -30 eda/geda/gaf/gschem/src/x_dialog.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_dialog.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_dialog.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- x_dialog.c 14 Jul 2006 02:23:55 -0000 1.56
+++ x_dialog.c 15 Jul 2006 18:51:41 -0000 1.57
@@ -370,7 +370,7 @@
buf = g_strdup_printf( _("Lower Left"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_object_set_data (GTK_OBJECT(menuitem), "alignment", "0");
@@ -381,7 +381,7 @@
buf = g_strdup_printf( _("Middle Left"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_object_set_data (GTK_OBJECT(menuitem), "alignment", "1");
@@ -392,7 +392,7 @@
buf = g_strdup_printf( _("Upper Left"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_object_set_data (GTK_OBJECT(menuitem), "alignment", "2");
@@ -403,7 +403,7 @@
buf = g_strdup_printf( _("Lower Middle"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_object_set_data (GTK_OBJECT(menuitem), "alignment", "3");
@@ -414,7 +414,7 @@
buf = g_strdup_printf( _("Middle Middle"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_object_set_data (GTK_OBJECT(menuitem), "alignment", "4");
@@ -425,7 +425,7 @@
buf = g_strdup_printf( _("Upper Middle"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_object_set_data (GTK_OBJECT(menuitem), "alignment", "5");
@@ -436,7 +436,7 @@
buf = g_strdup_printf( _("Lower Right"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_object_set_data (GTK_OBJECT(menuitem), "alignment", "6");
@@ -447,7 +447,7 @@
buf = g_strdup_printf( _("Middle Right"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_object_set_data (GTK_OBJECT(menuitem), "alignment", "7");
@@ -458,7 +458,7 @@
buf = g_strdup_printf( _("Upper Right"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_object_set_data (GTK_OBJECT(menuitem), "alignment", "8");
@@ -752,7 +752,7 @@
text_size_string = g_strdup_printf("%d", text_size);
gtk_entry_set_text(GTK_ENTRY(w_current->tsentry),
text_size_string);
- free(text_size_string);
+ g_free(text_size_string);
gtk_grab_add (w_current->tewindow);
}
@@ -1004,7 +1004,7 @@
gchar *width_str, *space_str, *length_str;
gint type;
- line_type_data = (struct line_type_data*) malloc (
+ line_type_data = (struct line_type_data*) g_malloc (
sizeof (struct line_type_data));
dialog = x_create_dialog_box(&vbox, &action_area);
@@ -1423,7 +1423,7 @@
gchar *width_str, *angle1_str, *pitch1_str, *angle2_str, *pitch2_str;
gint type;
- fill_type_data = (struct fill_type_data*) malloc (
+ fill_type_data = (struct fill_type_data*) g_malloc (
sizeof (struct fill_type_data));
dialog = x_create_dialog_box (&vbox, &action_area);
@@ -2240,7 +2240,7 @@
gtk_entry_select_region(GTK_ENTRY(w_current->tsentry), 0, len);
gtk_widget_show (w_current->tswindow);
gtk_grab_add(w_current->tswindow);
- free(string);
+ g_free(string);
}
}
@@ -2398,7 +2398,7 @@
gtk_entry_select_region(GTK_ENTRY(w_current->tsentry), 0, len);
gtk_widget_show (w_current->tswindow);
gtk_grab_add (w_current->tswindow);
- free(string);
+ g_free(string);
}
}
@@ -2643,7 +2643,7 @@
string = g_strdup_printf( _("gEDA : GPL Electronic Design Automation"));
label = gtk_label_new (string);
- free(string);
+ g_free(string);
gtk_box_pack_start(
GTK_BOX(vbox),
label, TRUE, TRUE, 5);
@@ -2651,7 +2651,7 @@
string = g_strdup_printf(_("gschem version %s"), VERSION);
label = gtk_label_new (string);
- free(string);
+ g_free(string);
gtk_box_pack_start(
GTK_BOX(vbox),
label, TRUE, TRUE, 5);
@@ -2659,7 +2659,7 @@
string = g_strdup_printf( _("Written by:\nAles V. Hvezda\nahvezda@xxxxxxxxxxxxx\nAnd many others (See AUTHORS file)"));
label = gtk_label_new (string);
- free(string);
+ g_free(string);
gtk_box_pack_start(
GTK_BOX(vbox),
label, TRUE, TRUE, 5);
@@ -2729,13 +2729,13 @@
string = g_strdup_printf("(%d, %d)", x, y);
gtk_label_set_text(GTK_LABEL(w_current->coord_screen), string );
- free(string);
+ g_free(string);
SCREENtoWORLD(w_current, x, y, &world_x, &world_y);
string = g_strdup_printf("(%d, %d)", world_x, world_y);
gtk_label_set_text(GTK_LABEL(w_current->coord_world), string );
- free(string);
+ g_free(string);
}
/*! \todo Finish function documentation!!!
@@ -2960,7 +2960,7 @@
fprintf(stderr, "no object selected - WHEE!\n");
}else{
select_col = object->saved_color;
- //fprintf(stderr, "setting object color %d\n", select_col);
+ /* fprintf(stderr, "setting object color %d\n", select_col); */
}
}else /*fprintf(stderr, "no object selected\n")*/;
@@ -2971,13 +2971,13 @@
menu_string = g_strdup_printf("%d | %s | %s", index,
temp,
buf);
- free(temp);
+ g_free(temp);
temp = NULL;
g_free(buf);
buf = NULL;
menuitem = gtk_radio_menu_item_new_with_label (group,
menu_string);
- free(menu_string);
+ g_free(menu_string);
menu_string = NULL;
group = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(
@@ -3001,13 +3001,13 @@
/* set the default to the current color */
if (index == global_window_current->edit_color) {
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- //fprintf(stderr, "checking item %d\n", index);
+ /*fprintf(stderr, "checking item %d\n", index); */
*select_index = item_index;
}
}else{
if (index == select_col){
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- //fprintf(stderr, "checking selected item %d\n", index);
+ /* fprintf(stderr, "checking selected item %d\n", index); */
*select_index = item_index;
}
}
@@ -3225,7 +3225,7 @@
for (i = 0 ; i < hotkey_counter; i++) {
if (hotkey_strings[i]) {
- free(hotkey_strings[i]);
+ g_free(hotkey_strings[i]);
}
}
}
@@ -3243,7 +3243,7 @@
return;
}
- hotkey_strings[hotkey_counter] = (char *) malloc(sizeof(char)*(
+ hotkey_strings[hotkey_counter] = (char *) g_malloc(sizeof(char)*(
strlen(string)+1));
;
strcpy(hotkey_strings[hotkey_counter], string);
@@ -4551,7 +4551,7 @@
refdes_string = g_strdup (value);
} else {
tmp = g_strconcat (refdes_string, "\n", value, NULL);
- free(refdes_string);
+ g_free(refdes_string);
refdes_string = tmp;
}
@@ -4561,7 +4561,7 @@
tmp = g_strconcat (refdes_string,
"\n\nBe sure to verify each of these symbols!",
NULL);
- free(refdes_string);
+ g_free(refdes_string);
refdes_string = tmp;
#ifdef HAS_GTK22
@@ -4582,12 +4582,12 @@
"\n Major symbol changes detected in refdes: \n\n",
refdes_string,
NULL);
- free(refdes_string);
+ g_free(refdes_string);
refdes_string = tmp;
quick_message_dialog(refdes_string);
#endif
- if (refdes_string) free(refdes_string);
+ if (refdes_string) g_free(refdes_string);
}
}
1.21 +41 -41 eda/geda/gaf/gschem/src/x_fileselect.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_fileselect.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_fileselect.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- x_fileselect.c 14 Jul 2006 02:23:55 -0000 1.20
+++ x_fileselect.c 15 Jul 2006 18:51:41 -0000 1.21
@@ -64,12 +64,12 @@
x_fileselect_free_list_buffers(f_current);
if (f_current->directory) {
- free(f_current->directory);
+ g_free(f_current->directory);
f_current->directory = NULL;
}
if (f_current->filename) {
- free(f_current->filename);
+ g_free(f_current->filename);
f_current->filename = NULL;
}
@@ -126,14 +126,14 @@
for (i = 0; i < MAX_FILES; i++) {
if (f_current->file_entries[i])
- free(f_current->file_entries[i]);
+ g_free(f_current->file_entries[i]);
f_current->file_entries[i] = NULL;
}
for (i = 0; i < MAX_DIRS; i++) {
if (f_current->directory_entries[i])
- free(f_current->directory_entries[i]);
+ g_free(f_current->directory_entries[i]);
f_current->directory_entries[i] = NULL;
}
@@ -151,12 +151,12 @@
char *temp=NULL;
if (f_current->filename) {
- free(f_current->filename);
+ g_free(f_current->filename);
f_current->filename = NULL;
}
if (f_current->directory) {
- free(f_current->directory);
+ g_free(f_current->directory);
f_current->directory = NULL;
}
@@ -167,7 +167,7 @@
f_current->directory = g_strdup (temp);
f_current->filename = g_strdup (filename);
- free(temp);
+ g_free(temp);
#ifdef __MINGW32__
if (u_basic_has_trailing(f_current->directory, G_DIR_SEPARATOR)) {
temp = g_strconcat (f_current->directory,
@@ -187,7 +187,7 @@
f_current->directory = g_strdup (temp);
if (f_current->filename) {
- free(f_current->filename);
+ g_free(f_current->filename);
f_current->filename=NULL;
}
@@ -195,7 +195,7 @@
f_current->directory);
}
- free(temp);
+ g_free(temp);
#if DEBUG
printf("directory: %s\n", f_current->directory);
@@ -215,14 +215,14 @@
for (i = 0; i < num_files+1; i++) {
if (f_current->file_entries[i]) {
- free(f_current->file_entries[i]);
+ g_free(f_current->file_entries[i]);
}
f_current->file_entries[i] = NULL;
}
for (i = 0; i < num_directories+1; i++) {
if (f_current->directory_entries[i]) {
- free(f_current->directory_entries[i]);
+ g_free(f_current->directory_entries[i]);
}
f_current->directory_entries[i] = NULL;
}
@@ -352,7 +352,7 @@
(strcmp(dirent_ptr->d_name, ".") != 0)) {
f_current->directory_entries[dir_count] = (char *)
- malloc(sizeof(char)*(strlen(dirent_ptr->d_name)+2));
+ g_malloc(sizeof(char)*(strlen(dirent_ptr->d_name)+2));
sprintf(f_current->directory_entries[dir_count],
"%s", dirent_ptr->d_name);
@@ -362,7 +362,7 @@
if (x_fileselect_include_file(dirent_ptr->d_name,
f_current->filter_type)) {
f_current->file_entries[file_count] = (char *)
- malloc(sizeof(char)*(strlen(dirent_ptr->d_name)+1));
+ g_malloc(sizeof(char)*(strlen(dirent_ptr->d_name)+1));
strcpy(f_current->file_entries[file_count],
dirent_ptr->d_name);
file_count++;
@@ -461,7 +461,7 @@
max_width = width;
}
- free(temp);
+ g_free(temp);
#if DEBUG
printf("directory: %s\n", f_current->directory_entries[i]);
#endif
@@ -564,7 +564,7 @@
buf = g_strdup_printf(_("sch - Schematics"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect(GTK_OBJECT (menuitem), "activate",
@@ -574,7 +574,7 @@
buf = g_strdup_printf( _("sym - Symbols "));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect(GTK_OBJECT (menuitem), "activate",
@@ -584,7 +584,7 @@
buf = g_strdup_printf(_("sym/sch - Schematics and Symbols"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect(GTK_OBJECT (menuitem), "activate",
@@ -594,7 +594,7 @@
buf = g_strdup_printf( _("* - All Files"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect(GTK_OBJECT (menuitem), "activate",
@@ -706,7 +706,7 @@
if (string[len - 1] != G_DIR_SEPARATOR) {
if (w_current->page_current->page_filename) {
- free(w_current->page_current->page_filename);
+ g_free(w_current->page_current->page_filename);
}
w_current->page_current->page_filename = g_strdup (string);
@@ -741,7 +741,7 @@
s_log_message(_("Specify a Filename!\n"));
}
if (string != NULL) {
- free ( (void *) string);
+ g_free ( (void *) string);
}
}
@@ -859,7 +859,7 @@
s_log_message(_("Specify a Filename!\n"));
}
- free(string);
+ g_free(string);
} /* end for files . . . */
/* Now close file dialog window . . . . */
@@ -977,12 +977,12 @@
int i;
if (f_current->filename) {
- free(f_current->filename);
+ g_free(f_current->filename);
f_current->filename = NULL;
}
if (f_current->directory) {
- free(f_current->directory);
+ g_free(f_current->directory);
f_current->directory = NULL;
}
@@ -990,8 +990,8 @@
return;
}
- directory = (char *) malloc(sizeof(char)*(strlen(new_filename)+1));
- filename = (char *) malloc(sizeof(char)*(strlen(new_filename)+1));
+ directory = (char *) g_malloc(sizeof(char)*(strlen(new_filename)+1));
+ filename = (char *) g_malloc(sizeof(char)*(strlen(new_filename)+1));
ptr = new_filename;
temp = strrchr(new_filename, G_DIR_SEPARATOR);
@@ -1023,12 +1023,12 @@
if (directory) {
f_current->directory = g_strdup (directory);
- free(directory);
+ g_free(directory);
}
if (filename) {
f_current->filename = g_strdup (filename);
- free(filename);
+ g_free(filename);
}
#ifdef __MINGW32__
@@ -1045,7 +1045,7 @@
#endif
gtk_entry_set_text(GTK_ENTRY(f_current->filename_entry), temp);
- free(temp);
+ g_free(temp);
#if DEBUG
printf("directory: %s\n", f_current->directory);
@@ -1206,7 +1206,7 @@
buf = g_strdup_printf(_("Default behavior - reference component"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect(GTK_OBJECT (menuitem), "activate",
@@ -1217,7 +1217,7 @@
buf = g_strdup_printf(_("Embed component in schematic"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect(GTK_OBJECT (menuitem), "activate",
@@ -1227,7 +1227,7 @@
buf = g_strdup_printf(_("Include component as individual objects"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect(GTK_OBJECT (menuitem), "activate",
@@ -1347,7 +1347,7 @@
/* update current_clib in toplevel with new directory name */
if (f_current->toplevel->current_clib) {
- free (f_current->toplevel->current_clib);
+ g_free (f_current->toplevel->current_clib);
}
f_current->toplevel->current_clib = g_strdup (
f_current->directory_entries[row]);
@@ -1385,7 +1385,7 @@
}
/* get ride of the list of filenames */
- g_slist_foreach (filenames, (GFunc)free, NULL);
+ g_slist_foreach (filenames, (GFunc)g_free, NULL);
g_slist_free (filenames);
/* allow visual updates to clist */
@@ -1408,13 +1408,13 @@
/* component */
if (f_current->filename) {
- free(f_current->filename);
+ g_free(f_current->filename);
f_current->filename = NULL;
}
/* library */
if (f_current->directory) {
- free(f_current->directory);
+ g_free(f_current->directory);
f_current->directory = NULL;
}
@@ -1444,7 +1444,7 @@
}
#endif
gtk_entry_set_text(GTK_ENTRY(f_current->filename_entry), temp);
- free(temp);
+ g_free(temp);
} else if (f_current->directory && !f_current->filename) {
gtk_entry_set_text(GTK_ENTRY(f_current->filename_entry),
f_current->directory);
@@ -1662,7 +1662,7 @@
}
/* free the list of filenames */
- g_slist_foreach (filenames, (GFunc)free, NULL);
+ g_slist_foreach (filenames, (GFunc)g_free, NULL);
g_slist_free (filenames);
/* nothing found? */
@@ -1964,7 +1964,7 @@
}
gtk_widget_show (f_current->dir_list);
gtk_widget_show (scrolled_win);
- free(dir_title[0]);
+ g_free(dir_title[0]);
/* ----- Create the files clist ----- */
if (type == FILESELECT) {
@@ -2013,7 +2013,7 @@
}
gtk_widget_show (f_current->file_list);
gtk_widget_show (scrolled_win);
- free(file_title[0]);
+ g_free(file_title[0]);
/* ----- create the preview widget ----- */
f_current->preview = x_preview_setup(f_current->xfwindow,
@@ -2373,7 +2373,7 @@
x_fileselect_close (NULL, f_current);
}
- free (title);
+ g_free (title);
} else if ( (filesel_type == SAVEAS) || (filesel_type == SAVEAS_CLOSE) ){
title = g_strdup(_("Save As..."));
@@ -2426,7 +2426,7 @@
break;
}
- free (title);
+ g_free (title);
}
else {
/* If it's not file load/save, then it's component library selection.
1.15 +1 -1 eda/geda/gaf/gschem/src/x_grid.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_grid.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_grid.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- x_grid.c 14 Jul 2006 02:23:55 -0000 1.14
+++ x_grid.c 15 Jul 2006 18:51:41 -0000 1.15
@@ -224,7 +224,7 @@
screen_x+10, screen_y+10,
tempstring,
strlen(tempstring));
- free(tempstring);
+ g_free(tempstring);
}
}
1.21 +11 -11 eda/geda/gaf/gschem/src/x_image.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_image.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_image.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- x_image.c 14 Jul 2006 02:23:55 -0000 1.20
+++ x_image.c 15 Jul 2006 18:51:41 -0000 1.21
@@ -142,7 +142,7 @@
buf = g_strdup_printf("320x240");
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
@@ -153,7 +153,7 @@
buf = g_strdup_printf("640x480");
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
@@ -164,7 +164,7 @@
buf = g_strdup_printf("800x600");
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
@@ -174,7 +174,7 @@
buf = g_strdup_printf("1024x768");
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
@@ -184,7 +184,7 @@
buf = g_strdup_printf("1280x960");
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
@@ -194,7 +194,7 @@
buf = g_strdup_printf("1600x1200");
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
@@ -204,7 +204,7 @@
buf = g_strdup_printf("3200x2400");
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
@@ -298,9 +298,9 @@
}
}
if (filetype != NULL)
- free(filetype);
+ g_free(filetype);
if (pixbuf != NULL)
- free(pixbuf);
+ g_free(pixbuf);
}
else {
fprintf(stderr, "x_image_lowlevel: Unable to get pixbuf from gschem's window.\n");
@@ -701,10 +701,10 @@
}
if (toplevel.window != NULL) {
- free(toplevel.window);
+ g_free(toplevel.window);
}
if (toplevel.backingstore != NULL) {
- free(toplevel.backingstore);
+ g_free(toplevel.backingstore);
}
return(pixbuf);
1.36 +9 -9 eda/geda/gaf/gschem/src/x_menus.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_menus.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_menus.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- x_menus.c 14 Jul 2006 02:23:55 -0000 1.35
+++ x_menus.c 15 Jul 2006 18:51:41 -0000 1.36
@@ -95,7 +95,7 @@
SCM scm_index;
SCM scm_keys;
char *menu_name;
- char **raw_menu_name = malloc (sizeof(char *));
+ char **raw_menu_name = g_malloc (sizeof(char *));
char *menu_item_name;
char *raw_menu_item_name;
char *menu_item_func;
@@ -178,9 +178,9 @@
} else {
buf = g_strdup_printf("(find-key '%s)", menu_item_hotkey_func);
scm_keys = scm_c_eval_string (buf);
- free(buf);
+ g_free(buf);
if (scm_keys == SCM_BOOL_F) {
- menu_item_keys = malloc(sizeof(char)*2);
+ menu_item_keys = g_malloc(sizeof(char)*2);
menu_item_keys[0] = ' ';
menu_item_keys[1] = '\0';
} else {
@@ -211,7 +211,7 @@
pad = 1;
}
- spaces = malloc(sizeof(char)*(pad+1));
+ spaces = g_malloc(sizeof(char)*(pad+1));
memset(spaces, ' ', pad);
spaces[pad] = '\0';
buf = g_strdup_printf("%s%s%s", menu_item_name, spaces, menu_item_keys);
@@ -222,14 +222,14 @@
#endif
menu_item = gtk_menu_item_new_with_label(buf);
- free(buf);
+ g_free(buf);
gtk_menu_append(GTK_MENU(menu), menu_item);
gtk_signal_connect_object(GTK_OBJECT(menu_item), "activate",
GTK_SIGNAL_FUNC(g_menu_execute),
(gpointer) g_strdup (menu_item_func));
/* The g_strdup is a memory leak, but this is okay. I think. */
- free(spaces);
- free(menu_item_keys);
+ g_free(spaces);
+ g_free(menu_item_keys);
}
gtk_widget_show(menu_item);
@@ -238,7 +238,7 @@
/* This string should NOT be internationalized */
buf = g_strdup_printf("%s/%s", *raw_menu_name, raw_menu_item_name);
gtk_object_set_data(GTK_OBJECT(menu_bar), buf, menu_item);
- free(buf);
+ g_free(buf);
}
@@ -255,7 +255,7 @@
gtk_menu_bar_append (GTK_MENU_BAR (menu_bar), root_menu);
}
- free(raw_menu_name);
+ g_free(raw_menu_name);
*menubar = menu_bar;
}
1.14 +6 -6 eda/geda/gaf/gschem/src/x_pagesel.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_pagesel.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_pagesel.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- x_pagesel.c 14 Jul 2006 02:23:55 -0000 1.13
+++ x_pagesel.c 15 Jul 2006 18:51:41 -0000 1.14
@@ -133,7 +133,7 @@
}
enum {
- PROP_TOPLEVEL=1,
+ PROP_TOPLEVEL=1
};
enum {
@@ -232,11 +232,11 @@
i_callback_ ## action (PAGESEL (user_data)->toplevel, 0, NULL); \
}
-DEFINE_POPUP_CALLBACK (new_page, file_new);
-DEFINE_POPUP_CALLBACK (open_page, file_open);
-DEFINE_POPUP_CALLBACK (save_page, file_save);
-DEFINE_POPUP_CALLBACK (close_page, page_close);
-DEFINE_POPUP_CALLBACK (discard_page, page_discard);
+DEFINE_POPUP_CALLBACK (new_page, file_new)
+DEFINE_POPUP_CALLBACK (open_page, file_open)
+DEFINE_POPUP_CALLBACK (save_page, file_save)
+DEFINE_POPUP_CALLBACK (close_page, page_close)
+DEFINE_POPUP_CALLBACK (discard_page, page_discard)
/*! \brief Popup context-sensitive menu.
1.20 +5 -5 eda/geda/gaf/gschem/src/x_print.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_print.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_print.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- x_print.c 14 Jul 2006 02:23:55 -0000 1.19
+++ x_print.c 15 Jul 2006 18:51:41 -0000 1.20
@@ -112,7 +112,7 @@
buf = g_strdup_printf(_("Landscape"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect(GTK_OBJECT (menuitem), "activate",
@@ -123,7 +123,7 @@
buf = g_strdup_printf(_("Portrait"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect(GTK_OBJECT (menuitem), "activate",
@@ -161,7 +161,7 @@
buf = g_strdup_printf(_("Extents with margins"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect(GTK_OBJECT (menuitem), "activate",
@@ -171,7 +171,7 @@
buf = g_strdup_printf(_("Extents no margins"));
menuitem = gtk_radio_menu_item_new_with_label(group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(menuitem));
gtk_menu_append(GTK_MENU(menu), menuitem);
gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
@@ -180,7 +180,7 @@
buf = g_strdup_printf(_("Current Window"));
menuitem = gtk_radio_menu_item_new_with_label (group, buf);
- free(buf);
+ g_free(buf);
group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
gtk_menu_append (GTK_MENU (menu), menuitem);
gtk_signal_connect(GTK_OBJECT (menuitem), "activate",
1.12 +3 -3 eda/geda/gaf/gschem/src/x_stroke.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_stroke.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_stroke.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- x_stroke.c 14 Jul 2006 02:23:55 -0000 1.11
+++ x_stroke.c 15 Jul 2006 18:51:41 -0000 1.12
@@ -47,7 +47,7 @@
{
STROKE_POINT *new_point;
- new_point = (STROKE_POINT *) malloc (sizeof(STROKE_POINT));
+ new_point = (STROKE_POINT *) g_malloc(sizeof(STROKE_POINT));
new_point->x = x;
new_point->y = y;
@@ -101,7 +101,7 @@
temp = stroke_points;
stroke_points = stroke_points->next;
- free (temp);
+ g_free(temp);
}
stroke_points = NULL;
@@ -123,7 +123,7 @@
temp = stroke_points;
stroke_points = stroke_points->next;
- free (temp);
+ g_free(temp);
}
stroke_points = NULL;
1.30 +17 -17 eda/geda/gaf/gschem/src/x_window.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_window.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_window.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- x_window.c 14 Jul 2006 02:23:55 -0000 1.29
+++ x_window.c 15 Jul 2006 18:51:41 -0000 1.30
@@ -524,7 +524,7 @@
bg[GTK_STATE_NORMAL]),
(GtkSignalFunc) i_callback_toolbar_file_new,
w_current);
- free(filename);
+ g_free(filename);
filename = g_strconcat(w_current->bitmap_directory,
G_DIR_SEPARATOR_S, "gschem-open.xpm", NULL);
gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
@@ -537,7 +537,7 @@
bg[GTK_STATE_NORMAL]),
(GtkSignalFunc) i_callback_toolbar_file_open,
w_current);
- free(filename);
+ g_free(filename);
filename = g_strconcat(w_current->bitmap_directory,
G_DIR_SEPARATOR_S, "gschem-save.xpm", NULL);
gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
@@ -551,7 +551,7 @@
(GtkSignalFunc) i_callback_toolbar_file_save,
w_current);
gtk_toolbar_append_space (GTK_TOOLBAR(toolbar));
- free(filename);
+ g_free(filename);
filename = g_strconcat(w_current->bitmap_directory,
G_DIR_SEPARATOR_S, "gschem-undo.xpm", NULL);
gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
@@ -564,7 +564,7 @@
bg[GTK_STATE_NORMAL]),
(GtkSignalFunc) i_callback_toolbar_edit_undo,
w_current);
- free(filename);
+ g_free(filename);
filename = g_strconcat(w_current->bitmap_directory,
G_DIR_SEPARATOR_S, "gschem-redo.xpm", NULL);
gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
@@ -578,7 +578,7 @@
(GtkSignalFunc) i_callback_toolbar_edit_redo,
w_current);
gtk_toolbar_append_space (GTK_TOOLBAR(toolbar));
- free(filename);
+ g_free(filename);
filename = g_strconcat(w_current->bitmap_directory,
G_DIR_SEPARATOR_S, "gschem-comp.xpm", NULL);
/* not part of any radio button group */
@@ -592,7 +592,7 @@
bg[GTK_STATE_NORMAL]),
(GtkSignalFunc) i_callback_toolbar_add_component,
w_current);
- free(filename);
+ g_free(filename);
filename = g_strconcat(w_current->bitmap_directory,
G_DIR_SEPARATOR_S, "gschem-net.xpm", NULL);
w_current->toolbar_net = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
@@ -607,7 +607,7 @@
bg[GTK_STATE_NORMAL]),
(GtkSignalFunc) i_callback_toolbar_add_net,
w_current);
- free(filename);
+ g_free(filename);
filename = g_strconcat(w_current->bitmap_directory,
G_DIR_SEPARATOR_S, "gschem-bus.xpm", NULL);
w_current->toolbar_bus = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
@@ -622,7 +622,7 @@
bg[GTK_STATE_NORMAL]),
(GtkSignalFunc) i_callback_toolbar_add_bus,
w_current);
- free(filename);
+ g_free(filename);
filename = g_strconcat(w_current->bitmap_directory,
G_DIR_SEPARATOR_S, "gschem-text.xpm", NULL);
/* not part of any radio button group */
@@ -639,7 +639,7 @@
gtk_toolbar_append_space (GTK_TOOLBAR(toolbar));
- free(filename);
+ g_free(filename);
filename = g_strconcat(w_current->bitmap_directory,
G_DIR_SEPARATOR_S, "gschem-select.xpm", NULL);
w_current->toolbar_select = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
@@ -654,7 +654,7 @@
bg[GTK_STATE_NORMAL]),
(GtkSignalFunc) i_callback_toolbar_edit_select,
w_current);
- free(filename);
+ g_free(filename);
#if 0 /* out until they work */
filename = g_strconcat(w_current->bitmap_directory,
@@ -671,7 +671,7 @@
bg[GTK_STATE_NORMAL]),
(GtkSignalFunc) NULL,
w_current);
- free(filename);
+ g_free(filename);
filename = g_strconcat(w_current->bitmap_directory,
G_DIR_SEPARATOR_S, "gschem-move.xpm", NULL);
w_current->toolbar_edit = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
@@ -686,7 +686,7 @@
bg[GTK_STATE_NORMAL]),
(GtkSignalFunc) NULL,
w_current);
- free(filename);
+ g_free(filename);
filename = g_strconcat(w_current->bitmap_directory,
G_DIR_SEPARATOR_S, "gschem-copy.xpm", NULL);
w_current->toolbar_edit = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
@@ -701,7 +701,7 @@
bg[GTK_STATE_NORMAL]),
(GtkSignalFunc) NULL,
w_current);
- free(filename);
+ g_free(filename);
filename = g_strconcat(w_current->bitmap_directory,
G_DIR_SEPARATOR_S, "gschem-delete.xpm", NULL);
w_current->toolbar_delete = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
@@ -716,7 +716,7 @@
bg[GTK_STATE_NORMAL]),
(GtkSignalFunc) NULL,
w_current);
- free(filename);
+ g_free(filename);
filename = g_strconcat(w_current->bitmap_directory,
G_DIR_SEPARATOR_S, "gschem-rotate.xpm", NULL);
w_current->toolbar_rotate = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
@@ -731,7 +731,7 @@
bg[GTK_STATE_NORMAL]),
(GtkSignalFunc) NULL,
w_current);
- free(filename);
+ g_free(filename);
filename = g_strconcat(w_current->bitmap_directory,
G_DIR_SEPARATOR_S, "gschem-mirror.xpm", NULL);
w_current->toolbar_mirror = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
@@ -746,7 +746,7 @@
bg[GTK_STATE_NORMAL]),
(GtkSignalFunc) NULL,
w_current);
- free(filename);
+ g_free(filename);
#endif
gtk_toolbar_append_space (GTK_TOOLBAR(toolbar));
@@ -1007,7 +1007,7 @@
while (current)
{
/* printf("yeah freeing: %s\n", (char*) current->data); */
- free(current->data);
+ g_free(current->data);
current = current->next;
}
g_list_free(w_current->major_changed_refdes);
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs