diff --git a/ChangeLog b/ChangeLog index d230b62f0d..5af45ae2db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2006-03-27 Michael Natterer + + * app/pdb/procedural_db.[ch]: renamed procedural_db_return_args() + to procedural_db_return_values() and added + procedural_db_arguments(), which returns a newly allocated, + initialized array of the procedure's arguments. + + * app/actions/plug-in-commands.c + * app/actions/vectors-commands.c + * app/plug-in/plug-in-run.c + * app/widgets/gimphelp.c + * app/xcf/xcf.c + * tools/pdbgen/app.pl + * tools/pdbgen/pdb/fileops.pdb: changed accordingly, some cleanup. + + * app/pdb/*_cmds.c: regenerated. + 2006-03-27 Michael Natterer * app/pdb/procedural_db.h (ArgMarshal): pass the ProcRecord as diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c index 8a624c716e..43e5c2f4e5 100644 --- a/app/actions/plug-in-commands.c +++ b/app/actions/plug-in-commands.c @@ -67,7 +67,6 @@ plug_in_run_cmd_callback (GtkAction *action, Argument *args; gint n_args = 0; GimpDisplay *gdisp = NULL; - gint i; gimp = action_data_get_gimp (data); if (! gimp) @@ -75,12 +74,7 @@ plug_in_run_cmd_callback (GtkAction *action, proc_rec = &proc_def->db_info; - /* construct the procedures arguments */ - args = g_new0 (Argument, proc_rec->num_args); - - /* initialize the argument types */ - for (i = 0; i < proc_rec->num_args; i++) - args[i].arg_type = proc_rec->args[i].arg_type; + args = procedural_db_arguments (proc_rec); /* initialize the first argument */ args[n_args].value.pdb_int = GIMP_RUN_INTERACTIVE; diff --git a/app/actions/vectors-commands.c b/app/actions/vectors-commands.c index 396ce5b212..c5416d602b 100644 --- a/app/actions/vectors-commands.c +++ b/app/actions/vectors-commands.c @@ -330,19 +330,16 @@ vectors_selection_to_vectors_cmd_callback (GtkAction *action, gdisp = gimp_context_get_display (action_data_get_context (data)); /* plug-in arguments as if called by /Filters/... */ - args = g_new (Argument, 3); + args = procedural_db_arguments (proc_rec); - args[0].arg_type = GIMP_PDB_INT32; args[0].value.pdb_int = GIMP_RUN_INTERACTIVE; - args[1].arg_type = GIMP_PDB_IMAGE; args[1].value.pdb_int = (gint32) gimp_image_get_ID (gimage); - args[2].arg_type = GIMP_PDB_DRAWABLE; args[2].value.pdb_int = -1; /* unused */ plug_in_run (gimage->gimp, action_data_get_context (data), GIMP_PROGRESS (gdisp), - proc_rec, args, 3, FALSE, TRUE, - gdisp ? gimp_display_get_ID (gdisp) : 0); + proc_rec, args, 3 /* not proc_rec->num_args */, + FALSE, TRUE, gdisp ? gimp_display_get_ID (gdisp) : 0); g_free (args); } diff --git a/app/pdb/brush_cmds.c b/app/pdb/brush_cmds.c index cbf3504b14..6792cf680f 100644 --- a/app/pdb/brush_cmds.c +++ b/app/pdb/brush_cmds.c @@ -93,7 +93,7 @@ brush_new_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gchar *actual_name = NULL; @@ -116,12 +116,12 @@ brush_new_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = actual_name; + return_vals[1].value.pdb_pointer = actual_name; - return return_args; + return return_vals; } static ProcArg brush_new_inargs[] = @@ -168,7 +168,7 @@ brush_duplicate_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gchar *copy_name = NULL; @@ -196,12 +196,12 @@ brush_duplicate_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = copy_name; + return_vals[1].value.pdb_pointer = copy_name; - return return_args; + return return_vals; } static ProcArg brush_duplicate_inargs[] = @@ -248,7 +248,7 @@ brush_is_generated_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gboolean generated = FALSE; @@ -267,12 +267,12 @@ brush_is_generated_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = generated; + return_vals[1].value.pdb_int = generated; - return return_args; + return return_vals; } static ProcArg brush_is_generated_inargs[] = @@ -319,7 +319,7 @@ brush_rename_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gchar *new_name; gchar *actual_name = NULL; @@ -346,12 +346,12 @@ brush_rename_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = actual_name; + return_vals[1].value.pdb_pointer = actual_name; - return return_args; + return return_vals; } static ProcArg brush_rename_inargs[] = @@ -432,7 +432,7 @@ brush_delete_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg brush_delete_inargs[] = @@ -470,7 +470,7 @@ brush_is_editable_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gboolean editable = FALSE; @@ -489,12 +489,12 @@ brush_is_editable_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = editable; + return_vals[1].value.pdb_int = editable; - return return_args; + return return_vals; } static ProcArg brush_is_editable_inargs[] = @@ -541,7 +541,7 @@ brush_get_info_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 width = 0; gint32 height = 0; @@ -568,17 +568,17 @@ brush_get_info_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = width; - return_args[2].value.pdb_int = height; - return_args[3].value.pdb_int = mask_bpp; - return_args[4].value.pdb_int = color_bpp; + return_vals[1].value.pdb_int = width; + return_vals[2].value.pdb_int = height; + return_vals[3].value.pdb_int = mask_bpp; + return_vals[4].value.pdb_int = color_bpp; } - return return_args; + return return_vals; } static ProcArg brush_get_info_inargs[] = @@ -640,7 +640,7 @@ brush_get_pixels_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 width = 0; gint32 height = 0; @@ -680,21 +680,21 @@ brush_get_pixels_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = width; - return_args[2].value.pdb_int = height; - return_args[3].value.pdb_int = mask_bpp; - return_args[4].value.pdb_int = num_mask_bytes; - return_args[5].value.pdb_pointer = mask_bytes; - return_args[6].value.pdb_int = color_bpp; - return_args[7].value.pdb_int = num_color_bytes; - return_args[8].value.pdb_pointer = color_bytes; + return_vals[1].value.pdb_int = width; + return_vals[2].value.pdb_int = height; + return_vals[3].value.pdb_int = mask_bpp; + return_vals[4].value.pdb_int = num_mask_bytes; + return_vals[5].value.pdb_pointer = mask_bytes; + return_vals[6].value.pdb_int = color_bpp; + return_vals[7].value.pdb_int = num_color_bytes; + return_vals[8].value.pdb_pointer = color_bytes; } - return return_args; + return return_vals; } static ProcArg brush_get_pixels_inargs[] = @@ -776,7 +776,7 @@ brush_get_spacing_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 spacing = 0; @@ -795,12 +795,12 @@ brush_get_spacing_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = spacing; + return_vals[1].value.pdb_int = spacing; - return return_args; + return return_vals; } static ProcArg brush_get_spacing_inargs[] = @@ -869,7 +869,7 @@ brush_set_spacing_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg brush_set_spacing_inargs[] = @@ -912,7 +912,7 @@ brush_get_shape_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 shape = 0; @@ -931,12 +931,12 @@ brush_get_shape_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = shape; + return_vals[1].value.pdb_int = shape; - return return_args; + return return_vals; } static ProcArg brush_get_shape_inargs[] = @@ -983,7 +983,7 @@ brush_get_radius_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gdouble radius = 0.0; @@ -1002,12 +1002,12 @@ brush_get_radius_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = radius; + return_vals[1].value.pdb_float = radius; - return return_args; + return return_vals; } static ProcArg brush_get_radius_inargs[] = @@ -1054,7 +1054,7 @@ brush_get_spikes_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 spikes = 0; @@ -1073,12 +1073,12 @@ brush_get_spikes_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = spikes; + return_vals[1].value.pdb_int = spikes; - return return_args; + return return_vals; } static ProcArg brush_get_spikes_inargs[] = @@ -1125,7 +1125,7 @@ brush_get_hardness_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gdouble hardness = 0.0; @@ -1144,12 +1144,12 @@ brush_get_hardness_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = hardness; + return_vals[1].value.pdb_float = hardness; - return return_args; + return return_vals; } static ProcArg brush_get_hardness_inargs[] = @@ -1196,7 +1196,7 @@ brush_get_aspect_ratio_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gdouble aspect_ratio = 0.0; @@ -1215,12 +1215,12 @@ brush_get_aspect_ratio_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = aspect_ratio; + return_vals[1].value.pdb_float = aspect_ratio; - return return_args; + return return_vals; } static ProcArg brush_get_aspect_ratio_inargs[] = @@ -1267,7 +1267,7 @@ brush_get_angle_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gdouble angle = 0.0; @@ -1286,12 +1286,12 @@ brush_get_angle_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = angle; + return_vals[1].value.pdb_float = angle; - return return_args; + return return_vals; } static ProcArg brush_get_angle_inargs[] = @@ -1338,7 +1338,7 @@ brush_set_shape_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 shape_in; gint32 shape_out = 0; @@ -1366,12 +1366,12 @@ brush_set_shape_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = shape_out; + return_vals[1].value.pdb_int = shape_out; - return return_args; + return return_vals; } static ProcArg brush_set_shape_inargs[] = @@ -1423,7 +1423,7 @@ brush_set_radius_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gdouble radius_in; gdouble radius_out = 0.0; @@ -1449,12 +1449,12 @@ brush_set_radius_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = radius_out; + return_vals[1].value.pdb_float = radius_out; - return return_args; + return return_vals; } static ProcArg brush_set_radius_inargs[] = @@ -1506,7 +1506,7 @@ brush_set_spikes_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 spikes_in; gint32 spikes_out = 0; @@ -1532,12 +1532,12 @@ brush_set_spikes_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = spikes_out; + return_vals[1].value.pdb_int = spikes_out; - return return_args; + return return_vals; } static ProcArg brush_set_spikes_inargs[] = @@ -1589,7 +1589,7 @@ brush_set_hardness_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gdouble hardness_in; gdouble hardness_out = 0.0; @@ -1615,12 +1615,12 @@ brush_set_hardness_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = hardness_out; + return_vals[1].value.pdb_float = hardness_out; - return return_args; + return return_vals; } static ProcArg brush_set_hardness_inargs[] = @@ -1672,7 +1672,7 @@ brush_set_aspect_ratio_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gdouble aspect_ratio_in; gdouble aspect_ratio_out = 0.0; @@ -1698,12 +1698,12 @@ brush_set_aspect_ratio_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = aspect_ratio_out; + return_vals[1].value.pdb_float = aspect_ratio_out; - return return_args; + return return_vals; } static ProcArg brush_set_aspect_ratio_inargs[] = @@ -1755,7 +1755,7 @@ brush_set_angle_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gdouble angle_in; gdouble angle_out = 0.0; @@ -1781,12 +1781,12 @@ brush_set_angle_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = angle_out; + return_vals[1].value.pdb_float = angle_out; - return return_args; + return return_vals; } static ProcArg brush_set_angle_inargs[] = diff --git a/app/pdb/brush_select_cmds.c b/app/pdb/brush_select_cmds.c index 83209d6c8e..dc8d0da9be 100644 --- a/app/pdb/brush_select_cmds.c +++ b/app/pdb/brush_select_cmds.c @@ -93,7 +93,7 @@ brushes_popup_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg brushes_popup_inargs[] = @@ -171,7 +171,7 @@ brushes_close_popup_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg brushes_close_popup_inargs[] = @@ -248,7 +248,7 @@ brushes_set_popup_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg brushes_set_popup_inargs[] = diff --git a/app/pdb/brushes_cmds.c b/app/pdb/brushes_cmds.c index 3d224d5f49..c86372b2e9 100644 --- a/app/pdb/brushes_cmds.c +++ b/app/pdb/brushes_cmds.c @@ -61,7 +61,7 @@ brushes_refresh_invoker (ProcRecord *proc_record, Argument *args) { gimp_data_factory_data_refresh (gimp->brush_factory); - return procedural_db_return_args (proc_record, TRUE); + return procedural_db_return_values (proc_record, TRUE); } static ProcRecord brushes_refresh_proc = @@ -90,7 +90,7 @@ brushes_get_list_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *filter; gint32 num_brushes = 0; gchar **brush_list = NULL; @@ -105,15 +105,15 @@ brushes_get_list_invoker (ProcRecord *proc_record, filter, &num_brushes); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_brushes; - return_args[2].value.pdb_pointer = brush_list; + return_vals[1].value.pdb_int = num_brushes; + return_vals[2].value.pdb_pointer = brush_list; } - return return_args; + return return_vals; } static ProcArg brushes_get_list_inargs[] = @@ -165,7 +165,7 @@ brushes_get_brush_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name = NULL; gint32 width = 0; gint32 height = 0; @@ -183,17 +183,17 @@ brushes_get_brush_invoker (ProcRecord *proc_record, else success = FALSE; - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_pointer = name; - return_args[2].value.pdb_int = width; - return_args[3].value.pdb_int = height; - return_args[4].value.pdb_int = spacing; + return_vals[1].value.pdb_pointer = name; + return_vals[2].value.pdb_int = width; + return_vals[3].value.pdb_int = height; + return_vals[4].value.pdb_int = spacing; } - return return_args; + return return_vals; } static ProcArg brushes_get_brush_outargs[] = @@ -246,7 +246,7 @@ brushes_get_spacing_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gint32 spacing = 0; GimpBrush *brush = gimp_context_get_brush (context); @@ -256,12 +256,12 @@ brushes_get_spacing_invoker (ProcRecord *proc_record, else success = FALSE; - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = spacing; + return_vals[1].value.pdb_int = spacing; - return return_args; + return return_vals; } static ProcArg brushes_get_spacing_outargs[] = @@ -310,7 +310,7 @@ brushes_set_spacing_invoker (ProcRecord *proc_record, gimp_brush_set_spacing (gimp_context_get_brush (context), spacing); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg brushes_set_spacing_inargs[] = @@ -348,7 +348,7 @@ brushes_get_brush_data_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gchar *actual_name = NULL; gdouble opacity = 0.0; @@ -392,21 +392,21 @@ brushes_get_brush_data_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_pointer = actual_name; - return_args[2].value.pdb_float = opacity; - return_args[3].value.pdb_int = spacing; - return_args[4].value.pdb_int = paint_mode; - return_args[5].value.pdb_int = width; - return_args[6].value.pdb_int = height; - return_args[7].value.pdb_int = length; - return_args[8].value.pdb_pointer = mask_data; + return_vals[1].value.pdb_pointer = actual_name; + return_vals[2].value.pdb_float = opacity; + return_vals[3].value.pdb_int = spacing; + return_vals[4].value.pdb_int = paint_mode; + return_vals[5].value.pdb_int = width; + return_vals[6].value.pdb_int = height; + return_vals[7].value.pdb_int = length; + return_vals[8].value.pdb_pointer = mask_data; } - return return_args; + return return_vals; } static ProcArg brushes_get_brush_data_inargs[] = diff --git a/app/pdb/buffer_cmds.c b/app/pdb/buffer_cmds.c index d4f775d146..6a0bcba78c 100644 --- a/app/pdb/buffer_cmds.c +++ b/app/pdb/buffer_cmds.c @@ -61,7 +61,7 @@ buffers_get_list_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *filter; gint32 num_buffers = 0; gchar **buffer_list = NULL; @@ -76,15 +76,15 @@ buffers_get_list_invoker (ProcRecord *proc_record, filter, &num_buffers); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_buffers; - return_args[2].value.pdb_pointer = buffer_list; + return_vals[1].value.pdb_int = num_buffers; + return_vals[2].value.pdb_pointer = buffer_list; } - return return_args; + return return_vals; } static ProcArg buffers_get_list_inargs[] = @@ -136,7 +136,7 @@ buffer_rename_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *buffer_name; gchar *new_name; gchar *real_name = NULL; @@ -163,12 +163,12 @@ buffer_rename_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = real_name; + return_vals[1].value.pdb_pointer = real_name; - return return_args; + return return_vals; } static ProcArg buffer_rename_inargs[] = @@ -237,7 +237,7 @@ buffer_delete_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg buffer_delete_inargs[] = @@ -275,7 +275,7 @@ buffer_get_width_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *buffer_name; gint32 width = 0; @@ -294,12 +294,12 @@ buffer_get_width_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = width; + return_vals[1].value.pdb_int = width; - return return_args; + return return_vals; } static ProcArg buffer_get_width_inargs[] = @@ -346,7 +346,7 @@ buffer_get_height_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *buffer_name; gint32 height = 0; @@ -365,12 +365,12 @@ buffer_get_height_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = height; + return_vals[1].value.pdb_int = height; - return return_args; + return return_vals; } static ProcArg buffer_get_height_inargs[] = @@ -417,7 +417,7 @@ buffer_get_bytes_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *buffer_name; gint32 bytes = 0; @@ -436,12 +436,12 @@ buffer_get_bytes_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = bytes; + return_vals[1].value.pdb_int = bytes; - return return_args; + return return_vals; } static ProcArg buffer_get_bytes_inargs[] = @@ -488,7 +488,7 @@ buffer_get_image_type_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *buffer_name; gint32 image_type = 0; @@ -507,12 +507,12 @@ buffer_get_image_type_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = image_type; + return_vals[1].value.pdb_int = image_type; - return return_args; + return return_vals; } static ProcArg buffer_get_image_type_inargs[] = diff --git a/app/pdb/channel_cmds.c b/app/pdb/channel_cmds.c index cff4109b2e..9282f39fbd 100644 --- a/app/pdb/channel_cmds.c +++ b/app/pdb/channel_cmds.c @@ -66,7 +66,7 @@ channel_new_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 width; gint32 height; @@ -108,12 +108,12 @@ channel_new_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = channel ? gimp_item_get_ID (GIMP_ITEM (channel)) : -1; + return_vals[1].value.pdb_int = channel ? gimp_item_get_ID (GIMP_ITEM (channel)) : -1; - return return_args; + return return_vals; } static ProcArg channel_new_inargs[] = @@ -185,7 +185,7 @@ channel_new_from_component_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 component; gchar *name; @@ -215,12 +215,12 @@ channel_new_from_component_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = channel ? gimp_item_get_ID (GIMP_ITEM (channel)) : -1; + return_vals[1].value.pdb_int = channel ? gimp_item_get_ID (GIMP_ITEM (channel)) : -1; - return return_args; + return return_vals; } static ProcArg channel_new_from_component_inargs[] = @@ -277,7 +277,7 @@ channel_copy_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpChannel *channel; GimpChannel *channel_copy = NULL; @@ -294,12 +294,12 @@ channel_copy_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = channel_copy ? gimp_item_get_ID (GIMP_ITEM (channel_copy)) : -1; + return_vals[1].value.pdb_int = channel_copy ? gimp_item_get_ID (GIMP_ITEM (channel_copy)) : -1; - return return_args; + return return_vals; } static ProcArg channel_copy_inargs[] = @@ -373,7 +373,7 @@ channel_combine_masks_invoker (ProcRecord *proc_record, gimp_channel_combine_mask (channel1, channel2, operation, offx, offy); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg channel_combine_masks_inargs[] = @@ -431,7 +431,7 @@ channel_get_show_masked_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpChannel *channel; gboolean show_masked = FALSE; @@ -444,12 +444,12 @@ channel_get_show_masked_invoker (ProcRecord *proc_record, show_masked = gimp_channel_get_show_masked (channel); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = show_masked; + return_vals[1].value.pdb_int = show_masked; - return return_args; + return return_vals; } static ProcArg channel_get_show_masked_inargs[] = @@ -510,7 +510,7 @@ channel_set_show_masked_invoker (ProcRecord *proc_record, gimp_channel_set_show_masked (channel, show_masked); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg channel_set_show_masked_inargs[] = @@ -553,7 +553,7 @@ channel_get_opacity_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpChannel *channel; gdouble opacity = 0.0; @@ -566,12 +566,12 @@ channel_get_opacity_invoker (ProcRecord *proc_record, opacity = gimp_channel_get_opacity (channel) * 100; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = opacity; + return_vals[1].value.pdb_float = opacity; - return return_args; + return return_vals; } static ProcArg channel_get_opacity_inargs[] = @@ -634,7 +634,7 @@ channel_set_opacity_invoker (ProcRecord *proc_record, gimp_channel_set_opacity (channel, opacity / 100.0, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg channel_set_opacity_inargs[] = @@ -677,7 +677,7 @@ channel_get_color_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpChannel *channel; GimpRGB color = { 0.0, 0.0, 0.0, 1.0 }; @@ -690,12 +690,12 @@ channel_get_color_invoker (ProcRecord *proc_record, gimp_channel_get_color (channel, &color); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_color = color; + return_vals[1].value.pdb_color = color; - return return_args; + return return_vals; } static ProcArg channel_get_color_inargs[] = @@ -759,7 +759,7 @@ channel_set_color_invoker (ProcRecord *proc_record, gimp_channel_set_color (channel, &rgb_color, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg channel_set_color_inargs[] = diff --git a/app/pdb/color_cmds.c b/app/pdb/color_cmds.c index 05ff9ae8ec..3d3937104b 100644 --- a/app/pdb/color_cmds.c +++ b/app/pdb/color_cmds.c @@ -146,7 +146,7 @@ brightness_contrast_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg brightness_contrast_inargs[] = @@ -248,7 +248,7 @@ levels_invoker (ProcRecord *proc_record, low_output, high_output); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg levels_inargs[] = @@ -332,7 +332,7 @@ levels_auto_invoker (ProcRecord *proc_record, gimp_drawable_levels_stretch (drawable, context); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg levels_auto_inargs[] = @@ -386,7 +386,7 @@ levels_stretch_invoker (ProcRecord *proc_record, gimp_drawable_levels_stretch (drawable, context); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg levels_stretch_inargs[] = @@ -470,7 +470,7 @@ posterize_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg posterize_inargs[] = @@ -529,7 +529,7 @@ desaturate_invoker (ProcRecord *proc_record, gimp_drawable_desaturate (drawable, GIMP_DESATURATE_LIGHTNESS); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg desaturate_inargs[] = @@ -588,7 +588,7 @@ desaturate_full_invoker (ProcRecord *proc_record, gimp_drawable_desaturate (drawable, desaturate_mode); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg desaturate_full_inargs[] = @@ -650,7 +650,7 @@ equalize_invoker (ProcRecord *proc_record, gimp_drawable_equalize (drawable, mask_only); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg equalize_inargs[] = @@ -709,7 +709,7 @@ invert_invoker (ProcRecord *proc_record, gimp_drawable_invert (drawable); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg invert_inargs[] = @@ -831,7 +831,7 @@ curves_spline_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg curves_spline_inargs[] = @@ -959,7 +959,7 @@ curves_explicit_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg curves_explicit_inargs[] = @@ -1081,7 +1081,7 @@ color_balance_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg color_balance_inargs[] = @@ -1203,7 +1203,7 @@ colorize_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg colorize_inargs[] = @@ -1256,7 +1256,7 @@ histogram_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 channel; gint32 start_range; @@ -1315,19 +1315,19 @@ histogram_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_float = mean; - return_args[2].value.pdb_float = std_dev; - return_args[3].value.pdb_float = median; - return_args[4].value.pdb_float = pixels; - return_args[5].value.pdb_float = count; - return_args[6].value.pdb_float = percentile; + return_vals[1].value.pdb_float = mean; + return_vals[2].value.pdb_float = std_dev; + return_vals[3].value.pdb_float = median; + return_vals[4].value.pdb_float = pixels; + return_vals[5].value.pdb_float = count; + return_vals[6].value.pdb_float = percentile; } - return return_args; + return return_vals; } static ProcArg histogram_inargs[] = @@ -1479,7 +1479,7 @@ hue_saturation_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg hue_saturation_inargs[] = @@ -1588,7 +1588,7 @@ threshold_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg threshold_inargs[] = diff --git a/app/pdb/context_cmds.c b/app/pdb/context_cmds.c index adb5889946..a39a8276c6 100644 --- a/app/pdb/context_cmds.c +++ b/app/pdb/context_cmds.c @@ -101,7 +101,7 @@ context_push_invoker (ProcRecord *proc_record, success = plug_in_context_push (gimp->current_plug_in); else success = FALSE; - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcRecord context_push_proc = @@ -134,7 +134,7 @@ context_pop_invoker (ProcRecord *proc_record, success = plug_in_context_pop (gimp->current_plug_in); else success = FALSE; - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcRecord context_pop_proc = @@ -163,7 +163,7 @@ context_get_paint_method_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name = NULL; GimpPaintInfo *paint_info = gimp_context_get_paint_info (context); @@ -173,12 +173,12 @@ context_get_paint_method_invoker (ProcRecord *proc_record, else success = FALSE; - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = name; + return_vals[1].value.pdb_pointer = name; - return return_args; + return return_vals; } static ProcArg context_get_paint_method_outargs[] = @@ -233,7 +233,7 @@ context_set_paint_method_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg context_set_paint_method_inargs[] = @@ -270,15 +270,15 @@ context_get_foreground_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; GimpRGB foreground = { 0.0, 0.0, 0.0, 1.0 }; gimp_context_get_foreground (context, &foreground); - return_args = procedural_db_return_args (proc_record, TRUE); - return_args[1].value.pdb_color = foreground; + return_vals = procedural_db_return_values (proc_record, TRUE); + return_vals[1].value.pdb_color = foreground; - return return_args; + return return_vals; } static ProcArg context_get_foreground_outargs[] = @@ -322,7 +322,7 @@ context_set_foreground_invoker (ProcRecord *proc_record, gimp_rgb_set_alpha (&foreground, 1.0); gimp_context_set_foreground (context, &foreground); - return procedural_db_return_args (proc_record, TRUE); + return procedural_db_return_values (proc_record, TRUE); } static ProcArg context_set_foreground_inargs[] = @@ -359,15 +359,15 @@ context_get_background_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; GimpRGB background = { 0.0, 0.0, 0.0, 1.0 }; gimp_context_get_background (context, &background); - return_args = procedural_db_return_args (proc_record, TRUE); - return_args[1].value.pdb_color = background; + return_vals = procedural_db_return_values (proc_record, TRUE); + return_vals[1].value.pdb_color = background; - return return_args; + return return_vals; } static ProcArg context_get_background_outargs[] = @@ -411,7 +411,7 @@ context_set_background_invoker (ProcRecord *proc_record, gimp_rgb_set_alpha (&background, 1.0); gimp_context_set_background (context, &background); - return procedural_db_return_args (proc_record, TRUE); + return procedural_db_return_values (proc_record, TRUE); } static ProcArg context_set_background_inargs[] = @@ -449,7 +449,7 @@ context_set_default_colors_invoker (ProcRecord *proc_record, Argument *args) { gimp_context_set_default_colors (context); - return procedural_db_return_args (proc_record, TRUE); + return procedural_db_return_values (proc_record, TRUE); } static ProcRecord context_set_default_colors_proc = @@ -478,7 +478,7 @@ context_swap_colors_invoker (ProcRecord *proc_record, Argument *args) { gimp_context_swap_colors (context); - return procedural_db_return_args (proc_record, TRUE); + return procedural_db_return_values (proc_record, TRUE); } static ProcRecord context_swap_colors_proc = @@ -506,15 +506,15 @@ context_get_opacity_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; gdouble opacity = 0.0; opacity = gimp_context_get_opacity (context) * 100.0; - return_args = procedural_db_return_args (proc_record, TRUE); - return_args[1].value.pdb_float = opacity; + return_vals = procedural_db_return_values (proc_record, TRUE); + return_vals[1].value.pdb_float = opacity; - return return_args; + return return_vals; } static ProcArg context_get_opacity_outargs[] = @@ -563,7 +563,7 @@ context_set_opacity_invoker (ProcRecord *proc_record, gimp_context_set_opacity (context, opacity / 100.0); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg context_set_opacity_inargs[] = @@ -600,15 +600,15 @@ context_get_paint_mode_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; gint32 paint_mode = 0; paint_mode = gimp_context_get_paint_mode (context); - return_args = procedural_db_return_args (proc_record, TRUE); - return_args[1].value.pdb_int = paint_mode; + return_vals = procedural_db_return_values (proc_record, TRUE); + return_vals[1].value.pdb_int = paint_mode; - return return_args; + return return_vals; } static ProcArg context_get_paint_mode_outargs[] = @@ -657,7 +657,7 @@ context_set_paint_mode_invoker (ProcRecord *proc_record, gimp_context_set_paint_mode (context, paint_mode); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg context_set_paint_mode_inargs[] = @@ -695,7 +695,7 @@ context_get_brush_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name = NULL; GimpBrush *brush = gimp_context_get_brush (context); @@ -705,12 +705,12 @@ context_get_brush_invoker (ProcRecord *proc_record, else success = FALSE; - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = name; + return_vals[1].value.pdb_pointer = name; - return return_args; + return return_vals; } static ProcArg context_get_brush_outargs[] = @@ -765,7 +765,7 @@ context_set_brush_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg context_set_brush_inargs[] = @@ -803,7 +803,7 @@ context_get_pattern_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name = NULL; GimpPattern *pattern = gimp_context_get_pattern (context); @@ -813,12 +813,12 @@ context_get_pattern_invoker (ProcRecord *proc_record, else success = FALSE; - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = name; + return_vals[1].value.pdb_pointer = name; - return return_args; + return return_vals; } static ProcArg context_get_pattern_outargs[] = @@ -873,7 +873,7 @@ context_set_pattern_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg context_set_pattern_inargs[] = @@ -911,7 +911,7 @@ context_get_gradient_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name = NULL; GimpGradient *gradient = gimp_context_get_gradient (context); @@ -921,12 +921,12 @@ context_get_gradient_invoker (ProcRecord *proc_record, else success = FALSE; - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = name; + return_vals[1].value.pdb_pointer = name; - return return_args; + return return_vals; } static ProcArg context_get_gradient_outargs[] = @@ -981,7 +981,7 @@ context_set_gradient_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg context_set_gradient_inargs[] = @@ -1019,7 +1019,7 @@ context_get_palette_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name = NULL; GimpPalette *palette = gimp_context_get_palette (context); @@ -1029,12 +1029,12 @@ context_get_palette_invoker (ProcRecord *proc_record, else success = FALSE; - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = name; + return_vals[1].value.pdb_pointer = name; - return return_args; + return return_vals; } static ProcArg context_get_palette_outargs[] = @@ -1089,7 +1089,7 @@ context_set_palette_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg context_set_palette_inargs[] = @@ -1127,7 +1127,7 @@ context_get_font_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name = NULL; GimpFont *font = gimp_context_get_font (context); @@ -1137,12 +1137,12 @@ context_get_font_invoker (ProcRecord *proc_record, else success = FALSE; - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = name; + return_vals[1].value.pdb_pointer = name; - return return_args; + return return_vals; } static ProcArg context_get_font_outargs[] = @@ -1197,7 +1197,7 @@ context_set_font_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg context_set_font_inargs[] = diff --git a/app/pdb/convert_cmds.c b/app/pdb/convert_cmds.c index 0999e59e1c..9f14d4780b 100644 --- a/app/pdb/convert_cmds.c +++ b/app/pdb/convert_cmds.c @@ -67,7 +67,7 @@ image_convert_rgb_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_convert_rgb_inargs[] = @@ -119,7 +119,7 @@ image_convert_grayscale_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_convert_grayscale_inargs[] = @@ -221,7 +221,7 @@ image_convert_indexed_invoker (ProcRecord *proc_record, NULL); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_convert_indexed_inargs[] = diff --git a/app/pdb/display_cmds.c b/app/pdb/display_cmds.c index ae94c0f347..f00d45d338 100644 --- a/app/pdb/display_cmds.c +++ b/app/pdb/display_cmds.c @@ -54,7 +54,7 @@ display_new_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpObject *display = NULL; @@ -76,12 +76,12 @@ display_new_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = display ? gimp_get_display_ID (gimp, display) : -1; + return_vals[1].value.pdb_int = display ? gimp_get_display_ID (gimp, display) : -1; - return return_args; + return return_vals; } static ProcArg display_new_inargs[] = @@ -139,7 +139,7 @@ display_delete_invoker (ProcRecord *proc_record, gimp_delete_display (gimp, display); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg display_delete_inargs[] = @@ -177,7 +177,7 @@ display_get_window_handle_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpObject *display; gint32 window = 0; @@ -190,12 +190,12 @@ display_get_window_handle_invoker (ProcRecord *proc_record, window = (gint32) gimp_get_display_window (gimp, display); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = window; + return_vals[1].value.pdb_int = window; - return return_args; + return return_vals; } static ProcArg display_get_window_handle_inargs[] = @@ -242,7 +242,7 @@ displays_flush_invoker (ProcRecord *proc_record, Argument *args) { gimp_container_foreach (gimp->images, (GFunc) gimp_image_flush, NULL); - return procedural_db_return_args (proc_record, TRUE); + return procedural_db_return_values (proc_record, TRUE); } static ProcRecord displays_flush_proc = @@ -298,7 +298,7 @@ displays_reconnect_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg displays_reconnect_inargs[] = diff --git a/app/pdb/drawable_cmds.c b/app/pdb/drawable_cmds.c index 357261de6b..8ace2f1626 100644 --- a/app/pdb/drawable_cmds.c +++ b/app/pdb/drawable_cmds.c @@ -139,7 +139,7 @@ drawable_delete_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg drawable_delete_inargs[] = @@ -177,7 +177,7 @@ drawable_is_layer_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean layer = FALSE; @@ -190,12 +190,12 @@ drawable_is_layer_invoker (ProcRecord *proc_record, layer = GIMP_IS_LAYER (drawable); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = layer; + return_vals[1].value.pdb_int = layer; - return return_args; + return return_vals; } static ProcArg drawable_is_layer_inargs[] = @@ -242,7 +242,7 @@ drawable_is_layer_mask_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean layer_mask = FALSE; @@ -255,12 +255,12 @@ drawable_is_layer_mask_invoker (ProcRecord *proc_record, layer_mask = GIMP_IS_LAYER_MASK (drawable); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = layer_mask; + return_vals[1].value.pdb_int = layer_mask; - return return_args; + return return_vals; } static ProcArg drawable_is_layer_mask_inargs[] = @@ -307,7 +307,7 @@ drawable_is_channel_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean channel = FALSE; @@ -320,12 +320,12 @@ drawable_is_channel_invoker (ProcRecord *proc_record, channel = GIMP_IS_CHANNEL (drawable); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = channel; + return_vals[1].value.pdb_int = channel; - return return_args; + return return_vals; } static ProcArg drawable_is_channel_inargs[] = @@ -372,7 +372,7 @@ drawable_type_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 type = 0; @@ -385,12 +385,12 @@ drawable_type_invoker (ProcRecord *proc_record, type = gimp_drawable_type (drawable); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = type; + return_vals[1].value.pdb_int = type; - return return_args; + return return_vals; } static ProcArg drawable_type_inargs[] = @@ -437,7 +437,7 @@ drawable_type_with_alpha_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 type_with_alpha = 0; @@ -450,12 +450,12 @@ drawable_type_with_alpha_invoker (ProcRecord *proc_record, type_with_alpha = gimp_drawable_type_with_alpha (drawable); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = type_with_alpha; + return_vals[1].value.pdb_int = type_with_alpha; - return return_args; + return return_vals; } static ProcArg drawable_type_with_alpha_inargs[] = @@ -502,7 +502,7 @@ drawable_has_alpha_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean has_alpha = FALSE; @@ -515,12 +515,12 @@ drawable_has_alpha_invoker (ProcRecord *proc_record, has_alpha = gimp_drawable_has_alpha (drawable); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = has_alpha; + return_vals[1].value.pdb_int = has_alpha; - return return_args; + return return_vals; } static ProcArg drawable_has_alpha_inargs[] = @@ -567,7 +567,7 @@ drawable_is_rgb_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean is_rgb = FALSE; @@ -580,12 +580,12 @@ drawable_is_rgb_invoker (ProcRecord *proc_record, is_rgb = gimp_drawable_is_rgb (drawable); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = is_rgb; + return_vals[1].value.pdb_int = is_rgb; - return return_args; + return return_vals; } static ProcArg drawable_is_rgb_inargs[] = @@ -632,7 +632,7 @@ drawable_is_gray_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean is_gray = FALSE; @@ -645,12 +645,12 @@ drawable_is_gray_invoker (ProcRecord *proc_record, is_gray = gimp_drawable_is_gray (drawable); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = is_gray; + return_vals[1].value.pdb_int = is_gray; - return return_args; + return return_vals; } static ProcArg drawable_is_gray_inargs[] = @@ -697,7 +697,7 @@ drawable_is_indexed_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean is_indexed = FALSE; @@ -710,12 +710,12 @@ drawable_is_indexed_invoker (ProcRecord *proc_record, is_indexed = gimp_drawable_is_indexed (drawable); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = is_indexed; + return_vals[1].value.pdb_int = is_indexed; - return return_args; + return return_vals; } static ProcArg drawable_is_indexed_inargs[] = @@ -762,7 +762,7 @@ drawable_bpp_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 bpp = 0; @@ -775,12 +775,12 @@ drawable_bpp_invoker (ProcRecord *proc_record, bpp = gimp_drawable_bytes (drawable); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = bpp; + return_vals[1].value.pdb_int = bpp; - return return_args; + return return_vals; } static ProcArg drawable_bpp_inargs[] = @@ -827,7 +827,7 @@ drawable_width_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 width = 0; @@ -840,12 +840,12 @@ drawable_width_invoker (ProcRecord *proc_record, width = gimp_item_width (GIMP_ITEM (drawable)); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = width; + return_vals[1].value.pdb_int = width; - return return_args; + return return_vals; } static ProcArg drawable_width_inargs[] = @@ -892,7 +892,7 @@ drawable_height_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 height = 0; @@ -905,12 +905,12 @@ drawable_height_invoker (ProcRecord *proc_record, height = gimp_item_height (GIMP_ITEM (drawable)); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = height; + return_vals[1].value.pdb_int = height; - return return_args; + return return_vals; } static ProcArg drawable_height_inargs[] = @@ -957,7 +957,7 @@ drawable_offsets_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 offset_x = 0; gint32 offset_y = 0; @@ -971,15 +971,15 @@ drawable_offsets_invoker (ProcRecord *proc_record, gimp_item_offsets (GIMP_ITEM (drawable), &offset_x, &offset_y); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = offset_x; - return_args[2].value.pdb_int = offset_y; + return_vals[1].value.pdb_int = offset_x; + return_vals[2].value.pdb_int = offset_y; } - return return_args; + return return_vals; } static ProcArg drawable_offsets_inargs[] = @@ -1031,7 +1031,7 @@ drawable_get_image_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; GimpImage *image = NULL; @@ -1044,12 +1044,12 @@ drawable_get_image_invoker (ProcRecord *proc_record, image = gimp_item_get_image (GIMP_ITEM (drawable)); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = image ? gimp_image_get_ID (image) : -1; + return_vals[1].value.pdb_int = image ? gimp_image_get_ID (image) : -1; - return return_args; + return return_vals; } static ProcArg drawable_get_image_inargs[] = @@ -1113,7 +1113,7 @@ drawable_set_image_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg drawable_set_image_inargs[] = @@ -1156,7 +1156,7 @@ drawable_get_name_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gchar *name = NULL; @@ -1169,12 +1169,12 @@ drawable_get_name_invoker (ProcRecord *proc_record, name = g_strdup (gimp_object_get_name (GIMP_OBJECT (drawable))); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = name; + return_vals[1].value.pdb_pointer = name; - return return_args; + return return_vals; } static ProcArg drawable_get_name_inargs[] = @@ -1237,7 +1237,7 @@ drawable_set_name_invoker (ProcRecord *proc_record, success = gimp_item_rename (GIMP_ITEM (drawable), name); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg drawable_set_name_inargs[] = @@ -1280,7 +1280,7 @@ drawable_get_visible_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean visible = FALSE; @@ -1293,12 +1293,12 @@ drawable_get_visible_invoker (ProcRecord *proc_record, visible = gimp_item_get_visible (GIMP_ITEM (drawable)); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = visible; + return_vals[1].value.pdb_int = visible; - return return_args; + return return_vals; } static ProcArg drawable_get_visible_inargs[] = @@ -1359,7 +1359,7 @@ drawable_set_visible_invoker (ProcRecord *proc_record, gimp_item_set_visible (GIMP_ITEM (drawable), visible, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg drawable_set_visible_inargs[] = @@ -1402,7 +1402,7 @@ drawable_get_linked_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean linked = FALSE; @@ -1415,12 +1415,12 @@ drawable_get_linked_invoker (ProcRecord *proc_record, linked = gimp_item_get_linked (GIMP_ITEM (drawable)); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = linked; + return_vals[1].value.pdb_int = linked; - return return_args; + return return_vals; } static ProcArg drawable_get_linked_inargs[] = @@ -1481,7 +1481,7 @@ drawable_set_linked_invoker (ProcRecord *proc_record, gimp_item_set_linked (GIMP_ITEM (drawable), linked, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg drawable_set_linked_inargs[] = @@ -1524,7 +1524,7 @@ drawable_get_tattoo_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 tattoo = 0; @@ -1537,12 +1537,12 @@ drawable_get_tattoo_invoker (ProcRecord *proc_record, tattoo = gimp_item_get_tattoo (GIMP_ITEM (drawable)); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = tattoo; + return_vals[1].value.pdb_int = tattoo; - return return_args; + return return_vals; } static ProcArg drawable_get_tattoo_inargs[] = @@ -1605,7 +1605,7 @@ drawable_set_tattoo_invoker (ProcRecord *proc_record, gimp_item_set_tattoo (GIMP_ITEM (drawable), tattoo); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg drawable_set_tattoo_inargs[] = @@ -1648,7 +1648,7 @@ drawable_mask_bounds_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean non_empty = FALSE; gint32 x1 = 0; @@ -1665,18 +1665,18 @@ drawable_mask_bounds_invoker (ProcRecord *proc_record, non_empty = gimp_drawable_mask_bounds (drawable, &x1, &y1, &x2, &y2); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = non_empty; - return_args[2].value.pdb_int = x1; - return_args[3].value.pdb_int = y1; - return_args[4].value.pdb_int = x2; - return_args[5].value.pdb_int = y2; + return_vals[1].value.pdb_int = non_empty; + return_vals[2].value.pdb_int = x1; + return_vals[3].value.pdb_int = y1; + return_vals[4].value.pdb_int = x2; + return_vals[5].value.pdb_int = y2; } - return return_args; + return return_vals; } static ProcArg drawable_mask_bounds_inargs[] = @@ -1743,7 +1743,7 @@ drawable_mask_intersect_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean non_empty = FALSE; gint32 x = 0; @@ -1760,18 +1760,18 @@ drawable_mask_intersect_invoker (ProcRecord *proc_record, non_empty = gimp_drawable_mask_intersect (drawable, &x, &y, &width, &height); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = non_empty; - return_args[2].value.pdb_int = x; - return_args[3].value.pdb_int = y; - return_args[4].value.pdb_int = width; - return_args[5].value.pdb_int = height; + return_vals[1].value.pdb_int = non_empty; + return_vals[2].value.pdb_int = x; + return_vals[3].value.pdb_int = y; + return_vals[4].value.pdb_int = width; + return_vals[5].value.pdb_int = height; } - return return_args; + return return_vals; } static ProcArg drawable_mask_intersect_inargs[] = @@ -1867,7 +1867,7 @@ drawable_merge_shadow_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg drawable_merge_shadow_inargs[] = @@ -1933,7 +1933,7 @@ drawable_update_invoker (ProcRecord *proc_record, gimp_drawable_update (drawable, x, y, width, height); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg drawable_update_inargs[] = @@ -1991,7 +1991,7 @@ drawable_get_pixel_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 x_coord; gint32 y_coord; @@ -2039,15 +2039,15 @@ drawable_get_pixel_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_channels; - return_args[2].value.pdb_pointer = pixel; + return_vals[1].value.pdb_int = num_channels; + return_vals[2].value.pdb_pointer = pixel; } - return return_args; + return return_vals; } static ProcArg drawable_get_pixel_inargs[] = @@ -2158,7 +2158,7 @@ drawable_set_pixel_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg drawable_set_pixel_inargs[] = @@ -2232,7 +2232,7 @@ drawable_fill_invoker (ProcRecord *proc_record, gimp_drawable_fill_by_type (drawable, context, (GimpFillType) fill_type); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg drawable_fill_inargs[] = @@ -2304,7 +2304,7 @@ drawable_offset_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg drawable_offset_inargs[] = @@ -2362,7 +2362,7 @@ drawable_thumbnail_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 width; gint32 height; @@ -2423,18 +2423,18 @@ drawable_thumbnail_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = actual_width; - return_args[2].value.pdb_int = actual_height; - return_args[3].value.pdb_int = bpp; - return_args[4].value.pdb_int = thumbnail_data_count; - return_args[5].value.pdb_pointer = thumbnail_data; + return_vals[1].value.pdb_int = actual_width; + return_vals[2].value.pdb_int = actual_height; + return_vals[3].value.pdb_int = bpp; + return_vals[4].value.pdb_int = thumbnail_data_count; + return_vals[5].value.pdb_pointer = thumbnail_data; } - return return_args; + return return_vals; } static ProcArg drawable_thumbnail_inargs[] = @@ -2511,7 +2511,7 @@ drawable_sub_thumbnail_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 src_x; gint32 src_y; @@ -2590,18 +2590,18 @@ drawable_sub_thumbnail_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = width; - return_args[2].value.pdb_int = height; - return_args[3].value.pdb_int = bpp; - return_args[4].value.pdb_int = thumbnail_data_count; - return_args[5].value.pdb_pointer = thumbnail_data; + return_vals[1].value.pdb_int = width; + return_vals[2].value.pdb_int = height; + return_vals[3].value.pdb_int = bpp; + return_vals[4].value.pdb_int = thumbnail_data_count; + return_vals[5].value.pdb_pointer = thumbnail_data; } - return return_args; + return return_vals; } static ProcArg drawable_sub_thumbnail_inargs[] = @@ -2722,7 +2722,7 @@ drawable_foreground_extract_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg drawable_foreground_extract_inargs[] = diff --git a/app/pdb/drawable_transform_cmds.c b/app/pdb/drawable_transform_cmds.c index bbada06aa4..4140c3685c 100644 --- a/app/pdb/drawable_transform_cmds.c +++ b/app/pdb/drawable_transform_cmds.c @@ -83,7 +83,7 @@ drawable_transform_flip_simple_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 flip_type; gboolean auto_center; @@ -120,12 +120,12 @@ drawable_transform_flip_simple_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg drawable_transform_flip_simple_inargs[] = @@ -192,7 +192,7 @@ drawable_transform_flip_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gdouble x0; gdouble y0; @@ -263,12 +263,12 @@ drawable_transform_flip_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg drawable_transform_flip_inargs[] = @@ -360,7 +360,7 @@ drawable_transform_flip_default_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gdouble x0; gdouble y0; @@ -420,12 +420,12 @@ drawable_transform_flip_default_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg drawable_transform_flip_default_inargs[] = @@ -502,7 +502,7 @@ drawable_transform_perspective_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gdouble x0; gdouble y0; @@ -589,12 +589,12 @@ drawable_transform_perspective_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg drawable_transform_perspective_inargs[] = @@ -706,7 +706,7 @@ drawable_transform_perspective_default_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gdouble x0; gdouble y0; @@ -782,12 +782,12 @@ drawable_transform_perspective_default_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg drawable_transform_perspective_default_inargs[] = @@ -884,7 +884,7 @@ drawable_transform_rotate_simple_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 rotate_type; gboolean auto_center; @@ -924,12 +924,12 @@ drawable_transform_rotate_simple_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg drawable_transform_rotate_simple_inargs[] = @@ -1001,7 +1001,7 @@ drawable_transform_rotate_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gdouble angle; gboolean auto_center; @@ -1075,12 +1075,12 @@ drawable_transform_rotate_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg drawable_transform_rotate_inargs[] = @@ -1172,7 +1172,7 @@ drawable_transform_rotate_default_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gdouble angle; gboolean auto_center; @@ -1235,12 +1235,12 @@ drawable_transform_rotate_default_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg drawable_transform_rotate_default_inargs[] = @@ -1317,7 +1317,7 @@ drawable_transform_scale_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gdouble x0; gdouble y0; @@ -1391,12 +1391,12 @@ drawable_transform_scale_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg drawable_transform_scale_inargs[] = @@ -1488,7 +1488,7 @@ drawable_transform_scale_default_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gdouble x0; gdouble y0; @@ -1551,12 +1551,12 @@ drawable_transform_scale_default_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg drawable_transform_scale_default_inargs[] = @@ -1633,7 +1633,7 @@ drawable_transform_shear_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 shear_type; gdouble magnitude; @@ -1701,12 +1701,12 @@ drawable_transform_shear_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg drawable_transform_shear_inargs[] = @@ -1788,7 +1788,7 @@ drawable_transform_shear_default_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 shear_type; gdouble magnitude; @@ -1845,12 +1845,12 @@ drawable_transform_shear_default_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg drawable_transform_shear_default_inargs[] = @@ -1917,7 +1917,7 @@ drawable_transform_2d_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gdouble source_x; gdouble source_y; @@ -1999,12 +1999,12 @@ drawable_transform_2d_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg drawable_transform_2d_inargs[] = @@ -2111,7 +2111,7 @@ drawable_transform_2d_default_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gdouble source_x; gdouble source_y; @@ -2182,12 +2182,12 @@ drawable_transform_2d_default_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg drawable_transform_2d_default_inargs[] = @@ -2279,7 +2279,7 @@ drawable_transform_matrix_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gdouble coeff_0_0; gdouble coeff_0_1; @@ -2371,12 +2371,12 @@ drawable_transform_matrix_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg drawable_transform_matrix_inargs[] = @@ -2493,7 +2493,7 @@ drawable_transform_matrix_default_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gdouble coeff_0_0; gdouble coeff_0_1; @@ -2574,12 +2574,12 @@ drawable_transform_matrix_default_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg drawable_transform_matrix_default_inargs[] = diff --git a/app/pdb/edit_cmds.c b/app/pdb/edit_cmds.c index c751004c96..26015767ac 100644 --- a/app/pdb/edit_cmds.c +++ b/app/pdb/edit_cmds.c @@ -84,7 +84,7 @@ edit_cut_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean non_empty = FALSE; @@ -104,12 +104,12 @@ edit_cut_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = non_empty; + return_vals[1].value.pdb_int = non_empty; - return return_args; + return return_vals; } static ProcArg edit_cut_inargs[] = @@ -156,7 +156,7 @@ edit_copy_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean non_empty = FALSE; @@ -176,12 +176,12 @@ edit_copy_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = non_empty; + return_vals[1].value.pdb_int = non_empty; - return return_args; + return return_vals; } static ProcArg edit_copy_inargs[] = @@ -228,7 +228,7 @@ edit_copy_visible_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gboolean non_empty = FALSE; @@ -241,12 +241,12 @@ edit_copy_visible_invoker (ProcRecord *proc_record, non_empty = gimp_edit_copy_visible (image, context) != NULL; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = non_empty; + return_vals[1].value.pdb_int = non_empty; - return return_args; + return return_vals; } static ProcArg edit_copy_visible_inargs[] = @@ -293,7 +293,7 @@ edit_paste_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean paste_into; GimpLayer *floating_sel = NULL; @@ -319,12 +319,12 @@ edit_paste_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = floating_sel ? gimp_item_get_ID (GIMP_ITEM (floating_sel)) : -1; + return_vals[1].value.pdb_int = floating_sel ? gimp_item_get_ID (GIMP_ITEM (floating_sel)) : -1; - return return_args; + return return_vals; } static ProcArg edit_paste_inargs[] = @@ -376,7 +376,7 @@ edit_paste_as_new_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image = NULL; if (gimp->global_buffer) @@ -389,12 +389,12 @@ edit_paste_as_new_invoker (ProcRecord *proc_record, else success = FALSE; - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = image ? gimp_image_get_ID (image) : -1; + return_vals[1].value.pdb_int = image ? gimp_image_get_ID (image) : -1; - return return_args; + return return_vals; } static ProcArg edit_paste_as_new_outargs[] = @@ -432,7 +432,7 @@ edit_named_cut_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gchar *buffer_name; gchar *real_name = NULL; @@ -463,12 +463,12 @@ edit_named_cut_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = real_name; + return_vals[1].value.pdb_pointer = real_name; - return return_args; + return return_vals; } static ProcArg edit_named_cut_inargs[] = @@ -520,7 +520,7 @@ edit_named_copy_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gchar *buffer_name; gchar *real_name = NULL; @@ -551,12 +551,12 @@ edit_named_copy_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = real_name; + return_vals[1].value.pdb_pointer = real_name; - return return_args; + return return_vals; } static ProcArg edit_named_copy_inargs[] = @@ -608,7 +608,7 @@ edit_named_copy_visible_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gchar *buffer_name; gchar *real_name = NULL; @@ -637,12 +637,12 @@ edit_named_copy_visible_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = real_name; + return_vals[1].value.pdb_pointer = real_name; - return return_args; + return return_vals; } static ProcArg edit_named_copy_visible_inargs[] = @@ -694,7 +694,7 @@ edit_named_paste_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gchar *buffer_name; gboolean paste_into; @@ -727,12 +727,12 @@ edit_named_paste_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = floating_sel ? gimp_item_get_ID (GIMP_ITEM (floating_sel)) : -1; + return_vals[1].value.pdb_int = floating_sel ? gimp_item_get_ID (GIMP_ITEM (floating_sel)) : -1; - return return_args; + return return_vals; } static ProcArg edit_named_paste_inargs[] = @@ -789,7 +789,7 @@ edit_named_paste_as_new_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *buffer_name; GimpImage *image = NULL; @@ -813,12 +813,12 @@ edit_named_paste_as_new_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = image ? gimp_image_get_ID (image) : -1; + return_vals[1].value.pdb_int = image ? gimp_image_get_ID (image) : -1; - return return_args; + return return_vals; } static ProcArg edit_named_paste_as_new_inargs[] = @@ -883,7 +883,7 @@ edit_clear_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg edit_clear_inargs[] = @@ -945,7 +945,7 @@ edit_fill_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg edit_fill_inargs[] = @@ -1042,7 +1042,7 @@ edit_bucket_fill_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg edit_bucket_fill_inargs[] = @@ -1213,7 +1213,7 @@ edit_blend_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg edit_blend_inargs[] = @@ -1350,7 +1350,7 @@ edit_stroke_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg edit_stroke_inargs[] = diff --git a/app/pdb/fileops_cmds.c b/app/pdb/fileops_cmds.c index e451d2cd9e..eb1ab75bea 100644 --- a/app/pdb/fileops_cmds.c +++ b/app/pdb/fileops_cmds.c @@ -151,14 +151,14 @@ file_load_invoker (ProcRecord *proc_record, NULL); if (! uri) - return procedural_db_return_args (proc_record, FALSE); + return procedural_db_return_values (proc_record, FALSE); file_proc = file_utils_find_proc (gimp->load_procs, uri); g_free (uri); if (! file_proc) - return procedural_db_return_args (proc_record, FALSE); + return procedural_db_return_values (proc_record, FALSE); proc = plug_in_proc_def_get_proc (file_proc); @@ -233,7 +233,7 @@ file_load_layer_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gint32 run_mode; GimpImage *image; gchar *filename; @@ -269,12 +269,12 @@ file_load_layer_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; + return_vals[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; - return return_args; + return return_vals; } static ProcArg file_load_layer_inargs[] = @@ -331,7 +331,7 @@ file_load_thumbnail_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *filename; gint32 width = 0; gint32 height = 0; @@ -392,17 +392,17 @@ file_load_thumbnail_invoker (ProcRecord *proc_record, g_free (uri); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = width; - return_args[2].value.pdb_int = height; - return_args[3].value.pdb_int = thumb_data_count; - return_args[4].value.pdb_pointer = thumb_data; + return_vals[1].value.pdb_int = width; + return_vals[2].value.pdb_int = height; + return_vals[3].value.pdb_int = thumb_data_count; + return_vals[4].value.pdb_pointer = thumb_data; } - return return_args; + return return_vals; } static ProcArg file_load_thumbnail_inargs[] = @@ -474,14 +474,14 @@ file_save_invoker (ProcRecord *proc_record, NULL); if (! uri) - return procedural_db_return_args (proc_record, FALSE); + return procedural_db_return_values (proc_record, FALSE); file_proc = file_utils_find_proc (gimp->save_procs, uri); g_free (uri); if (! file_proc) - return procedural_db_return_args (proc_record, FALSE); + return procedural_db_return_values (proc_record, FALSE); proc = plug_in_proc_def_get_proc (file_proc); @@ -598,7 +598,7 @@ file_save_thumbnail_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg file_save_thumbnail_inargs[] = @@ -641,7 +641,7 @@ temp_name_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *extension; gchar *name = NULL; @@ -671,12 +671,12 @@ temp_name_invoker (ProcRecord *proc_record, g_free (filename); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = name; + return_vals[1].value.pdb_pointer = name; - return return_args; + return return_vals; } static ProcArg temp_name_inargs[] = @@ -745,7 +745,7 @@ register_magic_load_handler_invoker (ProcRecord *proc_record, extensions, prefixes, magics); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg register_magic_load_handler_inargs[] = @@ -817,7 +817,7 @@ register_load_handler_invoker (ProcRecord *proc_record, extensions, prefixes, NULL); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg register_load_handler_inargs[] = @@ -920,7 +920,7 @@ register_save_handler_invoker (ProcRecord *proc_record, g_free (canonical); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg register_save_handler_inargs[] = @@ -991,7 +991,7 @@ register_file_handler_mime_invoker (ProcRecord *proc_record, g_free (canonical); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg register_file_handler_mime_inargs[] = @@ -1057,7 +1057,7 @@ register_thumbnail_loader_invoker (ProcRecord *proc_record, g_free (canonical); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg register_thumbnail_loader_inargs[] = diff --git a/app/pdb/floating_sel_cmds.c b/app/pdb/floating_sel_cmds.c index 903e2d3e74..239bf018a4 100644 --- a/app/pdb/floating_sel_cmds.c +++ b/app/pdb/floating_sel_cmds.c @@ -70,7 +70,7 @@ floating_sel_remove_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg floating_sel_remove_inargs[] = @@ -122,7 +122,7 @@ floating_sel_anchor_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg floating_sel_anchor_inargs[] = @@ -174,7 +174,7 @@ floating_sel_to_layer_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg floating_sel_to_layer_inargs[] = @@ -231,7 +231,7 @@ floating_sel_attach_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg floating_sel_attach_inargs[] = @@ -291,7 +291,7 @@ floating_sel_rigor_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg floating_sel_rigor_inargs[] = @@ -351,7 +351,7 @@ floating_sel_relax_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg floating_sel_relax_inargs[] = diff --git a/app/pdb/font_select_cmds.c b/app/pdb/font_select_cmds.c index c32c369def..2ff737f26c 100644 --- a/app/pdb/font_select_cmds.c +++ b/app/pdb/font_select_cmds.c @@ -74,7 +74,7 @@ fonts_popup_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg fonts_popup_inargs[] = @@ -136,7 +136,7 @@ fonts_close_popup_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg fonts_close_popup_inargs[] = @@ -194,7 +194,7 @@ fonts_set_popup_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg fonts_set_popup_inargs[] = diff --git a/app/pdb/fonts_cmds.c b/app/pdb/fonts_cmds.c index 50765d6f38..36958bb9c0 100644 --- a/app/pdb/fonts_cmds.c +++ b/app/pdb/fonts_cmds.c @@ -49,7 +49,7 @@ fonts_refresh_invoker (ProcRecord *proc_record, Argument *args) { gimp_fonts_load (gimp); - return procedural_db_return_args (proc_record, TRUE); + return procedural_db_return_values (proc_record, TRUE); } static ProcRecord fonts_refresh_proc = @@ -78,7 +78,7 @@ fonts_get_list_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *filter; gint32 num_fonts = 0; gchar **font_list = NULL; @@ -93,15 +93,15 @@ fonts_get_list_invoker (ProcRecord *proc_record, filter, &num_fonts); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_fonts; - return_args[2].value.pdb_pointer = font_list; + return_vals[1].value.pdb_int = num_fonts; + return_vals[2].value.pdb_pointer = font_list; } - return return_args; + return return_vals; } static ProcArg fonts_get_list_inargs[] = diff --git a/app/pdb/gimp-pdb.c b/app/pdb/gimp-pdb.c index 9c38dc27a2..a2ad52a20f 100644 --- a/app/pdb/gimp-pdb.c +++ b/app/pdb/gimp-pdb.c @@ -386,11 +386,7 @@ procedural_db_run_proc (Gimp *gimp, return return_vals; } - /* allocate the parameter array */ - params = g_new0 (Argument, proc->num_args); - - for (i = 0; i < proc->num_args; i++) - params[i].arg_type = proc->args[i].arg_type; + params = procedural_db_arguments (proc); va_start (args, nreturn_vals); @@ -482,28 +478,44 @@ procedural_db_run_proc (Gimp *gimp, } Argument * -procedural_db_return_args (ProcRecord *procedure, - gboolean success) +procedural_db_arguments (ProcRecord *procedure) { - Argument *return_args; + Argument *args; gint i; g_return_val_if_fail (procedure != NULL, NULL); - return_args = g_new0 (Argument, procedure->num_values + 1); + args = g_new0 (Argument, procedure->num_args); - return_args[0].arg_type = GIMP_PDB_STATUS; + for (i = 0; i < procedure->num_args; i++) + args[i].arg_type = procedure->values[i].arg_type; + + return args; +} + +Argument * +procedural_db_return_values (ProcRecord *procedure, + gboolean success) +{ + Argument *args; + gint i; + + g_return_val_if_fail (procedure != NULL, NULL); + + args = g_new0 (Argument, procedure->num_values + 1); + + args[0].arg_type = GIMP_PDB_STATUS; if (success) - return_args[0].value.pdb_int = GIMP_PDB_SUCCESS; + args[0].value.pdb_int = GIMP_PDB_SUCCESS; else - return_args[0].value.pdb_int = GIMP_PDB_EXECUTION_ERROR; + args[0].value.pdb_int = GIMP_PDB_EXECUTION_ERROR; /* Set the arg types for the return values */ for (i = 0; i < procedure->num_values; i++) - return_args[i + 1].arg_type = procedure->values[i].arg_type; + args[i + 1].arg_type = procedure->values[i].arg_type; - return return_args; + return args; } void diff --git a/app/pdb/gimp-pdb.h b/app/pdb/gimp-pdb.h index f51ef1374e..a323b93e54 100644 --- a/app/pdb/gimp-pdb.h +++ b/app/pdb/gimp-pdb.h @@ -143,7 +143,8 @@ Argument * procedural_db_run_proc (Gimp *gimp, gint *nreturn_vals, ...); -Argument * procedural_db_return_args (ProcRecord *procedure, +Argument * procedural_db_arguments (ProcRecord *procedure); +Argument * procedural_db_return_values (ProcRecord *procedure, gboolean success); void procedural_db_destroy_args (Argument *args, gint nargs); diff --git a/app/pdb/gimppdb.c b/app/pdb/gimppdb.c index 9c38dc27a2..a2ad52a20f 100644 --- a/app/pdb/gimppdb.c +++ b/app/pdb/gimppdb.c @@ -386,11 +386,7 @@ procedural_db_run_proc (Gimp *gimp, return return_vals; } - /* allocate the parameter array */ - params = g_new0 (Argument, proc->num_args); - - for (i = 0; i < proc->num_args; i++) - params[i].arg_type = proc->args[i].arg_type; + params = procedural_db_arguments (proc); va_start (args, nreturn_vals); @@ -482,28 +478,44 @@ procedural_db_run_proc (Gimp *gimp, } Argument * -procedural_db_return_args (ProcRecord *procedure, - gboolean success) +procedural_db_arguments (ProcRecord *procedure) { - Argument *return_args; + Argument *args; gint i; g_return_val_if_fail (procedure != NULL, NULL); - return_args = g_new0 (Argument, procedure->num_values + 1); + args = g_new0 (Argument, procedure->num_args); - return_args[0].arg_type = GIMP_PDB_STATUS; + for (i = 0; i < procedure->num_args; i++) + args[i].arg_type = procedure->values[i].arg_type; + + return args; +} + +Argument * +procedural_db_return_values (ProcRecord *procedure, + gboolean success) +{ + Argument *args; + gint i; + + g_return_val_if_fail (procedure != NULL, NULL); + + args = g_new0 (Argument, procedure->num_values + 1); + + args[0].arg_type = GIMP_PDB_STATUS; if (success) - return_args[0].value.pdb_int = GIMP_PDB_SUCCESS; + args[0].value.pdb_int = GIMP_PDB_SUCCESS; else - return_args[0].value.pdb_int = GIMP_PDB_EXECUTION_ERROR; + args[0].value.pdb_int = GIMP_PDB_EXECUTION_ERROR; /* Set the arg types for the return values */ for (i = 0; i < procedure->num_values; i++) - return_args[i + 1].arg_type = procedure->values[i].arg_type; + args[i + 1].arg_type = procedure->values[i].arg_type; - return return_args; + return args; } void diff --git a/app/pdb/gimppdb.h b/app/pdb/gimppdb.h index f51ef1374e..a323b93e54 100644 --- a/app/pdb/gimppdb.h +++ b/app/pdb/gimppdb.h @@ -143,7 +143,8 @@ Argument * procedural_db_run_proc (Gimp *gimp, gint *nreturn_vals, ...); -Argument * procedural_db_return_args (ProcRecord *procedure, +Argument * procedural_db_arguments (ProcRecord *procedure); +Argument * procedural_db_return_values (ProcRecord *procedure, gboolean success); void procedural_db_destroy_args (Argument *args, gint nargs); diff --git a/app/pdb/gimpprocedure.c b/app/pdb/gimpprocedure.c index 9c38dc27a2..a2ad52a20f 100644 --- a/app/pdb/gimpprocedure.c +++ b/app/pdb/gimpprocedure.c @@ -386,11 +386,7 @@ procedural_db_run_proc (Gimp *gimp, return return_vals; } - /* allocate the parameter array */ - params = g_new0 (Argument, proc->num_args); - - for (i = 0; i < proc->num_args; i++) - params[i].arg_type = proc->args[i].arg_type; + params = procedural_db_arguments (proc); va_start (args, nreturn_vals); @@ -482,28 +478,44 @@ procedural_db_run_proc (Gimp *gimp, } Argument * -procedural_db_return_args (ProcRecord *procedure, - gboolean success) +procedural_db_arguments (ProcRecord *procedure) { - Argument *return_args; + Argument *args; gint i; g_return_val_if_fail (procedure != NULL, NULL); - return_args = g_new0 (Argument, procedure->num_values + 1); + args = g_new0 (Argument, procedure->num_args); - return_args[0].arg_type = GIMP_PDB_STATUS; + for (i = 0; i < procedure->num_args; i++) + args[i].arg_type = procedure->values[i].arg_type; + + return args; +} + +Argument * +procedural_db_return_values (ProcRecord *procedure, + gboolean success) +{ + Argument *args; + gint i; + + g_return_val_if_fail (procedure != NULL, NULL); + + args = g_new0 (Argument, procedure->num_values + 1); + + args[0].arg_type = GIMP_PDB_STATUS; if (success) - return_args[0].value.pdb_int = GIMP_PDB_SUCCESS; + args[0].value.pdb_int = GIMP_PDB_SUCCESS; else - return_args[0].value.pdb_int = GIMP_PDB_EXECUTION_ERROR; + args[0].value.pdb_int = GIMP_PDB_EXECUTION_ERROR; /* Set the arg types for the return values */ for (i = 0; i < procedure->num_values; i++) - return_args[i + 1].arg_type = procedure->values[i].arg_type; + args[i + 1].arg_type = procedure->values[i].arg_type; - return return_args; + return args; } void diff --git a/app/pdb/gimpprocedure.h b/app/pdb/gimpprocedure.h index f51ef1374e..a323b93e54 100644 --- a/app/pdb/gimpprocedure.h +++ b/app/pdb/gimpprocedure.h @@ -143,7 +143,8 @@ Argument * procedural_db_run_proc (Gimp *gimp, gint *nreturn_vals, ...); -Argument * procedural_db_return_args (ProcRecord *procedure, +Argument * procedural_db_arguments (ProcRecord *procedure); +Argument * procedural_db_return_values (ProcRecord *procedure, gboolean success); void procedural_db_destroy_args (Argument *args, gint nargs); diff --git a/app/pdb/gimprc_cmds.c b/app/pdb/gimprc_cmds.c index 3ecaa1091c..533dc6a0bf 100644 --- a/app/pdb/gimprc_cmds.c +++ b/app/pdb/gimprc_cmds.c @@ -62,7 +62,7 @@ gimprc_query_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *token; gchar *value = NULL; @@ -84,12 +84,12 @@ gimprc_query_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = value; + return_vals[1].value.pdb_pointer = value; - return return_args; + return return_vals; } static ProcArg gimprc_query_inargs[] = @@ -158,7 +158,7 @@ gimprc_set_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg gimprc_set_inargs[] = @@ -200,15 +200,15 @@ get_default_comment_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; gchar *comment = NULL; comment = g_strdup (gimp->config->default_image->comment); - return_args = procedural_db_return_args (proc_record, TRUE); - return_args[1].value.pdb_pointer = comment; + return_vals = procedural_db_return_values (proc_record, TRUE); + return_vals[1].value.pdb_pointer = comment; - return return_args; + return return_vals; } static ProcArg get_default_comment_outargs[] = @@ -245,19 +245,19 @@ get_monitor_resolution_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; gdouble xres = 0.0; gdouble yres = 0.0; xres = GIMP_DISPLAY_CONFIG (gimp->config)->monitor_xres; yres = GIMP_DISPLAY_CONFIG (gimp->config)->monitor_yres; - return_args = procedural_db_return_args (proc_record, TRUE); + return_vals = procedural_db_return_values (proc_record, TRUE); - return_args[1].value.pdb_float = xres; - return_args[2].value.pdb_float = yres; + return_vals[1].value.pdb_float = xres; + return_vals[2].value.pdb_float = yres; - return return_args; + return return_vals; } static ProcArg get_monitor_resolution_outargs[] = @@ -299,15 +299,15 @@ get_theme_dir_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; gchar *theme_dir = NULL; theme_dir = g_strdup (gimp_get_theme_dir (gimp)); - return_args = procedural_db_return_args (proc_record, TRUE); - return_args[1].value.pdb_pointer = theme_dir; + return_vals = procedural_db_return_values (proc_record, TRUE); + return_vals[1].value.pdb_pointer = theme_dir; - return return_args; + return return_vals; } static ProcArg get_theme_dir_outargs[] = @@ -344,15 +344,15 @@ get_color_configuration_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; gchar *config = NULL; config = gimp_config_serialize_to_string (GIMP_CONFIG (gimp->config->color_management), NULL); - return_args = procedural_db_return_args (proc_record, TRUE); - return_args[1].value.pdb_pointer = config; + return_vals = procedural_db_return_values (proc_record, TRUE); + return_vals[1].value.pdb_pointer = config; - return return_args; + return return_vals; } static ProcArg get_color_configuration_outargs[] = @@ -389,15 +389,15 @@ get_module_load_inhibit_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; gchar *load_inhibit = NULL; load_inhibit = g_strdup (gimp_module_db_get_load_inhibit (gimp->module_db)); - return_args = procedural_db_return_args (proc_record, TRUE); - return_args[1].value.pdb_pointer = load_inhibit; + return_vals = procedural_db_return_values (proc_record, TRUE); + return_vals[1].value.pdb_pointer = load_inhibit; - return return_args; + return return_vals; } static ProcArg get_module_load_inhibit_outargs[] = diff --git a/app/pdb/gradient_cmds.c b/app/pdb/gradient_cmds.c index 09127ddd67..3242b54740 100644 --- a/app/pdb/gradient_cmds.c +++ b/app/pdb/gradient_cmds.c @@ -158,7 +158,7 @@ gradient_new_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gchar *actual_name = NULL; @@ -181,12 +181,12 @@ gradient_new_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = actual_name; + return_vals[1].value.pdb_pointer = actual_name; - return return_args; + return return_vals; } static ProcArg gradient_new_inargs[] = @@ -233,7 +233,7 @@ gradient_duplicate_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gchar *copy_name = NULL; @@ -261,12 +261,12 @@ gradient_duplicate_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = copy_name; + return_vals[1].value.pdb_pointer = copy_name; - return return_args; + return return_vals; } static ProcArg gradient_duplicate_inargs[] = @@ -313,7 +313,7 @@ gradient_is_editable_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gboolean editable = FALSE; @@ -332,12 +332,12 @@ gradient_is_editable_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = editable; + return_vals[1].value.pdb_int = editable; - return return_args; + return return_vals; } static ProcArg gradient_is_editable_inargs[] = @@ -384,7 +384,7 @@ gradient_rename_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gchar *new_name; gchar *actual_name = NULL; @@ -411,12 +411,12 @@ gradient_rename_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = actual_name; + return_vals[1].value.pdb_pointer = actual_name; - return return_args; + return return_vals; } static ProcArg gradient_rename_inargs[] = @@ -497,7 +497,7 @@ gradient_delete_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg gradient_delete_inargs[] = @@ -535,7 +535,7 @@ gradient_get_uniform_samples_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 num_samples; gboolean reverse; @@ -586,15 +586,15 @@ gradient_get_uniform_samples_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_color_samples; - return_args[2].value.pdb_pointer = color_samples; + return_vals[1].value.pdb_int = num_color_samples; + return_vals[2].value.pdb_pointer = color_samples; } - return return_args; + return return_vals; } static ProcArg gradient_get_uniform_samples_inargs[] = @@ -656,7 +656,7 @@ gradient_get_custom_samples_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 num_samples; gdouble *positions; @@ -709,15 +709,15 @@ gradient_get_custom_samples_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_color_samples; - return_args[2].value.pdb_pointer = color_samples; + return_vals[1].value.pdb_int = num_color_samples; + return_vals[2].value.pdb_pointer = color_samples; } - return return_args; + return return_vals; } static ProcArg gradient_get_custom_samples_inargs[] = @@ -784,7 +784,7 @@ gradient_segment_get_left_color_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 segment; GimpRGB color = { 0.0, 0.0, 0.0, 1.0 }; @@ -814,15 +814,15 @@ gradient_segment_get_left_color_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_color = color; - return_args[2].value.pdb_float = opacity; + return_vals[1].value.pdb_color = color; + return_vals[2].value.pdb_float = opacity; } - return return_args; + return return_vals; } static ProcArg gradient_segment_get_left_color_inargs[] = @@ -914,7 +914,7 @@ gradient_segment_set_left_color_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg gradient_segment_set_left_color_inargs[] = @@ -967,7 +967,7 @@ gradient_segment_get_right_color_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 segment; GimpRGB color = { 0.0, 0.0, 0.0, 1.0 }; @@ -997,15 +997,15 @@ gradient_segment_get_right_color_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_color = color; - return_args[2].value.pdb_float = opacity; + return_vals[1].value.pdb_color = color; + return_vals[2].value.pdb_float = opacity; } - return return_args; + return return_vals; } static ProcArg gradient_segment_get_right_color_inargs[] = @@ -1097,7 +1097,7 @@ gradient_segment_set_right_color_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg gradient_segment_set_right_color_inargs[] = @@ -1150,7 +1150,7 @@ gradient_segment_get_left_pos_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 segment; gdouble pos = 0.0; @@ -1178,12 +1178,12 @@ gradient_segment_get_left_pos_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = pos; + return_vals[1].value.pdb_float = pos; - return return_args; + return return_vals; } static ProcArg gradient_segment_get_left_pos_inargs[] = @@ -1235,7 +1235,7 @@ gradient_segment_set_left_pos_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 segment; gdouble pos; @@ -1268,12 +1268,12 @@ gradient_segment_set_left_pos_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = final_pos; + return_vals[1].value.pdb_float = final_pos; - return return_args; + return return_vals; } static ProcArg gradient_segment_set_left_pos_inargs[] = @@ -1330,7 +1330,7 @@ gradient_segment_get_middle_pos_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 segment; gdouble pos = 0.0; @@ -1358,12 +1358,12 @@ gradient_segment_get_middle_pos_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = pos; + return_vals[1].value.pdb_float = pos; - return return_args; + return return_vals; } static ProcArg gradient_segment_get_middle_pos_inargs[] = @@ -1415,7 +1415,7 @@ gradient_segment_set_middle_pos_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 segment; gdouble pos; @@ -1449,12 +1449,12 @@ gradient_segment_set_middle_pos_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = final_pos; + return_vals[1].value.pdb_float = final_pos; - return return_args; + return return_vals; } static ProcArg gradient_segment_set_middle_pos_inargs[] = @@ -1511,7 +1511,7 @@ gradient_segment_get_right_pos_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 segment; gdouble pos = 0.0; @@ -1539,12 +1539,12 @@ gradient_segment_get_right_pos_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = pos; + return_vals[1].value.pdb_float = pos; - return return_args; + return return_vals; } static ProcArg gradient_segment_get_right_pos_inargs[] = @@ -1596,7 +1596,7 @@ gradient_segment_set_right_pos_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 segment; gdouble pos; @@ -1630,12 +1630,12 @@ gradient_segment_set_right_pos_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = final_pos; + return_vals[1].value.pdb_float = final_pos; - return return_args; + return return_vals; } static ProcArg gradient_segment_set_right_pos_inargs[] = @@ -1692,7 +1692,7 @@ gradient_segment_get_blending_function_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 segment; gint32 blend_func = 0; @@ -1720,12 +1720,12 @@ gradient_segment_get_blending_function_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = blend_func; + return_vals[1].value.pdb_int = blend_func; - return return_args; + return return_vals; } static ProcArg gradient_segment_get_blending_function_inargs[] = @@ -1777,7 +1777,7 @@ gradient_segment_get_coloring_type_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 segment; gint32 coloring_type = 0; @@ -1805,12 +1805,12 @@ gradient_segment_get_coloring_type_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = coloring_type; + return_vals[1].value.pdb_int = coloring_type; - return return_args; + return return_vals; } static ProcArg gradient_segment_get_coloring_type_inargs[] = @@ -1900,7 +1900,7 @@ gradient_segment_range_set_blending_function_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg gradient_segment_range_set_blending_function_inargs[] = @@ -1991,7 +1991,7 @@ gradient_segment_range_set_coloring_type_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg gradient_segment_range_set_coloring_type_inargs[] = @@ -2077,7 +2077,7 @@ gradient_segment_range_flip_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg gradient_segment_range_flip_inargs[] = @@ -2164,7 +2164,7 @@ gradient_segment_range_replicate_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg gradient_segment_range_replicate_inargs[] = @@ -2250,7 +2250,7 @@ gradient_segment_range_split_midpoint_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg gradient_segment_range_split_midpoint_inargs[] = @@ -2337,7 +2337,7 @@ gradient_segment_range_split_uniform_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg gradient_segment_range_split_uniform_inargs[] = @@ -2423,7 +2423,7 @@ gradient_segment_range_delete_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg gradient_segment_range_delete_inargs[] = @@ -2503,7 +2503,7 @@ gradient_segment_range_redistribute_handles_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg gradient_segment_range_redistribute_handles_inargs[] = @@ -2586,7 +2586,7 @@ gradient_segment_range_blend_colors_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg gradient_segment_range_blend_colors_inargs[] = @@ -2669,7 +2669,7 @@ gradient_segment_range_blend_opacity_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg gradient_segment_range_blend_opacity_inargs[] = @@ -2717,7 +2717,7 @@ gradient_segment_range_move_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 start_segment; gint32 end_segment; @@ -2761,12 +2761,12 @@ gradient_segment_range_move_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = final_delta; + return_vals[1].value.pdb_float = final_delta; - return return_args; + return return_vals; } static ProcArg gradient_segment_range_move_inargs[] = diff --git a/app/pdb/gradient_select_cmds.c b/app/pdb/gradient_select_cmds.c index 978ad86561..fbb53fcbc2 100644 --- a/app/pdb/gradient_select_cmds.c +++ b/app/pdb/gradient_select_cmds.c @@ -83,7 +83,7 @@ gradients_popup_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg gradients_popup_inargs[] = @@ -151,7 +151,7 @@ gradients_close_popup_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg gradients_close_popup_inargs[] = @@ -210,7 +210,7 @@ gradients_set_popup_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg gradients_set_popup_inargs[] = diff --git a/app/pdb/gradients_cmds.c b/app/pdb/gradients_cmds.c index 52a1981878..ba65ab8264 100644 --- a/app/pdb/gradients_cmds.c +++ b/app/pdb/gradients_cmds.c @@ -58,7 +58,7 @@ gradients_refresh_invoker (ProcRecord *proc_record, Argument *args) { gimp_data_factory_data_refresh (gimp->gradient_factory); - return procedural_db_return_args (proc_record, TRUE); + return procedural_db_return_values (proc_record, TRUE); } static ProcRecord gradients_refresh_proc = @@ -87,7 +87,7 @@ gradients_get_list_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *filter; gint32 num_gradients = 0; gchar **gradient_list = NULL; @@ -102,15 +102,15 @@ gradients_get_list_invoker (ProcRecord *proc_record, filter, &num_gradients); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_gradients; - return_args[2].value.pdb_pointer = gradient_list; + return_vals[1].value.pdb_int = num_gradients; + return_vals[2].value.pdb_pointer = gradient_list; } - return return_args; + return return_vals; } static ProcArg gradients_get_list_inargs[] = @@ -162,7 +162,7 @@ gradients_sample_uniform_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gint32 num_samples; gboolean reverse; gint32 array_length = 0; @@ -204,15 +204,15 @@ gradients_sample_uniform_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = array_length; - return_args[2].value.pdb_pointer = color_samples; + return_vals[1].value.pdb_int = array_length; + return_vals[2].value.pdb_pointer = color_samples; } - return return_args; + return return_vals; } static ProcArg gradients_sample_uniform_inargs[] = @@ -269,7 +269,7 @@ gradients_sample_custom_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gint32 num_samples; gdouble *positions; gboolean reverse; @@ -311,15 +311,15 @@ gradients_sample_custom_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = array_length; - return_args[2].value.pdb_pointer = color_samples; + return_vals[1].value.pdb_int = array_length; + return_vals[2].value.pdb_pointer = color_samples; } - return return_args; + return return_vals; } static ProcArg gradients_sample_custom_inargs[] = @@ -381,7 +381,7 @@ gradients_get_gradient_data_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 sample_size; gboolean reverse; @@ -447,16 +447,16 @@ gradients_get_gradient_data_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_pointer = actual_name; - return_args[2].value.pdb_int = width; - return_args[3].value.pdb_pointer = grad_data; + return_vals[1].value.pdb_pointer = actual_name; + return_vals[2].value.pdb_int = width; + return_vals[3].value.pdb_pointer = grad_data; } - return return_args; + return return_vals; } static ProcArg gradients_get_gradient_data_inargs[] = diff --git a/app/pdb/grid_cmds.c b/app/pdb/grid_cmds.c index 799f9c567d..d56bef6821 100644 --- a/app/pdb/grid_cmds.c +++ b/app/pdb/grid_cmds.c @@ -67,7 +67,7 @@ image_grid_get_spacing_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gdouble xspacing = 0.0; gdouble yspacing = 0.0; @@ -89,15 +89,15 @@ image_grid_get_spacing_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_float = xspacing; - return_args[2].value.pdb_float = yspacing; + return_vals[1].value.pdb_float = xspacing; + return_vals[2].value.pdb_float = yspacing; } - return return_args; + return return_vals; } static ProcArg image_grid_get_spacing_inargs[] = @@ -174,7 +174,7 @@ image_grid_set_spacing_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_grid_set_spacing_inargs[] = @@ -222,7 +222,7 @@ image_grid_get_offset_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gdouble xoffset = 0.0; gdouble yoffset = 0.0; @@ -244,15 +244,15 @@ image_grid_get_offset_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_float = xoffset; - return_args[2].value.pdb_float = yoffset; + return_vals[1].value.pdb_float = xoffset; + return_vals[2].value.pdb_float = yoffset; } - return return_args; + return return_vals; } static ProcArg image_grid_get_offset_inargs[] = @@ -329,7 +329,7 @@ image_grid_set_offset_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_grid_set_offset_inargs[] = @@ -377,7 +377,7 @@ image_grid_get_foreground_color_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpRGB fgcolor = { 0.0, 0.0, 0.0, 1.0 }; @@ -395,12 +395,12 @@ image_grid_get_foreground_color_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_color = fgcolor; + return_vals[1].value.pdb_color = fgcolor; - return return_args; + return return_vals; } static ProcArg image_grid_get_foreground_color_inargs[] = @@ -466,7 +466,7 @@ image_grid_set_foreground_color_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_grid_set_foreground_color_inargs[] = @@ -509,7 +509,7 @@ image_grid_get_background_color_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpRGB bgcolor = { 0.0, 0.0, 0.0, 1.0 }; @@ -527,12 +527,12 @@ image_grid_get_background_color_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_color = bgcolor; + return_vals[1].value.pdb_color = bgcolor; - return return_args; + return return_vals; } static ProcArg image_grid_get_background_color_inargs[] = @@ -598,7 +598,7 @@ image_grid_set_background_color_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_grid_set_background_color_inargs[] = @@ -641,7 +641,7 @@ image_grid_get_style_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 style = 0; @@ -659,12 +659,12 @@ image_grid_get_style_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = style; + return_vals[1].value.pdb_int = style; - return return_args; + return return_vals; } static ProcArg image_grid_get_style_inargs[] = @@ -732,7 +732,7 @@ image_grid_set_style_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_grid_set_style_inargs[] = diff --git a/app/pdb/guides_cmds.c b/app/pdb/guides_cmds.c index 5a55c387a2..3bd04bcdc4 100644 --- a/app/pdb/guides_cmds.c +++ b/app/pdb/guides_cmds.c @@ -56,7 +56,7 @@ image_add_hguide_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 yposition; gint32 guide = 0; @@ -82,12 +82,12 @@ image_add_hguide_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = guide; + return_vals[1].value.pdb_int = guide; - return return_args; + return return_vals; } static ProcArg image_add_hguide_inargs[] = @@ -139,7 +139,7 @@ image_add_vguide_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 xposition; gint32 guide = 0; @@ -165,12 +165,12 @@ image_add_vguide_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = guide; + return_vals[1].value.pdb_int = guide; - return return_args; + return return_vals; } static ProcArg image_add_vguide_inargs[] = @@ -241,7 +241,7 @@ image_delete_guide_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_delete_guide_inargs[] = @@ -284,7 +284,7 @@ image_find_next_guide_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 guide; gint32 next_guide = 0; @@ -303,12 +303,12 @@ image_find_next_guide_invoker (ProcRecord *proc_record, next_guide = g->guide_ID; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = next_guide; + return_vals[1].value.pdb_int = next_guide; - return return_args; + return return_vals; } static ProcArg image_find_next_guide_inargs[] = @@ -360,7 +360,7 @@ image_get_guide_orientation_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 guide; gint32 orientation = 0; @@ -381,12 +381,12 @@ image_get_guide_orientation_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = orientation; + return_vals[1].value.pdb_int = orientation; - return return_args; + return return_vals; } static ProcArg image_get_guide_orientation_inargs[] = @@ -438,7 +438,7 @@ image_get_guide_position_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 guide; gint32 position = 0; @@ -459,12 +459,12 @@ image_get_guide_position_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = position; + return_vals[1].value.pdb_int = position; - return return_args; + return return_vals; } static ProcArg image_get_guide_position_inargs[] = diff --git a/app/pdb/help_cmds.c b/app/pdb/help_cmds.c index 4e3fee652d..509672ddc2 100644 --- a/app/pdb/help_cmds.c +++ b/app/pdb/help_cmds.c @@ -66,7 +66,7 @@ help_invoker (ProcRecord *proc_record, gimp_help (gimp, help_domain, help_id); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg help_inargs[] = diff --git a/app/pdb/image_cmds.c b/app/pdb/image_cmds.c index 0e9f9de2fa..acfcc13a87 100644 --- a/app/pdb/image_cmds.c +++ b/app/pdb/image_cmds.c @@ -220,7 +220,7 @@ image_list_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; gint32 num_images = 0; gint32 *image_ids = NULL; @@ -238,12 +238,12 @@ image_list_invoker (ProcRecord *proc_record, image_ids[i] = gimp_image_get_ID (GIMP_IMAGE (list->data)); } - return_args = procedural_db_return_args (proc_record, TRUE); + return_vals = procedural_db_return_values (proc_record, TRUE); - return_args[1].value.pdb_int = num_images; - return_args[2].value.pdb_pointer = image_ids; + return_vals[1].value.pdb_int = num_images; + return_vals[2].value.pdb_pointer = image_ids; - return return_args; + return return_vals; } static ProcArg image_list_outargs[] = @@ -286,7 +286,7 @@ image_new_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gint32 width; gint32 height; gint32 type; @@ -312,12 +312,12 @@ image_new_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = image ? gimp_image_get_ID (image) : -1; + return_vals[1].value.pdb_int = image ? gimp_image_get_ID (image) : -1; - return return_args; + return return_vals; } static ProcArg image_new_inargs[] = @@ -374,7 +374,7 @@ image_duplicate_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpImage *new_image = NULL; @@ -390,12 +390,12 @@ image_duplicate_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = new_image ? gimp_image_get_ID (new_image) : -1; + return_vals[1].value.pdb_int = new_image ? gimp_image_get_ID (new_image) : -1; - return return_args; + return return_vals; } static ProcArg image_duplicate_inargs[] = @@ -456,7 +456,7 @@ image_delete_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_delete_inargs[] = @@ -494,7 +494,7 @@ image_base_type_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 base_type = 0; @@ -507,12 +507,12 @@ image_base_type_invoker (ProcRecord *proc_record, base_type = gimp_image_base_type (image); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = base_type; + return_vals[1].value.pdb_int = base_type; - return return_args; + return return_vals; } static ProcArg image_base_type_inargs[] = @@ -559,7 +559,7 @@ image_width_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 width = 0; @@ -572,12 +572,12 @@ image_width_invoker (ProcRecord *proc_record, width = gimp_image_get_width (image); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = width; + return_vals[1].value.pdb_int = width; - return return_args; + return return_vals; } static ProcArg image_width_inargs[] = @@ -624,7 +624,7 @@ image_height_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 height = 0; @@ -637,12 +637,12 @@ image_height_invoker (ProcRecord *proc_record, height = gimp_image_get_height (image); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = height; + return_vals[1].value.pdb_int = height; - return return_args; + return return_vals; } static ProcArg image_height_inargs[] = @@ -700,7 +700,7 @@ image_free_shadow_invoker (ProcRecord *proc_record, gimp_image_free_shadow (image); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_free_shadow_inargs[] = @@ -766,7 +766,7 @@ image_resize_invoker (ProcRecord *proc_record, new_width, new_height, offx, offy, NULL); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_resize_inargs[] = @@ -835,7 +835,7 @@ image_resize_to_layers_invoker (ProcRecord *proc_record, gimp_image_resize_to_layers (image, context, NULL); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_resize_to_layers_inargs[] = @@ -896,7 +896,7 @@ image_scale_invoker (ProcRecord *proc_record, NULL); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_scale_inargs[] = @@ -983,7 +983,7 @@ image_crop_invoker (ProcRecord *proc_record, FALSE, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_crop_inargs[] = @@ -1057,7 +1057,7 @@ image_flip_invoker (ProcRecord *proc_record, gimp_image_flip (image, context, flip_type, NULL); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_flip_inargs[] = @@ -1116,7 +1116,7 @@ image_rotate_invoker (ProcRecord *proc_record, gimp_image_rotate (image, context, rotate_type, NULL); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_rotate_inargs[] = @@ -1159,7 +1159,7 @@ image_get_layers_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 num_layers = 0; gint32 *layer_ids = NULL; @@ -1185,15 +1185,15 @@ image_get_layers_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_layers; - return_args[2].value.pdb_pointer = layer_ids; + return_vals[1].value.pdb_int = num_layers; + return_vals[2].value.pdb_pointer = layer_ids; } - return return_args; + return return_vals; } static ProcArg image_get_layers_inargs[] = @@ -1245,7 +1245,7 @@ image_get_channels_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 num_channels = 0; gint32 *channel_ids = NULL; @@ -1271,15 +1271,15 @@ image_get_channels_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_channels; - return_args[2].value.pdb_pointer = channel_ids; + return_vals[1].value.pdb_int = num_channels; + return_vals[2].value.pdb_pointer = channel_ids; } - return return_args; + return return_vals; } static ProcArg image_get_channels_inargs[] = @@ -1331,7 +1331,7 @@ image_get_vectors_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 num_vectors = 0; gint32 *vector_ids = NULL; @@ -1357,15 +1357,15 @@ image_get_vectors_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_vectors; - return_args[2].value.pdb_pointer = vector_ids; + return_vals[1].value.pdb_int = num_vectors; + return_vals[2].value.pdb_pointer = vector_ids; } - return return_args; + return return_vals; } static ProcArg image_get_vectors_inargs[] = @@ -1417,7 +1417,7 @@ image_get_active_drawable_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpDrawable *drawable = NULL; @@ -1430,12 +1430,12 @@ image_get_active_drawable_invoker (ProcRecord *proc_record, drawable = gimp_image_active_drawable (image); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg image_get_active_drawable_inargs[] = @@ -1493,7 +1493,7 @@ image_unset_active_channel_invoker (ProcRecord *proc_record, gimp_image_unset_active_channel (image); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_unset_active_channel_inargs[] = @@ -1531,7 +1531,7 @@ image_get_floating_sel_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpLayer *floating_sel = NULL; @@ -1544,12 +1544,12 @@ image_get_floating_sel_invoker (ProcRecord *proc_record, floating_sel = gimp_image_floating_sel (image); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = floating_sel ? gimp_item_get_ID (GIMP_ITEM (floating_sel)) : -1; + return_vals[1].value.pdb_int = floating_sel ? gimp_item_get_ID (GIMP_ITEM (floating_sel)) : -1; - return return_args; + return return_vals; } static ProcArg image_get_floating_sel_inargs[] = @@ -1596,7 +1596,7 @@ image_floating_sel_attached_to_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpDrawable *drawable = NULL; @@ -1614,12 +1614,12 @@ image_floating_sel_attached_to_invoker (ProcRecord *proc_record, drawable = NULL; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg image_floating_sel_attached_to_inargs[] = @@ -1666,7 +1666,7 @@ image_pick_color_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpDrawable *drawable; gdouble x; @@ -1723,12 +1723,12 @@ image_pick_color_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_color = color; + return_vals[1].value.pdb_color = color; - return return_args; + return return_vals; } static ProcArg image_pick_color_inargs[] = @@ -1805,7 +1805,7 @@ image_pick_correlate_layer_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 x; gint32 y; @@ -1824,12 +1824,12 @@ image_pick_correlate_layer_invoker (ProcRecord *proc_record, layer = gimp_image_pick_correlate_layer (image, x, y); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; + return_vals[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; - return return_args; + return return_vals; } static ProcArg image_pick_correlate_layer_inargs[] = @@ -1914,7 +1914,7 @@ image_add_layer_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_add_layer_inargs[] = @@ -1978,7 +1978,7 @@ image_remove_layer_invoker (ProcRecord *proc_record, gimp_image_remove_layer (image, layer); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_remove_layer_inargs[] = @@ -2037,7 +2037,7 @@ image_raise_layer_invoker (ProcRecord *proc_record, success = gimp_image_raise_layer (image, layer); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_raise_layer_inargs[] = @@ -2096,7 +2096,7 @@ image_lower_layer_invoker (ProcRecord *proc_record, success = gimp_image_lower_layer (image, layer); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_lower_layer_inargs[] = @@ -2155,7 +2155,7 @@ image_raise_layer_to_top_invoker (ProcRecord *proc_record, success = gimp_image_raise_layer_to_top (image, layer); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_raise_layer_to_top_inargs[] = @@ -2214,7 +2214,7 @@ image_lower_layer_to_bottom_invoker (ProcRecord *proc_record, success = gimp_image_lower_layer_to_bottom (image, layer); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_lower_layer_to_bottom_inargs[] = @@ -2279,7 +2279,7 @@ image_add_channel_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_add_channel_inargs[] = @@ -2343,7 +2343,7 @@ image_remove_channel_invoker (ProcRecord *proc_record, gimp_image_remove_channel (image, channel); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_remove_channel_inargs[] = @@ -2402,7 +2402,7 @@ image_raise_channel_invoker (ProcRecord *proc_record, success = gimp_image_raise_channel (image, channel); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_raise_channel_inargs[] = @@ -2461,7 +2461,7 @@ image_lower_channel_invoker (ProcRecord *proc_record, success = gimp_image_lower_channel (image, channel); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_lower_channel_inargs[] = @@ -2526,7 +2526,7 @@ image_add_vectors_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_add_vectors_inargs[] = @@ -2590,7 +2590,7 @@ image_remove_vectors_invoker (ProcRecord *proc_record, gimp_image_remove_vectors (image, vectors); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_remove_vectors_inargs[] = @@ -2649,7 +2649,7 @@ image_raise_vectors_invoker (ProcRecord *proc_record, success = gimp_image_raise_vectors (image, vectors); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_raise_vectors_inargs[] = @@ -2708,7 +2708,7 @@ image_lower_vectors_invoker (ProcRecord *proc_record, success = gimp_image_lower_vectors (image, vectors); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_lower_vectors_inargs[] = @@ -2767,7 +2767,7 @@ image_raise_vectors_to_top_invoker (ProcRecord *proc_record, success = gimp_image_raise_vectors_to_top (image, vectors); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_raise_vectors_to_top_inargs[] = @@ -2826,7 +2826,7 @@ image_lower_vectors_to_bottom_invoker (ProcRecord *proc_record, success = gimp_image_lower_vectors_to_bottom (image, vectors); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_lower_vectors_to_bottom_inargs[] = @@ -2869,7 +2869,7 @@ image_flatten_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpLayer *layer = NULL; @@ -2885,12 +2885,12 @@ image_flatten_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; + return_vals[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; - return return_args; + return return_vals; } static ProcArg image_flatten_inargs[] = @@ -2937,7 +2937,7 @@ image_merge_visible_layers_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 merge_type; GimpLayer *layer = NULL; @@ -2958,12 +2958,12 @@ image_merge_visible_layers_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; + return_vals[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; - return return_args; + return return_vals; } static ProcArg image_merge_visible_layers_inargs[] = @@ -3015,7 +3015,7 @@ image_merge_down_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpLayer *merge_layer; gint32 merge_type; @@ -3041,12 +3041,12 @@ image_merge_down_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; + return_vals[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; - return return_args; + return return_vals; } static ProcArg image_merge_down_inargs[] = @@ -3125,7 +3125,7 @@ image_add_layer_mask_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_add_layer_mask_inargs[] = @@ -3194,7 +3194,7 @@ image_remove_layer_mask_invoker (ProcRecord *proc_record, gimp_layer_apply_mask (layer, mode, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_remove_layer_mask_inargs[] = @@ -3242,7 +3242,7 @@ image_get_colormap_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 num_bytes = 0; guint8 *colormap = NULL; @@ -3257,15 +3257,15 @@ image_get_colormap_invoker (ProcRecord *proc_record, colormap = g_memdup (gimp_image_get_colormap (image), num_bytes); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_bytes; - return_args[2].value.pdb_pointer = colormap; + return_vals[1].value.pdb_int = num_bytes; + return_vals[2].value.pdb_pointer = colormap; } - return return_args; + return return_vals; } static ProcArg image_get_colormap_inargs[] = @@ -3336,7 +3336,7 @@ image_set_colormap_invoker (ProcRecord *proc_record, gimp_image_set_colormap (image, colormap, num_bytes / 3, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_set_colormap_inargs[] = @@ -3395,7 +3395,7 @@ image_clean_all_invoker (ProcRecord *proc_record, gimp_image_clean_all (image); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_clean_all_inargs[] = @@ -3433,7 +3433,7 @@ image_is_dirty_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gboolean dirty = FALSE; @@ -3446,12 +3446,12 @@ image_is_dirty_invoker (ProcRecord *proc_record, dirty = (image->dirty != 0); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = dirty; + return_vals[1].value.pdb_int = dirty; - return return_args; + return return_vals; } static ProcArg image_is_dirty_inargs[] = @@ -3498,7 +3498,7 @@ image_thumbnail_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 width; gint32 height; @@ -3560,18 +3560,18 @@ image_thumbnail_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = actual_width; - return_args[2].value.pdb_int = actual_height; - return_args[3].value.pdb_int = bpp; - return_args[4].value.pdb_int = thumbnail_data_count; - return_args[5].value.pdb_pointer = thumbnail_data; + return_vals[1].value.pdb_int = actual_width; + return_vals[2].value.pdb_int = actual_height; + return_vals[3].value.pdb_int = bpp; + return_vals[4].value.pdb_int = thumbnail_data_count; + return_vals[5].value.pdb_pointer = thumbnail_data; } - return return_args; + return return_vals; } static ProcArg image_thumbnail_inargs[] = @@ -3648,7 +3648,7 @@ image_get_active_layer_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpLayer *active_layer = NULL; @@ -3661,12 +3661,12 @@ image_get_active_layer_invoker (ProcRecord *proc_record, active_layer = gimp_image_get_active_layer (image); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = active_layer ? gimp_item_get_ID (GIMP_ITEM (active_layer)) : -1; + return_vals[1].value.pdb_int = active_layer ? gimp_item_get_ID (GIMP_ITEM (active_layer)) : -1; - return return_args; + return return_vals; } static ProcArg image_get_active_layer_inargs[] = @@ -3730,7 +3730,7 @@ image_set_active_layer_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_set_active_layer_inargs[] = @@ -3773,7 +3773,7 @@ image_get_active_channel_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpChannel *active_channel = NULL; @@ -3786,12 +3786,12 @@ image_get_active_channel_invoker (ProcRecord *proc_record, active_channel = gimp_image_get_active_channel (image); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = active_channel ? gimp_item_get_ID (GIMP_ITEM (active_channel)) : -1; + return_vals[1].value.pdb_int = active_channel ? gimp_item_get_ID (GIMP_ITEM (active_channel)) : -1; - return return_args; + return return_vals; } static ProcArg image_get_active_channel_inargs[] = @@ -3855,7 +3855,7 @@ image_set_active_channel_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_set_active_channel_inargs[] = @@ -3898,7 +3898,7 @@ image_get_active_vectors_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpVectors *active_vectors = NULL; @@ -3911,12 +3911,12 @@ image_get_active_vectors_invoker (ProcRecord *proc_record, active_vectors = gimp_image_get_active_vectors (image); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = active_vectors ? gimp_item_get_ID (GIMP_ITEM (active_vectors)) : -1; + return_vals[1].value.pdb_int = active_vectors ? gimp_item_get_ID (GIMP_ITEM (active_vectors)) : -1; - return return_args; + return return_vals; } static ProcArg image_get_active_vectors_inargs[] = @@ -3980,7 +3980,7 @@ image_set_active_vectors_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_set_active_vectors_inargs[] = @@ -4023,7 +4023,7 @@ image_get_selection_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpChannel *selection = NULL; @@ -4039,12 +4039,12 @@ image_get_selection_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = selection ? gimp_item_get_ID (GIMP_ITEM (selection)) : -1; + return_vals[1].value.pdb_int = selection ? gimp_item_get_ID (GIMP_ITEM (selection)) : -1; - return return_args; + return return_vals; } static ProcArg image_get_selection_inargs[] = @@ -4091,7 +4091,7 @@ image_get_component_active_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 component; gboolean active = FALSE; @@ -4117,12 +4117,12 @@ image_get_component_active_invoker (ProcRecord *proc_record, active = gimp_image_get_component_active (image, component); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = active; + return_vals[1].value.pdb_int = active; - return return_args; + return return_vals; } static ProcArg image_get_component_active_inargs[] = @@ -4201,7 +4201,7 @@ image_set_component_active_invoker (ProcRecord *proc_record, gimp_image_set_component_active (image, component, active); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_set_component_active_inargs[] = @@ -4249,7 +4249,7 @@ image_get_component_visible_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 component; gboolean visible = FALSE; @@ -4275,12 +4275,12 @@ image_get_component_visible_invoker (ProcRecord *proc_record, visible = gimp_image_get_component_visible (image, component); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = visible; + return_vals[1].value.pdb_int = visible; - return return_args; + return return_vals; } static ProcArg image_get_component_visible_inargs[] = @@ -4359,7 +4359,7 @@ image_set_component_visible_invoker (ProcRecord *proc_record, gimp_image_set_component_visible (image, component, visible); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_set_component_visible_inargs[] = @@ -4407,7 +4407,7 @@ image_get_filename_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gchar *filename = NULL; @@ -4420,12 +4420,12 @@ image_get_filename_invoker (ProcRecord *proc_record, filename = gimp_image_get_filename (image); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = filename; + return_vals[1].value.pdb_pointer = filename; - return return_args; + return return_vals; } static ProcArg image_get_filename_inargs[] = @@ -4506,7 +4506,7 @@ image_set_filename_invoker (ProcRecord *proc_record, gimp_image_set_filename (image, filename); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_set_filename_inargs[] = @@ -4549,7 +4549,7 @@ image_get_name_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gchar *name = NULL; @@ -4567,12 +4567,12 @@ image_get_name_invoker (ProcRecord *proc_record, name = g_strdup (_("Untitled")); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = name; + return_vals[1].value.pdb_pointer = name; - return return_args; + return return_vals; } static ProcArg image_get_name_inargs[] = @@ -4619,7 +4619,7 @@ image_get_resolution_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gdouble xresolution = 0.0; gdouble yresolution = 0.0; @@ -4633,15 +4633,15 @@ image_get_resolution_invoker (ProcRecord *proc_record, gimp_image_get_resolution (image, &xresolution, &yresolution); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_float = xresolution; - return_args[2].value.pdb_float = yresolution; + return_vals[1].value.pdb_float = xresolution; + return_vals[2].value.pdb_float = yresolution; } - return return_args; + return return_vals; } static ProcArg image_get_resolution_inargs[] = @@ -4722,7 +4722,7 @@ image_set_resolution_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_set_resolution_inargs[] = @@ -4770,7 +4770,7 @@ image_get_unit_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpUnit unit = 0; @@ -4783,12 +4783,12 @@ image_get_unit_invoker (ProcRecord *proc_record, unit = gimp_image_get_unit (image); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = unit; + return_vals[1].value.pdb_int = unit; - return return_args; + return return_vals; } static ProcArg image_get_unit_inargs[] = @@ -4851,7 +4851,7 @@ image_set_unit_invoker (ProcRecord *proc_record, gimp_image_set_unit (image, unit); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_set_unit_inargs[] = @@ -4894,7 +4894,7 @@ image_get_tattoo_state_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 tattoo_state = 0; @@ -4907,12 +4907,12 @@ image_get_tattoo_state_invoker (ProcRecord *proc_record, tattoo_state = gimp_image_get_tattoo_state (image); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = tattoo_state; + return_vals[1].value.pdb_int = tattoo_state; - return return_args; + return return_vals; } static ProcArg image_get_tattoo_state_inargs[] = @@ -4975,7 +4975,7 @@ image_set_tattoo_state_invoker (ProcRecord *proc_record, gimp_image_set_tattoo_state (image, tattoo_state); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_set_tattoo_state_inargs[] = @@ -5018,7 +5018,7 @@ image_get_layer_by_tattoo_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 tattoo; GimpLayer *layer = NULL; @@ -5036,12 +5036,12 @@ image_get_layer_by_tattoo_invoker (ProcRecord *proc_record, layer = gimp_image_get_layer_by_tattoo (image, tattoo); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; + return_vals[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; - return return_args; + return return_vals; } static ProcArg image_get_layer_by_tattoo_inargs[] = @@ -5093,7 +5093,7 @@ image_get_channel_by_tattoo_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 tattoo; GimpChannel *channel = NULL; @@ -5111,12 +5111,12 @@ image_get_channel_by_tattoo_invoker (ProcRecord *proc_record, channel = gimp_image_get_channel_by_tattoo (image, tattoo); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = channel ? gimp_item_get_ID (GIMP_ITEM (channel)) : -1; + return_vals[1].value.pdb_int = channel ? gimp_item_get_ID (GIMP_ITEM (channel)) : -1; - return return_args; + return return_vals; } static ProcArg image_get_channel_by_tattoo_inargs[] = @@ -5168,7 +5168,7 @@ image_get_vectors_by_tattoo_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 tattoo; GimpVectors *vectors = NULL; @@ -5186,12 +5186,12 @@ image_get_vectors_by_tattoo_invoker (ProcRecord *proc_record, vectors = gimp_image_get_vectors_by_tattoo (image, tattoo); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = vectors ? gimp_item_get_ID (GIMP_ITEM (vectors)) : -1; + return_vals[1].value.pdb_int = vectors ? gimp_item_get_ID (GIMP_ITEM (vectors)) : -1; - return return_args; + return return_vals; } static ProcArg image_get_vectors_by_tattoo_inargs[] = diff --git a/app/pdb/layer_cmds.c b/app/pdb/layer_cmds.c index 2624fe71ab..30c9caad01 100644 --- a/app/pdb/layer_cmds.c +++ b/app/pdb/layer_cmds.c @@ -104,7 +104,7 @@ layer_new_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 width; gint32 height; @@ -151,12 +151,12 @@ layer_new_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; + return_vals[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; - return return_args; + return return_vals; } static ProcArg layer_new_inargs[] = @@ -233,7 +233,7 @@ layer_new_from_drawable_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; GimpImage *dest_image; GimpLayer *layer_copy = NULL; @@ -267,12 +267,12 @@ layer_new_from_drawable_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = layer_copy ? gimp_item_get_ID (GIMP_ITEM (layer_copy)) : -1; + return_vals[1].value.pdb_int = layer_copy ? gimp_item_get_ID (GIMP_ITEM (layer_copy)) : -1; - return return_args; + return return_vals; } static ProcArg layer_new_from_drawable_inargs[] = @@ -324,7 +324,7 @@ layer_copy_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpLayer *layer; gboolean add_alpha; GimpLayer *layer_copy = NULL; @@ -344,12 +344,12 @@ layer_copy_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = layer_copy ? gimp_item_get_ID (GIMP_ITEM (layer_copy)) : -1; + return_vals[1].value.pdb_int = layer_copy ? gimp_item_get_ID (GIMP_ITEM (layer_copy)) : -1; - return return_args; + return return_vals; } static ProcArg layer_copy_inargs[] = @@ -412,7 +412,7 @@ layer_add_alpha_invoker (ProcRecord *proc_record, gimp_layer_add_alpha (layer); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg layer_add_alpha_inargs[] = @@ -479,7 +479,7 @@ layer_scale_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg layer_scale_inargs[] = @@ -563,7 +563,7 @@ layer_resize_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg layer_resize_inargs[] = @@ -635,7 +635,7 @@ layer_resize_to_image_size_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg layer_resize_to_image_size_inargs[] = @@ -700,7 +700,7 @@ layer_translate_invoker (ProcRecord *proc_record, gimp_image_undo_group_end (image); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg layer_translate_inargs[] = @@ -778,7 +778,7 @@ layer_set_offsets_invoker (ProcRecord *proc_record, gimp_image_undo_group_end (image); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg layer_set_offsets_inargs[] = @@ -826,7 +826,7 @@ layer_create_mask_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpLayer *layer; gint32 mask_type; GimpLayerMask *mask = NULL; @@ -847,12 +847,12 @@ layer_create_mask_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = mask ? gimp_item_get_ID (GIMP_ITEM (mask)) : -1; + return_vals[1].value.pdb_int = mask ? gimp_item_get_ID (GIMP_ITEM (mask)) : -1; - return return_args; + return return_vals; } static ProcArg layer_create_mask_inargs[] = @@ -904,7 +904,7 @@ layer_get_mask_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpLayer *layer; GimpLayerMask *mask = NULL; @@ -917,12 +917,12 @@ layer_get_mask_invoker (ProcRecord *proc_record, mask = gimp_layer_get_mask (layer); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = mask ? gimp_item_get_ID (GIMP_ITEM (mask)) : -1; + return_vals[1].value.pdb_int = mask ? gimp_item_get_ID (GIMP_ITEM (mask)) : -1; - return return_args; + return return_vals; } static ProcArg layer_get_mask_inargs[] = @@ -969,7 +969,7 @@ layer_from_mask_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpLayerMask *mask; GimpLayer *layer = NULL; @@ -982,12 +982,12 @@ layer_from_mask_invoker (ProcRecord *proc_record, layer = gimp_layer_mask_get_layer (mask); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; + return_vals[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; - return return_args; + return return_vals; } static ProcArg layer_from_mask_inargs[] = @@ -1053,7 +1053,7 @@ layer_add_mask_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg layer_add_mask_inargs[] = @@ -1115,7 +1115,7 @@ layer_remove_mask_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg layer_remove_mask_inargs[] = @@ -1158,7 +1158,7 @@ layer_is_floating_sel_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpLayer *layer; gboolean is_floating_sel = FALSE; @@ -1171,12 +1171,12 @@ layer_is_floating_sel_invoker (ProcRecord *proc_record, is_floating_sel = gimp_layer_is_floating_sel (layer); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = is_floating_sel; + return_vals[1].value.pdb_int = is_floating_sel; - return return_args; + return return_vals; } static ProcArg layer_is_floating_sel_inargs[] = @@ -1223,7 +1223,7 @@ layer_get_lock_alpha_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpLayer *layer; gboolean lock_alpha = FALSE; @@ -1236,12 +1236,12 @@ layer_get_lock_alpha_invoker (ProcRecord *proc_record, lock_alpha = gimp_layer_get_lock_alpha (layer); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = lock_alpha; + return_vals[1].value.pdb_int = lock_alpha; - return return_args; + return return_vals; } static ProcArg layer_get_lock_alpha_inargs[] = @@ -1302,7 +1302,7 @@ layer_set_lock_alpha_invoker (ProcRecord *proc_record, gimp_layer_set_lock_alpha (layer, lock_alpha, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg layer_set_lock_alpha_inargs[] = @@ -1345,7 +1345,7 @@ layer_get_apply_mask_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpLayer *layer; gboolean apply_mask = FALSE; @@ -1361,12 +1361,12 @@ layer_get_apply_mask_invoker (ProcRecord *proc_record, apply_mask = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = apply_mask; + return_vals[1].value.pdb_int = apply_mask; - return return_args; + return return_vals; } static ProcArg layer_get_apply_mask_inargs[] = @@ -1430,7 +1430,7 @@ layer_set_apply_mask_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg layer_set_apply_mask_inargs[] = @@ -1473,7 +1473,7 @@ layer_get_show_mask_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpLayer *layer; gboolean show_mask = FALSE; @@ -1489,12 +1489,12 @@ layer_get_show_mask_invoker (ProcRecord *proc_record, show_mask = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = show_mask; + return_vals[1].value.pdb_int = show_mask; - return return_args; + return return_vals; } static ProcArg layer_get_show_mask_inargs[] = @@ -1558,7 +1558,7 @@ layer_set_show_mask_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg layer_set_show_mask_inargs[] = @@ -1601,7 +1601,7 @@ layer_get_edit_mask_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpLayer *layer; gboolean edit_mask = FALSE; @@ -1617,12 +1617,12 @@ layer_get_edit_mask_invoker (ProcRecord *proc_record, edit_mask = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = edit_mask; + return_vals[1].value.pdb_int = edit_mask; - return return_args; + return return_vals; } static ProcArg layer_get_edit_mask_inargs[] = @@ -1686,7 +1686,7 @@ layer_set_edit_mask_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg layer_set_edit_mask_inargs[] = @@ -1729,7 +1729,7 @@ layer_get_opacity_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpLayer *layer; gdouble opacity = 0.0; @@ -1742,12 +1742,12 @@ layer_get_opacity_invoker (ProcRecord *proc_record, opacity = gimp_layer_get_opacity (layer) * 100.0; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = opacity; + return_vals[1].value.pdb_float = opacity; - return return_args; + return return_vals; } static ProcArg layer_get_opacity_inargs[] = @@ -1810,7 +1810,7 @@ layer_set_opacity_invoker (ProcRecord *proc_record, gimp_layer_set_opacity (layer, opacity / 100.0, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg layer_set_opacity_inargs[] = @@ -1853,7 +1853,7 @@ layer_get_mode_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpLayer *layer; gint32 mode = 0; @@ -1866,12 +1866,12 @@ layer_get_mode_invoker (ProcRecord *proc_record, mode = gimp_layer_get_mode (layer); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = mode; + return_vals[1].value.pdb_int = mode; - return return_args; + return return_vals; } static ProcArg layer_get_mode_inargs[] = @@ -1934,7 +1934,7 @@ layer_set_mode_invoker (ProcRecord *proc_record, gimp_layer_set_mode (layer, mode, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg layer_set_mode_inargs[] = diff --git a/app/pdb/message_cmds.c b/app/pdb/message_cmds.c index d99b735894..a5d55241c4 100644 --- a/app/pdb/message_cmds.c +++ b/app/pdb/message_cmds.c @@ -66,7 +66,7 @@ message_invoker (ProcRecord *proc_record, gimp_message (gimp, NULL, message); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg message_inargs[] = @@ -103,15 +103,15 @@ message_get_handler_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; gint32 handler = 0; handler = gimp->message_handler; - return_args = procedural_db_return_args (proc_record, TRUE); - return_args[1].value.pdb_int = handler; + return_vals = procedural_db_return_values (proc_record, TRUE); + return_vals[1].value.pdb_int = handler; - return return_args; + return return_vals; } static ProcArg message_get_handler_outargs[] = @@ -160,7 +160,7 @@ message_set_handler_invoker (ProcRecord *proc_record, gimp->message_handler = handler; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg message_set_handler_inargs[] = diff --git a/app/pdb/misc_cmds.c b/app/pdb/misc_cmds.c index 4be13a59b2..6ba00c980f 100644 --- a/app/pdb/misc_cmds.c +++ b/app/pdb/misc_cmds.c @@ -61,15 +61,15 @@ version_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; gchar *version = NULL; version = g_strdup (GIMP_VERSION); - return_args = procedural_db_return_args (proc_record, TRUE); - return_args[1].value.pdb_pointer = version; + return_vals = procedural_db_return_values (proc_record, TRUE); + return_vals[1].value.pdb_pointer = version; - return return_args; + return return_vals; } static ProcArg version_outargs[] = @@ -106,15 +106,15 @@ getpid_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; gint32 pid = 0; pid = getpid (); - return_args = procedural_db_return_args (proc_record, TRUE); - return_args[1].value.pdb_int = pid; + return_vals = procedural_db_return_values (proc_record, TRUE); + return_vals[1].value.pdb_int = pid; - return return_args; + return return_vals; } static ProcArg getpid_outargs[] = @@ -157,7 +157,7 @@ quit_invoker (ProcRecord *proc_record, gimp_exit (gimp, force); - return procedural_db_return_args (proc_record, TRUE); + return procedural_db_return_values (proc_record, TRUE); } static ProcArg quit_inargs[] = diff --git a/app/pdb/paint_tools_cmds.c b/app/pdb/paint_tools_cmds.c index 6ac7749426..df65b23797 100644 --- a/app/pdb/paint_tools_cmds.c +++ b/app/pdb/paint_tools_cmds.c @@ -165,7 +165,7 @@ airbrush_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg airbrush_inargs[] = @@ -248,7 +248,7 @@ airbrush_default_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg airbrush_default_inargs[] = @@ -357,7 +357,7 @@ clone_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg clone_inargs[] = @@ -455,7 +455,7 @@ clone_default_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg clone_default_inargs[] = @@ -548,7 +548,7 @@ convolve_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg convolve_inargs[] = @@ -636,7 +636,7 @@ convolve_default_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg convolve_default_inargs[] = @@ -735,7 +735,7 @@ dodgeburn_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg dodgeburn_inargs[] = @@ -828,7 +828,7 @@ dodgeburn_default_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg dodgeburn_default_inargs[] = @@ -921,7 +921,7 @@ eraser_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg eraser_inargs[] = @@ -1009,7 +1009,7 @@ eraser_default_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg eraser_default_inargs[] = @@ -1110,7 +1110,7 @@ paintbrush_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg paintbrush_inargs[] = @@ -1203,7 +1203,7 @@ paintbrush_default_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg paintbrush_default_inargs[] = @@ -1281,7 +1281,7 @@ pencil_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg pencil_inargs[] = @@ -1368,7 +1368,7 @@ smudge_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg smudge_inargs[] = @@ -1451,7 +1451,7 @@ smudge_default_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg smudge_default_inargs[] = diff --git a/app/pdb/palette_cmds.c b/app/pdb/palette_cmds.c index d57372f564..5cc0545421 100644 --- a/app/pdb/palette_cmds.c +++ b/app/pdb/palette_cmds.c @@ -77,7 +77,7 @@ palette_new_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gchar *actual_name = NULL; @@ -100,12 +100,12 @@ palette_new_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = actual_name; + return_vals[1].value.pdb_pointer = actual_name; - return return_args; + return return_vals; } static ProcArg palette_new_inargs[] = @@ -152,7 +152,7 @@ palette_duplicate_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gchar *copy_name = NULL; @@ -180,12 +180,12 @@ palette_duplicate_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = copy_name; + return_vals[1].value.pdb_pointer = copy_name; - return return_args; + return return_vals; } static ProcArg palette_duplicate_inargs[] = @@ -232,7 +232,7 @@ palette_rename_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gchar *new_name; gchar *actual_name = NULL; @@ -259,12 +259,12 @@ palette_rename_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = actual_name; + return_vals[1].value.pdb_pointer = actual_name; - return return_args; + return return_vals; } static ProcArg palette_rename_inargs[] = @@ -345,7 +345,7 @@ palette_delete_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg palette_delete_inargs[] = @@ -383,7 +383,7 @@ palette_is_editable_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gboolean editable = FALSE; @@ -402,12 +402,12 @@ palette_is_editable_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = editable; + return_vals[1].value.pdb_int = editable; - return return_args; + return return_vals; } static ProcArg palette_is_editable_inargs[] = @@ -454,7 +454,7 @@ palette_get_info_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 num_colors = 0; @@ -473,12 +473,12 @@ palette_get_info_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = num_colors; + return_vals[1].value.pdb_int = num_colors; - return return_args; + return return_vals; } static ProcArg palette_get_info_inargs[] = @@ -525,7 +525,7 @@ palette_get_columns_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 num_columns = 0; @@ -544,12 +544,12 @@ palette_get_columns_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = num_columns; + return_vals[1].value.pdb_int = num_columns; - return return_args; + return return_vals; } static ProcArg palette_get_columns_inargs[] = @@ -618,7 +618,7 @@ palette_set_columns_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg palette_set_columns_inargs[] = @@ -661,7 +661,7 @@ palette_add_entry_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gchar *entry_name; GimpRGB color; @@ -693,12 +693,12 @@ palette_add_entry_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = entry_num; + return_vals[1].value.pdb_int = entry_num; - return return_args; + return return_vals; } static ProcArg palette_add_entry_inargs[] = @@ -784,7 +784,7 @@ palette_delete_entry_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg palette_delete_entry_inargs[] = @@ -827,7 +827,7 @@ palette_entry_get_color_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 entry_num; GimpRGB color = { 0.0, 0.0, 0.0, 1.0 }; @@ -858,12 +858,12 @@ palette_entry_get_color_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_color = color; + return_vals[1].value.pdb_color = color; - return return_args; + return return_vals; } static ProcArg palette_entry_get_color_inargs[] = @@ -949,7 +949,7 @@ palette_entry_set_color_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg palette_entry_set_color_inargs[] = @@ -997,7 +997,7 @@ palette_entry_get_name_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 entry_num; gchar *entry_name = NULL; @@ -1028,12 +1028,12 @@ palette_entry_get_name_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = entry_name; + return_vals[1].value.pdb_pointer = entry_name; - return return_args; + return return_vals; } static ProcArg palette_entry_get_name_inargs[] = @@ -1122,7 +1122,7 @@ palette_entry_set_name_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg palette_entry_set_name_inargs[] = diff --git a/app/pdb/palette_select_cmds.c b/app/pdb/palette_select_cmds.c index ea3506e1a2..3d6869fa9c 100644 --- a/app/pdb/palette_select_cmds.c +++ b/app/pdb/palette_select_cmds.c @@ -75,7 +75,7 @@ palettes_popup_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg palettes_popup_inargs[] = @@ -138,7 +138,7 @@ palettes_close_popup_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg palettes_close_popup_inargs[] = @@ -197,7 +197,7 @@ palettes_set_popup_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg palettes_set_popup_inargs[] = diff --git a/app/pdb/palettes_cmds.c b/app/pdb/palettes_cmds.c index b2b2bd64a2..021ab08df0 100644 --- a/app/pdb/palettes_cmds.c +++ b/app/pdb/palettes_cmds.c @@ -58,7 +58,7 @@ palettes_refresh_invoker (ProcRecord *proc_record, Argument *args) { gimp_data_factory_data_refresh (gimp->palette_factory); - return procedural_db_return_args (proc_record, TRUE); + return procedural_db_return_values (proc_record, TRUE); } static ProcRecord palettes_refresh_proc = @@ -87,7 +87,7 @@ palettes_get_list_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *filter; gint32 num_palettes = 0; gchar **palette_list = NULL; @@ -102,15 +102,15 @@ palettes_get_list_invoker (ProcRecord *proc_record, filter, &num_palettes); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_palettes; - return_args[2].value.pdb_pointer = palette_list; + return_vals[1].value.pdb_int = num_palettes; + return_vals[2].value.pdb_pointer = palette_list; } - return return_args; + return return_vals; } static ProcArg palettes_get_list_inargs[] = @@ -162,7 +162,7 @@ palettes_get_palette_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name = NULL; gint32 num_colors = 0; @@ -176,15 +176,15 @@ palettes_get_palette_invoker (ProcRecord *proc_record, else success = FALSE; - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_pointer = name; - return_args[2].value.pdb_int = num_colors; + return_vals[1].value.pdb_pointer = name; + return_vals[2].value.pdb_int = num_colors; } - return return_args; + return return_vals; } static ProcArg palettes_get_palette_outargs[] = @@ -227,7 +227,7 @@ palettes_get_palette_entry_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 entry_num; gchar *actual_name = NULL; @@ -272,16 +272,16 @@ palettes_get_palette_entry_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_pointer = actual_name; - return_args[2].value.pdb_int = num_colors; - return_args[3].value.pdb_color = color; + return_vals[1].value.pdb_pointer = actual_name; + return_vals[2].value.pdb_int = num_colors; + return_vals[3].value.pdb_color = color; } - return return_args; + return return_vals; } static ProcArg palettes_get_palette_entry_inargs[] = diff --git a/app/pdb/parasite_cmds.c b/app/pdb/parasite_cmds.c index 78e446ff89..9cc1657113 100644 --- a/app/pdb/parasite_cmds.c +++ b/app/pdb/parasite_cmds.c @@ -79,7 +79,7 @@ parasite_find_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; GimpParasite *parasite = NULL; @@ -95,12 +95,12 @@ parasite_find_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = parasite; + return_vals[1].value.pdb_pointer = parasite; - return return_args; + return return_vals; } static ProcArg parasite_find_inargs[] = @@ -158,7 +158,7 @@ parasite_attach_invoker (ProcRecord *proc_record, gimp_parasite_attach (gimp, parasite); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg parasite_attach_inargs[] = @@ -207,7 +207,7 @@ parasite_detach_invoker (ProcRecord *proc_record, gimp_parasite_detach (gimp, name); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg parasite_detach_inargs[] = @@ -244,18 +244,18 @@ parasite_list_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; gint32 num_parasites = 0; gchar **parasites = NULL; parasites = gimp_parasite_list (gimp, &num_parasites); - return_args = procedural_db_return_args (proc_record, TRUE); + return_vals = procedural_db_return_values (proc_record, TRUE); - return_args[1].value.pdb_int = num_parasites; - return_args[2].value.pdb_pointer = parasites; + return_vals[1].value.pdb_int = num_parasites; + return_vals[2].value.pdb_pointer = parasites; - return return_args; + return return_vals; } static ProcArg parasite_list_outargs[] = @@ -298,7 +298,7 @@ image_parasite_find_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gchar *name; GimpParasite *parasite = NULL; @@ -319,12 +319,12 @@ image_parasite_find_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = parasite; + return_vals[1].value.pdb_pointer = parasite; - return return_args; + return return_vals; } static ProcArg image_parasite_find_inargs[] = @@ -392,7 +392,7 @@ image_parasite_attach_invoker (ProcRecord *proc_record, gimp_image_parasite_attach (image, parasite); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_parasite_attach_inargs[] = @@ -451,7 +451,7 @@ image_parasite_detach_invoker (ProcRecord *proc_record, gimp_image_parasite_detach (image, name); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_parasite_detach_inargs[] = @@ -494,7 +494,7 @@ image_parasite_list_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 num_parasites = 0; gchar **parasites = NULL; @@ -508,15 +508,15 @@ image_parasite_list_invoker (ProcRecord *proc_record, parasites = gimp_image_parasite_list (image, &num_parasites); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_parasites; - return_args[2].value.pdb_pointer = parasites; + return_vals[1].value.pdb_int = num_parasites; + return_vals[2].value.pdb_pointer = parasites; } - return return_args; + return return_vals; } static ProcArg image_parasite_list_inargs[] = @@ -568,7 +568,7 @@ drawable_parasite_find_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gchar *name; GimpParasite *parasite = NULL; @@ -590,12 +590,12 @@ drawable_parasite_find_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = parasite; + return_vals[1].value.pdb_pointer = parasite; - return return_args; + return return_vals; } static ProcArg drawable_parasite_find_inargs[] = @@ -663,7 +663,7 @@ drawable_parasite_attach_invoker (ProcRecord *proc_record, gimp_item_parasite_attach (GIMP_ITEM (drawable), parasite); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg drawable_parasite_attach_inargs[] = @@ -722,7 +722,7 @@ drawable_parasite_detach_invoker (ProcRecord *proc_record, gimp_item_parasite_detach (GIMP_ITEM (drawable), name); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg drawable_parasite_detach_inargs[] = @@ -765,7 +765,7 @@ drawable_parasite_list_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 num_parasites = 0; gchar **parasites = NULL; @@ -779,15 +779,15 @@ drawable_parasite_list_invoker (ProcRecord *proc_record, parasites = gimp_item_parasite_list (GIMP_ITEM (drawable), &num_parasites); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_parasites; - return_args[2].value.pdb_pointer = parasites; + return_vals[1].value.pdb_int = num_parasites; + return_vals[2].value.pdb_pointer = parasites; } - return return_args; + return return_vals; } static ProcArg drawable_parasite_list_inargs[] = @@ -839,7 +839,7 @@ vectors_parasite_find_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpVectors *vectors; gchar *name; GimpParasite *parasite = NULL; @@ -861,12 +861,12 @@ vectors_parasite_find_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = parasite; + return_vals[1].value.pdb_pointer = parasite; - return return_args; + return return_vals; } static ProcArg vectors_parasite_find_inargs[] = @@ -934,7 +934,7 @@ vectors_parasite_attach_invoker (ProcRecord *proc_record, gimp_item_parasite_attach (GIMP_ITEM (vectors), parasite); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg vectors_parasite_attach_inargs[] = @@ -993,7 +993,7 @@ vectors_parasite_detach_invoker (ProcRecord *proc_record, gimp_item_parasite_detach (GIMP_ITEM (vectors), name); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg vectors_parasite_detach_inargs[] = @@ -1036,7 +1036,7 @@ vectors_parasite_list_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpVectors *vectors; gint32 num_parasites = 0; gchar **parasites = NULL; @@ -1050,15 +1050,15 @@ vectors_parasite_list_invoker (ProcRecord *proc_record, parasites = gimp_item_parasite_list (GIMP_ITEM (vectors), &num_parasites); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_parasites; - return_args[2].value.pdb_pointer = parasites; + return_vals[1].value.pdb_int = num_parasites; + return_vals[2].value.pdb_pointer = parasites; } - return return_args; + return return_vals; } static ProcArg vectors_parasite_list_inargs[] = diff --git a/app/pdb/paths_cmds.c b/app/pdb/paths_cmds.c index 9021eb4126..74a4ca8306 100644 --- a/app/pdb/paths_cmds.c +++ b/app/pdb/paths_cmds.c @@ -85,7 +85,7 @@ path_list_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 num_paths = 0; gchar **path_list = NULL; @@ -99,15 +99,15 @@ path_list_invoker (ProcRecord *proc_record, path_list = gimp_container_get_name_array (image->vectors, &num_paths); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_paths; - return_args[2].value.pdb_pointer = path_list; + return_vals[1].value.pdb_int = num_paths; + return_vals[2].value.pdb_pointer = path_list; } - return return_args; + return return_vals; } static ProcArg path_list_inargs[] = @@ -159,7 +159,7 @@ path_get_current_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gchar *name = NULL; @@ -177,12 +177,12 @@ path_get_current_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = name; + return_vals[1].value.pdb_pointer = name; - return return_args; + return return_vals; } static ProcArg path_get_current_inargs[] = @@ -250,7 +250,7 @@ path_set_current_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg path_set_current_inargs[] = @@ -314,7 +314,7 @@ path_delete_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg path_delete_inargs[] = @@ -357,7 +357,7 @@ path_get_points_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gchar *name; gint32 path_type = 0; @@ -414,17 +414,17 @@ path_get_points_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = path_type; - return_args[2].value.pdb_int = path_closed; - return_args[3].value.pdb_int = num_path_point_details; - return_args[4].value.pdb_pointer = points_pairs; + return_vals[1].value.pdb_int = path_type; + return_vals[2].value.pdb_int = path_closed; + return_vals[3].value.pdb_int = num_path_point_details; + return_vals[4].value.pdb_pointer = points_pairs; } - return return_args; + return return_vals; } static ProcArg path_get_points_inargs[] = @@ -555,7 +555,7 @@ path_set_points_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg path_set_points_inargs[] = @@ -639,7 +639,7 @@ path_stroke_current_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg path_stroke_current_inargs[] = @@ -677,7 +677,7 @@ path_get_point_at_dist_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gdouble distance; gint32 x_point = 0; @@ -743,16 +743,16 @@ path_get_point_at_dist_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = x_point; - return_args[2].value.pdb_int = y_point; - return_args[3].value.pdb_float = slope; + return_vals[1].value.pdb_int = x_point; + return_vals[2].value.pdb_int = y_point; + return_vals[3].value.pdb_float = slope; } - return return_args; + return return_vals; } static ProcArg path_get_point_at_dist_inargs[] = @@ -814,7 +814,7 @@ path_get_tattoo_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gchar *name; gint32 tattoo = 0; @@ -837,12 +837,12 @@ path_get_tattoo_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = tattoo; + return_vals[1].value.pdb_int = tattoo; - return return_args; + return return_vals; } static ProcArg path_get_tattoo_inargs[] = @@ -918,7 +918,7 @@ path_set_tattoo_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg path_set_tattoo_inargs[] = @@ -966,7 +966,7 @@ get_path_by_tattoo_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 tattoo; gchar *name = NULL; @@ -987,12 +987,12 @@ get_path_by_tattoo_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = name; + return_vals[1].value.pdb_pointer = name; - return return_args; + return return_vals; } static ProcArg get_path_by_tattoo_inargs[] = @@ -1044,7 +1044,7 @@ path_get_locked_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gchar *name; gboolean locked = FALSE; @@ -1067,12 +1067,12 @@ path_get_locked_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = locked; + return_vals[1].value.pdb_int = locked; - return return_args; + return return_vals; } static ProcArg path_get_locked_inargs[] = @@ -1148,7 +1148,7 @@ path_set_locked_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg path_set_locked_inargs[] = @@ -1241,7 +1241,7 @@ path_to_selection_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg path_to_selection_inargs[] = @@ -1331,7 +1331,7 @@ path_import_invoker (ProcRecord *proc_record, success = gimp_vectors_import_file (image, filename, merge, scale, -1, NULL); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg path_import_inargs[] = @@ -1410,7 +1410,7 @@ path_import_string_invoker (ProcRecord *proc_record, merge, scale, -1, NULL); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg path_import_string_inargs[] = diff --git a/app/pdb/pattern_cmds.c b/app/pdb/pattern_cmds.c index 2b76ae56c9..a6c09fdc5a 100644 --- a/app/pdb/pattern_cmds.c +++ b/app/pdb/pattern_cmds.c @@ -52,7 +52,7 @@ pattern_get_info_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 width = 0; gint32 height = 0; @@ -77,16 +77,16 @@ pattern_get_info_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = width; - return_args[2].value.pdb_int = height; - return_args[3].value.pdb_int = bpp; + return_vals[1].value.pdb_int = width; + return_vals[2].value.pdb_int = height; + return_vals[3].value.pdb_int = bpp; } - return return_args; + return return_vals; } static ProcArg pattern_get_info_inargs[] = @@ -143,7 +143,7 @@ pattern_get_pixels_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gint32 width = 0; gint32 height = 0; @@ -174,18 +174,18 @@ pattern_get_pixels_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = width; - return_args[2].value.pdb_int = height; - return_args[3].value.pdb_int = bpp; - return_args[4].value.pdb_int = num_color_bytes; - return_args[5].value.pdb_pointer = color_bytes; + return_vals[1].value.pdb_int = width; + return_vals[2].value.pdb_int = height; + return_vals[3].value.pdb_int = bpp; + return_vals[4].value.pdb_int = num_color_bytes; + return_vals[5].value.pdb_pointer = color_bytes; } - return return_args; + return return_vals; } static ProcArg pattern_get_pixels_inargs[] = diff --git a/app/pdb/pattern_select_cmds.c b/app/pdb/pattern_select_cmds.c index 9d60dc8b38..328a67e10e 100644 --- a/app/pdb/pattern_select_cmds.c +++ b/app/pdb/pattern_select_cmds.c @@ -75,7 +75,7 @@ patterns_popup_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg patterns_popup_inargs[] = @@ -138,7 +138,7 @@ patterns_close_popup_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg patterns_close_popup_inargs[] = @@ -197,7 +197,7 @@ patterns_set_popup_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg patterns_set_popup_inargs[] = diff --git a/app/pdb/patterns_cmds.c b/app/pdb/patterns_cmds.c index d054f747b7..33fbd22ff4 100644 --- a/app/pdb/patterns_cmds.c +++ b/app/pdb/patterns_cmds.c @@ -57,7 +57,7 @@ patterns_refresh_invoker (ProcRecord *proc_record, Argument *args) { gimp_data_factory_data_refresh (gimp->pattern_factory); - return procedural_db_return_args (proc_record, TRUE); + return procedural_db_return_values (proc_record, TRUE); } static ProcRecord patterns_refresh_proc = @@ -86,7 +86,7 @@ patterns_get_list_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *filter; gint32 num_patterns = 0; gchar **pattern_list = NULL; @@ -101,15 +101,15 @@ patterns_get_list_invoker (ProcRecord *proc_record, filter, &num_patterns); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_patterns; - return_args[2].value.pdb_pointer = pattern_list; + return_vals[1].value.pdb_int = num_patterns; + return_vals[2].value.pdb_pointer = pattern_list; } - return return_args; + return return_vals; } static ProcArg patterns_get_list_inargs[] = @@ -161,7 +161,7 @@ patterns_get_pattern_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name = NULL; gint32 width = 0; gint32 height = 0; @@ -177,16 +177,16 @@ patterns_get_pattern_invoker (ProcRecord *proc_record, else success = FALSE; - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_pointer = name; - return_args[2].value.pdb_int = width; - return_args[3].value.pdb_int = height; + return_vals[1].value.pdb_pointer = name; + return_vals[2].value.pdb_int = width; + return_vals[3].value.pdb_int = height; } - return return_args; + return return_vals; } static ProcArg patterns_get_pattern_outargs[] = @@ -234,7 +234,7 @@ patterns_get_pattern_data_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gchar *actual_name = NULL; gint32 width = 0; @@ -276,19 +276,19 @@ patterns_get_pattern_data_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_pointer = actual_name; - return_args[2].value.pdb_int = width; - return_args[3].value.pdb_int = height; - return_args[4].value.pdb_int = mask_bpp; - return_args[5].value.pdb_int = length; - return_args[6].value.pdb_pointer = mask_data; + return_vals[1].value.pdb_pointer = actual_name; + return_vals[2].value.pdb_int = width; + return_vals[3].value.pdb_int = height; + return_vals[4].value.pdb_int = mask_bpp; + return_vals[5].value.pdb_int = length; + return_vals[6].value.pdb_pointer = mask_data; } - return return_args; + return return_vals; } static ProcArg patterns_get_pattern_data_inargs[] = diff --git a/app/pdb/plug_in_cmds.c b/app/pdb/plug_in_cmds.c index 06ee6c87e9..57b1c67ea9 100644 --- a/app/pdb/plug_in_cmds.c +++ b/app/pdb/plug_in_cmds.c @@ -64,7 +64,7 @@ plugins_query_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; gchar *search_string; gint32 num_plugins = 0; gchar **menu_path = NULL; @@ -84,22 +84,22 @@ plugins_query_invoker (ProcRecord *proc_record, &plugin_real_name, &plugin_install_time); - return_args = procedural_db_return_args (proc_record, TRUE); + return_vals = procedural_db_return_values (proc_record, TRUE); - return_args[1].value.pdb_int = num_plugins; - return_args[2].value.pdb_pointer = menu_path; - return_args[3].value.pdb_int = num_plugins; - return_args[4].value.pdb_pointer = plugin_accelerator; - return_args[5].value.pdb_int = num_plugins; - return_args[6].value.pdb_pointer = plugin_location; - return_args[7].value.pdb_int = num_plugins; - return_args[8].value.pdb_pointer = plugin_image_type; - return_args[9].value.pdb_int = num_plugins; - return_args[10].value.pdb_pointer = plugin_install_time; - return_args[11].value.pdb_int = num_plugins; - return_args[12].value.pdb_pointer = plugin_real_name; + return_vals[1].value.pdb_int = num_plugins; + return_vals[2].value.pdb_pointer = menu_path; + return_vals[3].value.pdb_int = num_plugins; + return_vals[4].value.pdb_pointer = plugin_accelerator; + return_vals[5].value.pdb_int = num_plugins; + return_vals[6].value.pdb_pointer = plugin_location; + return_vals[7].value.pdb_int = num_plugins; + return_vals[8].value.pdb_pointer = plugin_image_type; + return_vals[9].value.pdb_int = num_plugins; + return_vals[10].value.pdb_pointer = plugin_install_time; + return_vals[11].value.pdb_int = num_plugins; + return_vals[12].value.pdb_pointer = plugin_real_name; - return return_args; + return return_vals; } static ProcArg plugins_query_inargs[] = @@ -223,7 +223,7 @@ plugin_domain_register_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg plugin_domain_register_inargs[] = @@ -290,7 +290,7 @@ plugin_help_register_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg plugin_help_register_inargs[] = @@ -360,7 +360,7 @@ plugin_menu_register_invoker (ProcRecord *proc_record, } } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg plugin_menu_register_inargs[] = @@ -433,7 +433,7 @@ plugin_menu_branch_register_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg plugin_menu_branch_register_inargs[] = @@ -519,7 +519,7 @@ plugin_icon_register_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg plugin_icon_register_inargs[] = diff --git a/app/pdb/procedural_db.c b/app/pdb/procedural_db.c index 9c38dc27a2..a2ad52a20f 100644 --- a/app/pdb/procedural_db.c +++ b/app/pdb/procedural_db.c @@ -386,11 +386,7 @@ procedural_db_run_proc (Gimp *gimp, return return_vals; } - /* allocate the parameter array */ - params = g_new0 (Argument, proc->num_args); - - for (i = 0; i < proc->num_args; i++) - params[i].arg_type = proc->args[i].arg_type; + params = procedural_db_arguments (proc); va_start (args, nreturn_vals); @@ -482,28 +478,44 @@ procedural_db_run_proc (Gimp *gimp, } Argument * -procedural_db_return_args (ProcRecord *procedure, - gboolean success) +procedural_db_arguments (ProcRecord *procedure) { - Argument *return_args; + Argument *args; gint i; g_return_val_if_fail (procedure != NULL, NULL); - return_args = g_new0 (Argument, procedure->num_values + 1); + args = g_new0 (Argument, procedure->num_args); - return_args[0].arg_type = GIMP_PDB_STATUS; + for (i = 0; i < procedure->num_args; i++) + args[i].arg_type = procedure->values[i].arg_type; + + return args; +} + +Argument * +procedural_db_return_values (ProcRecord *procedure, + gboolean success) +{ + Argument *args; + gint i; + + g_return_val_if_fail (procedure != NULL, NULL); + + args = g_new0 (Argument, procedure->num_values + 1); + + args[0].arg_type = GIMP_PDB_STATUS; if (success) - return_args[0].value.pdb_int = GIMP_PDB_SUCCESS; + args[0].value.pdb_int = GIMP_PDB_SUCCESS; else - return_args[0].value.pdb_int = GIMP_PDB_EXECUTION_ERROR; + args[0].value.pdb_int = GIMP_PDB_EXECUTION_ERROR; /* Set the arg types for the return values */ for (i = 0; i < procedure->num_values; i++) - return_args[i + 1].arg_type = procedure->values[i].arg_type; + args[i + 1].arg_type = procedure->values[i].arg_type; - return return_args; + return args; } void diff --git a/app/pdb/procedural_db.h b/app/pdb/procedural_db.h index f51ef1374e..a323b93e54 100644 --- a/app/pdb/procedural_db.h +++ b/app/pdb/procedural_db.h @@ -143,7 +143,8 @@ Argument * procedural_db_run_proc (Gimp *gimp, gint *nreturn_vals, ...); -Argument * procedural_db_return_args (ProcRecord *procedure, +Argument * procedural_db_arguments (ProcRecord *procedure); +Argument * procedural_db_return_values (ProcRecord *procedure, gboolean success); void procedural_db_destroy_args (Argument *args, gint nargs); diff --git a/app/pdb/procedural_db_cmds.c b/app/pdb/procedural_db_cmds.c index 0a215eb7b0..09666bc89f 100644 --- a/app/pdb/procedural_db_cmds.c +++ b/app/pdb/procedural_db_cmds.c @@ -63,17 +63,17 @@ procedural_db_temp_name_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; gchar *temp_name = NULL; static gint proc_number = 0; temp_name = g_strdup_printf ("temp-procedure-number-%d", proc_number++); - return_args = procedural_db_return_args (proc_record, TRUE); - return_args[1].value.pdb_pointer = temp_name; + return_vals = procedural_db_return_values (proc_record, TRUE); + return_vals[1].value.pdb_pointer = temp_name; - return return_args; + return return_vals; } static ProcArg procedural_db_temp_name_outargs[] = @@ -122,7 +122,7 @@ procedural_db_dump_invoker (ProcRecord *proc_record, success = procedural_db_dump (gimp, filename); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg procedural_db_dump_inargs[] = @@ -160,7 +160,7 @@ procedural_db_query_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *name; gchar *blurb; gchar *help; @@ -207,15 +207,15 @@ procedural_db_query_invoker (ProcRecord *proc_record, &num_matches, &procedure_names); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_matches; - return_args[2].value.pdb_pointer = procedure_names; + return_vals[1].value.pdb_int = num_matches; + return_vals[2].value.pdb_pointer = procedure_names; } - return return_args; + return return_vals; } static ProcArg procedural_db_query_inargs[] = @@ -297,7 +297,7 @@ procedural_db_proc_info_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *procedure; gchar *blurb = NULL; gchar *help = NULL; @@ -328,21 +328,21 @@ procedural_db_proc_info_invoker (ProcRecord *proc_record, g_free (canonical); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_pointer = blurb; - return_args[2].value.pdb_pointer = help; - return_args[3].value.pdb_pointer = author; - return_args[4].value.pdb_pointer = copyright; - return_args[5].value.pdb_pointer = date; - return_args[6].value.pdb_int = proc_type; - return_args[7].value.pdb_int = num_args; - return_args[8].value.pdb_int = num_values; + return_vals[1].value.pdb_pointer = blurb; + return_vals[2].value.pdb_pointer = help; + return_vals[3].value.pdb_pointer = author; + return_vals[4].value.pdb_pointer = copyright; + return_vals[5].value.pdb_pointer = date; + return_vals[6].value.pdb_int = proc_type; + return_vals[7].value.pdb_int = num_args; + return_vals[8].value.pdb_int = num_values; } - return return_args; + return return_vals; } static ProcArg procedural_db_proc_info_inargs[] = @@ -424,7 +424,7 @@ procedural_db_proc_arg_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *procedure; gint32 arg_num; gint32 arg_type = 0; @@ -470,16 +470,16 @@ procedural_db_proc_arg_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = arg_type; - return_args[2].value.pdb_pointer = arg_name; - return_args[3].value.pdb_pointer = arg_desc; + return_vals[1].value.pdb_int = arg_type; + return_vals[2].value.pdb_pointer = arg_name; + return_vals[3].value.pdb_pointer = arg_desc; } - return return_args; + return return_vals; } static ProcArg procedural_db_proc_arg_inargs[] = @@ -541,7 +541,7 @@ procedural_db_proc_val_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *procedure; gint32 val_num; gint32 val_type = 0; @@ -587,16 +587,16 @@ procedural_db_proc_val_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = val_type; - return_args[2].value.pdb_pointer = val_name; - return_args[3].value.pdb_pointer = val_desc; + return_vals[1].value.pdb_int = val_type; + return_vals[2].value.pdb_pointer = val_name; + return_vals[3].value.pdb_pointer = val_desc; } - return return_args; + return return_vals; } static ProcArg procedural_db_proc_val_inargs[] = @@ -658,7 +658,7 @@ procedural_db_get_data_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *identifier; gint32 bytes = 0; guint8 *data = NULL; @@ -684,15 +684,15 @@ procedural_db_get_data_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = bytes; - return_args[2].value.pdb_pointer = data; + return_vals[1].value.pdb_int = bytes; + return_vals[2].value.pdb_pointer = data; } - return return_args; + return return_vals; } static ProcArg procedural_db_get_data_inargs[] = @@ -744,7 +744,7 @@ procedural_db_get_data_size_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *identifier; gint32 bytes = 0; @@ -768,12 +768,12 @@ procedural_db_get_data_size_invoker (ProcRecord *proc_record, } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = bytes; + return_vals[1].value.pdb_int = bytes; - return return_args; + return return_vals; } static ProcArg procedural_db_get_data_size_inargs[] = @@ -845,7 +845,7 @@ procedural_db_set_data_invoker (ProcRecord *proc_record, g_free (canonical); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg procedural_db_set_data_inargs[] = diff --git a/app/pdb/progress_cmds.c b/app/pdb/progress_cmds.c index 5969ecd6d7..c8f6fb6bf3 100644 --- a/app/pdb/progress_cmds.c +++ b/app/pdb/progress_cmds.c @@ -80,7 +80,7 @@ progress_init_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg progress_init_inargs[] = @@ -135,7 +135,7 @@ progress_update_invoker (ProcRecord *proc_record, else success = FALSE; - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg progress_update_inargs[] = @@ -180,7 +180,7 @@ progress_pulse_invoker (ProcRecord *proc_record, } else success = FALSE; - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcRecord progress_pulse_proc = @@ -226,7 +226,7 @@ progress_set_text_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg progress_set_text_inargs[] = @@ -264,7 +264,7 @@ progress_get_window_handle_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gint32 window = 0; if (gimp->current_plug_in && gimp->current_plug_in->open) @@ -275,12 +275,12 @@ progress_get_window_handle_invoker (ProcRecord *proc_record, else success = FALSE; - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = window; + return_vals[1].value.pdb_int = window; - return return_args; + return return_vals; } static ProcArg progress_get_window_handle_outargs[] = @@ -333,7 +333,7 @@ progress_install_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg progress_install_inargs[] = @@ -386,7 +386,7 @@ progress_uninstall_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg progress_uninstall_inargs[] = @@ -439,7 +439,7 @@ progress_cancel_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg progress_cancel_inargs[] = diff --git a/app/pdb/selection_cmds.c b/app/pdb/selection_cmds.c index 5da07b71b2..c3db5252ac 100644 --- a/app/pdb/selection_cmds.c +++ b/app/pdb/selection_cmds.c @@ -83,7 +83,7 @@ selection_bounds_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gboolean non_empty = FALSE; gint32 x1 = 0; @@ -101,18 +101,18 @@ selection_bounds_invoker (ProcRecord *proc_record, &x1, &y1, &x2, &y2); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = non_empty; - return_args[2].value.pdb_int = x1; - return_args[3].value.pdb_int = y1; - return_args[4].value.pdb_int = x2; - return_args[5].value.pdb_int = y2; + return_vals[1].value.pdb_int = non_empty; + return_vals[2].value.pdb_int = x1; + return_vals[3].value.pdb_int = y1; + return_vals[4].value.pdb_int = x2; + return_vals[5].value.pdb_int = y2; } - return return_args; + return return_vals; } static ProcArg selection_bounds_inargs[] = @@ -179,7 +179,7 @@ selection_value_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gint32 x; gint32 y; @@ -198,12 +198,12 @@ selection_value_invoker (ProcRecord *proc_record, value = gimp_pickable_get_opacity_at (GIMP_PICKABLE (gimp_image_get_mask (image)), x, y); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = value; + return_vals[1].value.pdb_int = value; - return return_args; + return return_vals; } static ProcArg selection_value_inargs[] = @@ -260,7 +260,7 @@ selection_is_empty_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gboolean is_empty = FALSE; @@ -273,12 +273,12 @@ selection_is_empty_invoker (ProcRecord *proc_record, is_empty = gimp_channel_is_empty (gimp_image_get_mask (image)); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = is_empty; + return_vals[1].value.pdb_int = is_empty; - return return_args; + return return_vals; } static ProcArg selection_is_empty_inargs[] = @@ -343,7 +343,7 @@ selection_translate_invoker (ProcRecord *proc_record, offx, offy, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg selection_translate_inargs[] = @@ -391,7 +391,7 @@ selection_float_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 offx; gint32 offy; @@ -420,12 +420,12 @@ selection_float_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; + return_vals[1].value.pdb_int = layer ? gimp_item_get_ID (GIMP_ITEM (layer)) : -1; - return return_args; + return return_vals; } static ProcArg selection_float_inargs[] = @@ -493,7 +493,7 @@ selection_invert_invoker (ProcRecord *proc_record, gimp_channel_invert (gimp_image_get_mask (image), TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg selection_invert_inargs[] = @@ -542,7 +542,7 @@ selection_sharpen_invoker (ProcRecord *proc_record, gimp_channel_sharpen (gimp_image_get_mask (image), TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg selection_sharpen_inargs[] = @@ -591,7 +591,7 @@ selection_all_invoker (ProcRecord *proc_record, gimp_channel_all (gimp_image_get_mask (image), TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg selection_all_inargs[] = @@ -640,7 +640,7 @@ selection_none_invoker (ProcRecord *proc_record, gimp_channel_clear (gimp_image_get_mask (image), NULL, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg selection_none_inargs[] = @@ -695,7 +695,7 @@ selection_feather_invoker (ProcRecord *proc_record, radius, radius, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg selection_feather_inargs[] = @@ -755,7 +755,7 @@ selection_border_invoker (ProcRecord *proc_record, radius, radius, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg selection_border_inargs[] = @@ -815,7 +815,7 @@ selection_grow_invoker (ProcRecord *proc_record, steps, steps, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg selection_grow_inargs[] = @@ -875,7 +875,7 @@ selection_shrink_invoker (ProcRecord *proc_record, steps, steps, FALSE, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg selection_shrink_inargs[] = @@ -933,7 +933,7 @@ selection_layer_alpha_invoker (ProcRecord *proc_record, GIMP_CHANNEL_OP_REPLACE, FALSE, 0.0, 0.0); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg selection_layer_alpha_inargs[] = @@ -993,7 +993,7 @@ selection_load_invoker (ProcRecord *proc_record, FALSE, 0.0, 0.0); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg selection_load_inargs[] = @@ -1031,7 +1031,7 @@ selection_save_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpChannel *channel = NULL; @@ -1047,12 +1047,12 @@ selection_save_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = channel ? gimp_item_get_ID (GIMP_ITEM (channel)) : -1; + return_vals[1].value.pdb_int = channel ? gimp_item_get_ID (GIMP_ITEM (channel)) : -1; - return return_args; + return return_vals; } static ProcArg selection_save_inargs[] = @@ -1126,7 +1126,7 @@ selection_combine_invoker (ProcRecord *proc_record, FALSE, 0.0, 0.0); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg selection_combine_inargs[] = diff --git a/app/pdb/selection_tools_cmds.c b/app/pdb/selection_tools_cmds.c index a47e010539..e4f124b4d4 100644 --- a/app/pdb/selection_tools_cmds.c +++ b/app/pdb/selection_tools_cmds.c @@ -106,7 +106,7 @@ by_color_select_invoker (ProcRecord *proc_record, feather_radius); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg by_color_select_inargs[] = @@ -229,7 +229,7 @@ ellipse_select_invoker (ProcRecord *proc_record, feather_radius); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg ellipse_select_inargs[] = @@ -350,7 +350,7 @@ free_select_invoker (ProcRecord *proc_record, feather_radius); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg free_select_inargs[] = @@ -471,7 +471,7 @@ fuzzy_select_invoker (ProcRecord *proc_record, feather_radius); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg fuzzy_select_inargs[] = @@ -596,7 +596,7 @@ rect_select_invoker (ProcRecord *proc_record, feather_radius); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg rect_select_inargs[] = diff --git a/app/pdb/text_tool_cmds.c b/app/pdb/text_tool_cmds.c index 93e7ab71c6..3bc2f27dd6 100644 --- a/app/pdb/text_tool_cmds.c +++ b/app/pdb/text_tool_cmds.c @@ -55,7 +55,7 @@ text_fontname_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpDrawable *drawable; gdouble x; @@ -117,12 +117,12 @@ text_fontname_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = text_layer ? gimp_item_get_ID (GIMP_ITEM (text_layer)) : -1; + return_vals[1].value.pdb_int = text_layer ? gimp_item_get_ID (GIMP_ITEM (text_layer)) : -1; - return return_args; + return return_vals; } static ProcArg text_fontname_inargs[] = @@ -214,7 +214,7 @@ text_get_extents_fontname_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *text; gdouble size; gint32 size_type; @@ -251,17 +251,17 @@ text_get_extents_fontname_invoker (ProcRecord *proc_record, g_free (real_fontname); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = width; - return_args[2].value.pdb_int = height; - return_args[3].value.pdb_int = ascent; - return_args[4].value.pdb_int = descent; + return_vals[1].value.pdb_int = width; + return_vals[2].value.pdb_int = height; + return_vals[3].value.pdb_int = ascent; + return_vals[4].value.pdb_int = descent; } - return return_args; + return return_vals; } static ProcArg text_get_extents_fontname_inargs[] = @@ -338,7 +338,7 @@ text_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; GimpDrawable *drawable; gdouble x; @@ -435,12 +435,12 @@ text_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = text_layer ? gimp_item_get_ID (GIMP_ITEM (text_layer)) : -1; + return_vals[1].value.pdb_int = text_layer ? gimp_item_get_ID (GIMP_ITEM (text_layer)) : -1; - return return_args; + return return_vals; } static ProcArg text_inargs[] = @@ -567,7 +567,7 @@ text_get_extents_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *text; gdouble size; gint32 size_type; @@ -639,17 +639,17 @@ text_get_extents_invoker (ProcRecord *proc_record, g_free (real_fontname); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = width; - return_args[2].value.pdb_int = height; - return_args[3].value.pdb_int = ascent; - return_args[4].value.pdb_int = descent; + return_vals[1].value.pdb_int = width; + return_vals[2].value.pdb_int = height; + return_vals[3].value.pdb_int = ascent; + return_vals[4].value.pdb_int = descent; } - return return_args; + return return_vals; } static ProcArg text_get_extents_inargs[] = diff --git a/app/pdb/transform_tools_cmds.c b/app/pdb/transform_tools_cmds.c index e952e2d17a..5271dd05ae 100644 --- a/app/pdb/transform_tools_cmds.c +++ b/app/pdb/transform_tools_cmds.c @@ -63,7 +63,7 @@ flip_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gint32 flip_type; @@ -89,12 +89,12 @@ flip_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg flip_inargs[] = @@ -146,7 +146,7 @@ perspective_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean interpolation; gdouble x0; @@ -219,12 +219,12 @@ perspective_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg perspective_inargs[] = @@ -316,7 +316,7 @@ rotate_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean interpolation; gdouble angle; @@ -364,12 +364,12 @@ rotate_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg rotate_inargs[] = @@ -426,7 +426,7 @@ scale_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean interpolation; gdouble x0; @@ -487,12 +487,12 @@ scale_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg scale_inargs[] = @@ -564,7 +564,7 @@ shear_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean interpolation; gint32 shear_type; @@ -618,12 +618,12 @@ shear_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg shear_inargs[] = @@ -685,7 +685,7 @@ transform_2d_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpDrawable *drawable; gboolean interpolation; gdouble source_x; @@ -752,12 +752,12 @@ transform_2d_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; + return_vals[1].value.pdb_int = drawable ? gimp_item_get_ID (GIMP_ITEM (drawable)) : -1; - return return_args; + return return_vals; } static ProcArg transform_2d_inargs[] = diff --git a/app/pdb/undo_cmds.c b/app/pdb/undo_cmds.c index 73911e13ed..6a9fc5cbd5 100644 --- a/app/pdb/undo_cmds.c +++ b/app/pdb/undo_cmds.c @@ -78,7 +78,7 @@ image_undo_group_start_invoker (ProcRecord *proc_record, g_free (undo_desc); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_undo_group_start_inargs[] = @@ -127,7 +127,7 @@ image_undo_group_end_invoker (ProcRecord *proc_record, gimp_image_undo_group_end (image); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg image_undo_group_end_inargs[] = @@ -165,7 +165,7 @@ image_undo_is_enabled_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gboolean enabled = FALSE; @@ -178,12 +178,12 @@ image_undo_is_enabled_invoker (ProcRecord *proc_record, enabled = gimp_image_undo_is_enabled (image); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = enabled; + return_vals[1].value.pdb_int = enabled; - return return_args; + return return_vals; } static ProcArg image_undo_is_enabled_inargs[] = @@ -230,7 +230,7 @@ image_undo_disable_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gboolean disabled = FALSE; @@ -243,12 +243,12 @@ image_undo_disable_invoker (ProcRecord *proc_record, disabled = gimp_image_undo_disable (image); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = disabled; + return_vals[1].value.pdb_int = disabled; - return return_args; + return return_vals; } static ProcArg image_undo_disable_inargs[] = @@ -295,7 +295,7 @@ image_undo_enable_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gboolean enabled = FALSE; @@ -308,12 +308,12 @@ image_undo_enable_invoker (ProcRecord *proc_record, enabled = gimp_image_undo_enable (image); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = enabled; + return_vals[1].value.pdb_int = enabled; - return return_args; + return return_vals; } static ProcArg image_undo_enable_inargs[] = @@ -360,7 +360,7 @@ image_undo_freeze_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gboolean frozen = FALSE; @@ -373,12 +373,12 @@ image_undo_freeze_invoker (ProcRecord *proc_record, frozen = gimp_image_undo_freeze (image); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = frozen; + return_vals[1].value.pdb_int = frozen; - return return_args; + return return_vals; } static ProcArg image_undo_freeze_inargs[] = @@ -425,7 +425,7 @@ image_undo_thaw_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gboolean thawed = FALSE; @@ -438,12 +438,12 @@ image_undo_thaw_invoker (ProcRecord *proc_record, thawed = gimp_image_undo_thaw (image); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = thawed; + return_vals[1].value.pdb_int = thawed; - return return_args; + return return_vals; } static ProcArg image_undo_thaw_inargs[] = diff --git a/app/pdb/unit_cmds.c b/app/pdb/unit_cmds.c index e24557c10f..89cefd4a93 100644 --- a/app/pdb/unit_cmds.c +++ b/app/pdb/unit_cmds.c @@ -67,15 +67,15 @@ unit_get_number_of_units_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; gint32 num_units = 0; num_units = _gimp_unit_get_number_of_units (gimp); - return_args = procedural_db_return_args (proc_record, TRUE); - return_args[1].value.pdb_int = num_units; + return_vals = procedural_db_return_values (proc_record, TRUE); + return_vals[1].value.pdb_int = num_units; - return return_args; + return return_vals; } static ProcArg unit_get_number_of_units_outargs[] = @@ -112,15 +112,15 @@ unit_get_number_of_built_in_units_invoker (ProcRecord *proc_record, GimpProgress *progress, Argument *args) { - Argument *return_args; + Argument *return_vals; gint32 num_units = 0; num_units = _gimp_unit_get_number_of_built_in_units (gimp); - return_args = procedural_db_return_args (proc_record, TRUE); - return_args[1].value.pdb_int = num_units; + return_vals = procedural_db_return_values (proc_record, TRUE); + return_vals[1].value.pdb_int = num_units; - return return_args; + return return_vals; } static ProcArg unit_get_number_of_built_in_units_outargs[] = @@ -158,7 +158,7 @@ unit_new_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; gchar *identifier; gdouble factor; gint32 digits; @@ -198,12 +198,12 @@ unit_new_invoker (ProcRecord *proc_record, symbol, abbreviation, singular, plural); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = unit_id; + return_vals[1].value.pdb_int = unit_id; - return return_args; + return return_vals; } static ProcArg unit_new_inargs[] = @@ -280,7 +280,7 @@ unit_get_deletion_flag_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpUnit unit_id; gboolean deletion_flag = FALSE; @@ -293,12 +293,12 @@ unit_get_deletion_flag_invoker (ProcRecord *proc_record, deletion_flag = _gimp_unit_get_deletion_flag (gimp, unit_id); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = deletion_flag; + return_vals[1].value.pdb_int = deletion_flag; - return return_args; + return return_vals; } static ProcArg unit_get_deletion_flag_inargs[] = @@ -359,7 +359,7 @@ unit_set_deletion_flag_invoker (ProcRecord *proc_record, _gimp_unit_set_deletion_flag (gimp, unit_id, deletion_flag); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg unit_set_deletion_flag_inargs[] = @@ -402,7 +402,7 @@ unit_get_identifier_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpUnit unit_id; gchar *identifier = NULL; @@ -415,12 +415,12 @@ unit_get_identifier_invoker (ProcRecord *proc_record, identifier = g_strdup (_gimp_unit_get_identifier (gimp, unit_id)); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = identifier; + return_vals[1].value.pdb_pointer = identifier; - return return_args; + return return_vals; } static ProcArg unit_get_identifier_inargs[] = @@ -467,7 +467,7 @@ unit_get_factor_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpUnit unit_id; gdouble factor = 0.0; @@ -480,12 +480,12 @@ unit_get_factor_invoker (ProcRecord *proc_record, factor = _gimp_unit_get_factor (gimp, unit_id); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = factor; + return_vals[1].value.pdb_float = factor; - return return_args; + return return_vals; } static ProcArg unit_get_factor_inargs[] = @@ -532,7 +532,7 @@ unit_get_digits_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpUnit unit_id; gint32 digits = 0; @@ -545,12 +545,12 @@ unit_get_digits_invoker (ProcRecord *proc_record, digits = _gimp_unit_get_digits (gimp, unit_id); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = digits; + return_vals[1].value.pdb_int = digits; - return return_args; + return return_vals; } static ProcArg unit_get_digits_inargs[] = @@ -597,7 +597,7 @@ unit_get_symbol_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpUnit unit_id; gchar *symbol = NULL; @@ -610,12 +610,12 @@ unit_get_symbol_invoker (ProcRecord *proc_record, symbol = g_strdup (_gimp_unit_get_symbol (gimp, unit_id)); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = symbol; + return_vals[1].value.pdb_pointer = symbol; - return return_args; + return return_vals; } static ProcArg unit_get_symbol_inargs[] = @@ -662,7 +662,7 @@ unit_get_abbreviation_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpUnit unit_id; gchar *abbreviation = NULL; @@ -675,12 +675,12 @@ unit_get_abbreviation_invoker (ProcRecord *proc_record, abbreviation = g_strdup (_gimp_unit_get_abbreviation (gimp, unit_id)); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = abbreviation; + return_vals[1].value.pdb_pointer = abbreviation; - return return_args; + return return_vals; } static ProcArg unit_get_abbreviation_inargs[] = @@ -727,7 +727,7 @@ unit_get_singular_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpUnit unit_id; gchar *singular = NULL; @@ -740,12 +740,12 @@ unit_get_singular_invoker (ProcRecord *proc_record, singular = g_strdup (_gimp_unit_get_singular (gimp, unit_id)); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = singular; + return_vals[1].value.pdb_pointer = singular; - return return_args; + return return_vals; } static ProcArg unit_get_singular_inargs[] = @@ -792,7 +792,7 @@ unit_get_plural_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpUnit unit_id; gchar *plural = NULL; @@ -805,12 +805,12 @@ unit_get_plural_invoker (ProcRecord *proc_record, plural = g_strdup (_gimp_unit_get_plural (gimp, unit_id)); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = plural; + return_vals[1].value.pdb_pointer = plural; - return return_args; + return return_vals; } static ProcArg unit_get_plural_inargs[] = diff --git a/app/pdb/vectors_cmds.c b/app/pdb/vectors_cmds.c index 6ceb17a6dd..be96680c7e 100644 --- a/app/pdb/vectors_cmds.c +++ b/app/pdb/vectors_cmds.c @@ -95,7 +95,7 @@ vectors_new_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpImage *image; gchar *name; GimpVectors *vectors = NULL; @@ -113,12 +113,12 @@ vectors_new_invoker (ProcRecord *proc_record, vectors = gimp_vectors_new (image, name); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = vectors ? gimp_item_get_ID (GIMP_ITEM (vectors)) : -1; + return_vals[1].value.pdb_int = vectors ? gimp_item_get_ID (GIMP_ITEM (vectors)) : -1; - return return_args; + return return_vals; } static ProcArg vectors_new_inargs[] = @@ -170,7 +170,7 @@ vectors_get_image_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpVectors *vectors; GimpImage *image = NULL; @@ -183,12 +183,12 @@ vectors_get_image_invoker (ProcRecord *proc_record, image = gimp_item_get_image (GIMP_ITEM (vectors)); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = image ? gimp_image_get_ID (image) : -1; + return_vals[1].value.pdb_int = image ? gimp_image_get_ID (image) : -1; - return return_args; + return return_vals; } static ProcArg vectors_get_image_inargs[] = @@ -235,7 +235,7 @@ vectors_get_name_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpVectors *vectors; gchar *name = NULL; @@ -248,12 +248,12 @@ vectors_get_name_invoker (ProcRecord *proc_record, name = g_strdup (gimp_object_get_name (GIMP_OBJECT (vectors))); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_pointer = name; + return_vals[1].value.pdb_pointer = name; - return return_args; + return return_vals; } static ProcArg vectors_get_name_inargs[] = @@ -316,7 +316,7 @@ vectors_set_name_invoker (ProcRecord *proc_record, success = gimp_item_rename (GIMP_ITEM (vectors), name); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg vectors_set_name_inargs[] = @@ -359,7 +359,7 @@ vectors_get_visible_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpVectors *vectors; gboolean visible = FALSE; @@ -372,12 +372,12 @@ vectors_get_visible_invoker (ProcRecord *proc_record, visible = gimp_item_get_visible (GIMP_ITEM (vectors)); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = visible; + return_vals[1].value.pdb_int = visible; - return return_args; + return return_vals; } static ProcArg vectors_get_visible_inargs[] = @@ -438,7 +438,7 @@ vectors_set_visible_invoker (ProcRecord *proc_record, gimp_item_set_visible (GIMP_ITEM (vectors), visible, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg vectors_set_visible_inargs[] = @@ -481,7 +481,7 @@ vectors_get_linked_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpVectors *vectors; gboolean linked = FALSE; @@ -494,12 +494,12 @@ vectors_get_linked_invoker (ProcRecord *proc_record, linked = gimp_item_get_linked (GIMP_ITEM (vectors)); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = linked; + return_vals[1].value.pdb_int = linked; - return return_args; + return return_vals; } static ProcArg vectors_get_linked_inargs[] = @@ -560,7 +560,7 @@ vectors_set_linked_invoker (ProcRecord *proc_record, gimp_item_set_linked (GIMP_ITEM (vectors), linked, TRUE); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg vectors_set_linked_inargs[] = @@ -603,7 +603,7 @@ vectors_get_tattoo_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpVectors *vectors; gint32 tattoo = 0; @@ -616,12 +616,12 @@ vectors_get_tattoo_invoker (ProcRecord *proc_record, tattoo = gimp_item_get_tattoo (GIMP_ITEM (vectors)); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = tattoo; + return_vals[1].value.pdb_int = tattoo; - return return_args; + return return_vals; } static ProcArg vectors_get_tattoo_inargs[] = @@ -682,7 +682,7 @@ vectors_set_tattoo_invoker (ProcRecord *proc_record, gimp_item_set_tattoo (GIMP_ITEM (vectors), tattoo); } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg vectors_set_tattoo_inargs[] = @@ -725,7 +725,7 @@ vectors_get_strokes_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpVectors *vectors; gint32 num_strokes = 0; gint32 *stroke_ids = NULL; @@ -755,15 +755,15 @@ vectors_get_strokes_invoker (ProcRecord *proc_record, } } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = num_strokes; - return_args[2].value.pdb_pointer = stroke_ids; + return_vals[1].value.pdb_int = num_strokes; + return_vals[2].value.pdb_pointer = stroke_ids; } - return return_args; + return return_vals; } static ProcArg vectors_get_strokes_inargs[] = @@ -815,7 +815,7 @@ vectors_stroke_get_length_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpVectors *vectors; gint32 stroke_id; gdouble prescision; @@ -839,12 +839,12 @@ vectors_stroke_get_length_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_float = length; + return_vals[1].value.pdb_float = length; - return return_args; + return return_vals; } static ProcArg vectors_stroke_get_length_inargs[] = @@ -901,7 +901,7 @@ vectors_stroke_get_point_at_dist_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpVectors *vectors; gint32 stroke_id; gdouble dist; @@ -938,17 +938,17 @@ vectors_stroke_get_point_at_dist_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_float = x_point; - return_args[2].value.pdb_float = y_point; - return_args[3].value.pdb_float = slope; - return_args[4].value.pdb_int = valid; + return_vals[1].value.pdb_float = x_point; + return_vals[2].value.pdb_float = y_point; + return_vals[3].value.pdb_float = slope; + return_vals[4].value.pdb_int = valid; } - return return_args; + return return_vals; } static ProcArg vectors_stroke_get_point_at_dist_inargs[] = @@ -1044,7 +1044,7 @@ vectors_stroke_remove_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg vectors_stroke_remove_inargs[] = @@ -1106,7 +1106,7 @@ vectors_stroke_close_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg vectors_stroke_close_inargs[] = @@ -1174,7 +1174,7 @@ vectors_stroke_translate_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg vectors_stroke_translate_inargs[] = @@ -1252,7 +1252,7 @@ vectors_stroke_scale_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg vectors_stroke_scale_inargs[] = @@ -1305,7 +1305,7 @@ vectors_stroke_interpolate_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpVectors *vectors; gint32 stroke_id; gdouble prescision; @@ -1352,16 +1352,16 @@ vectors_stroke_interpolate_invoker (ProcRecord *proc_record, success = FALSE; } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) { - return_args[1].value.pdb_int = closed; - return_args[2].value.pdb_int = num_coords; - return_args[3].value.pdb_pointer = coords; + return_vals[1].value.pdb_int = closed; + return_vals[2].value.pdb_int = num_coords; + return_vals[3].value.pdb_pointer = coords; } - return return_args; + return return_vals; } static ProcArg vectors_stroke_interpolate_inargs[] = @@ -1428,7 +1428,7 @@ vectors_bezier_stroke_new_moveto_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpVectors *vectors; gdouble x0; gdouble y0; @@ -1455,12 +1455,12 @@ vectors_bezier_stroke_new_moveto_invoker (ProcRecord *proc_record, stroke_id = gimp_stroke_get_ID (stroke); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = stroke_id; + return_vals[1].value.pdb_int = stroke_id; - return return_args; + return return_vals; } static ProcArg vectors_bezier_stroke_new_moveto_inargs[] = @@ -1549,7 +1549,7 @@ vectors_bezier_stroke_lineto_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg vectors_bezier_stroke_lineto_inargs[] = @@ -1644,7 +1644,7 @@ vectors_bezier_stroke_conicto_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg vectors_bezier_stroke_conicto_inargs[] = @@ -1759,7 +1759,7 @@ vectors_bezier_stroke_cubicto_invoker (ProcRecord *proc_record, success = FALSE; } - return procedural_db_return_args (proc_record, success); + return procedural_db_return_values (proc_record, success); } static ProcArg vectors_bezier_stroke_cubicto_inargs[] = @@ -1832,7 +1832,7 @@ vectors_bezier_stroke_new_ellipse_invoker (ProcRecord *proc_record, Argument *args) { gboolean success = TRUE; - Argument *return_args; + Argument *return_vals; GimpVectors *vectors; gdouble x0; gdouble y0; @@ -1868,12 +1868,12 @@ vectors_bezier_stroke_new_ellipse_invoker (ProcRecord *proc_record, stroke_id = gimp_stroke_get_ID (stroke); } - return_args = procedural_db_return_args (proc_record, success); + return_vals = procedural_db_return_values (proc_record, success); if (success) - return_args[1].value.pdb_int = stroke_id; + return_vals[1].value.pdb_int = stroke_id; - return return_args; + return return_vals; } static ProcArg vectors_bezier_stroke_new_ellipse_inargs[] = diff --git a/app/plug-in/gimppluginmanager-call.c b/app/plug-in/gimppluginmanager-call.c index 47ff9e2f5f..0f2a253c22 100644 --- a/app/plug-in/gimppluginmanager-call.c +++ b/app/plug-in/gimppluginmanager-call.c @@ -55,7 +55,7 @@ static Argument * plug_in_temp_run (ProcRecord *proc_rec, GimpContext *context, GimpProgress *progress, Argument *args, - gint argc); + gint n_args); static Argument * plug_in_get_return_vals (PlugIn *plug_in, PlugInProcFrame *proc_frame); @@ -68,7 +68,7 @@ plug_in_run (Gimp *gimp, GimpProgress *progress, ProcRecord *proc_rec, Argument *args, - gint argc, + gint n_args, gboolean synchronous, gboolean destroy_return_vals, gint gdisp_ID) @@ -80,11 +80,11 @@ plug_in_run (Gimp *gimp, g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL); g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL); g_return_val_if_fail (proc_rec != NULL, NULL); - g_return_val_if_fail (argc == 0 || args != NULL, NULL); + g_return_val_if_fail (n_args == 0 || args != NULL, NULL); if (proc_rec->proc_type == GIMP_TEMPORARY) { - return_vals = plug_in_temp_run (proc_rec, context, progress, args, argc); + return_vals = plug_in_temp_run (proc_rec, context, progress, args, n_args); goto done; } @@ -128,14 +128,14 @@ plug_in_run (Gimp *gimp, config.monitor_number = monitor; proc_run.name = proc_rec->original_name; - proc_run.nparams = argc; - proc_run.params = plug_in_args_to_params (args, argc, FALSE); + proc_run.nparams = n_args; + proc_run.params = plug_in_args_to_params (args, n_args, FALSE); if (! gp_config_write (plug_in->my_write, &config, plug_in) || ! gp_proc_run_write (plug_in->my_write, &proc_run, plug_in) || ! gimp_wire_flush (plug_in->my_write, plug_in)) { - return_vals = procedural_db_return_args (proc_rec, FALSE); + return_vals = procedural_db_return_values (proc_rec, FALSE); g_free (config.display_name); @@ -206,7 +206,6 @@ plug_in_repeat (Gimp *gimp, { PlugInProcDef *proc_def; Argument *args; - gint i; g_return_if_fail (GIMP_IS_GIMP (gimp)); g_return_if_fail (index >= 0); @@ -218,13 +217,8 @@ plug_in_repeat (Gimp *gimp, if (proc_def) { /* construct the procedures arguments */ - args = g_new (Argument, 3); + args = procedural_db_arguments (&proc_def->db_info); - /* initialize the first three argument types */ - for (i = 0; i < 3; i++) - args[i].arg_type = proc_def->db_info.args[i].arg_type; - - /* initialize the first three plug-in arguments */ args[0].value.pdb_int = (with_interface ? GIMP_RUN_INTERACTIVE : GIMP_RUN_WITH_LAST_VALS); args[1].value.pdb_int = image_ID; @@ -232,7 +226,8 @@ plug_in_repeat (Gimp *gimp, /* run the plug-in procedure */ plug_in_run (gimp, context, progress, &proc_def->db_info, - args, 3, FALSE, TRUE, display_ID); + args, 3 /* not proc_def->db_info.num_args */, + FALSE, TRUE, display_ID); g_free (args); } @@ -246,7 +241,7 @@ plug_in_temp_run (ProcRecord *proc_rec, GimpContext *context, GimpProgress *progress, Argument *args, - gint argc) + gint n_args) { Argument *return_vals = NULL; PlugIn *plug_in; @@ -262,13 +257,13 @@ plug_in_temp_run (ProcRecord *proc_rec, proc_rec); proc_run.name = proc_rec->original_name; - proc_run.nparams = argc; - proc_run.params = plug_in_args_to_params (args, argc, FALSE); + proc_run.nparams = n_args; + proc_run.params = plug_in_args_to_params (args, n_args, FALSE); if (! gp_temp_proc_run_write (plug_in->my_write, &proc_run, plug_in) || ! gimp_wire_flush (plug_in->my_write, plug_in)) { - return_vals = procedural_db_return_args (proc_rec, FALSE); + return_vals = procedural_db_return_values (proc_rec, FALSE); plug_in_proc_frame_pop (plug_in); @@ -316,7 +311,7 @@ plug_in_get_return_vals (PlugIn *plug_in, else if (proc_frame->return_vals) { /* Allocate new return values of the correct size. */ - return_vals = procedural_db_return_args (proc_frame->proc_rec, FALSE); + return_vals = procedural_db_return_values (proc_frame->proc_rec, FALSE); /* Copy all of the arguments we can. */ memcpy (return_vals, proc_frame->return_vals, @@ -331,7 +326,7 @@ plug_in_get_return_vals (PlugIn *plug_in, else { /* Just return a dummy set of values. */ - return_vals = procedural_db_return_args (proc_frame->proc_rec, FALSE); + return_vals = procedural_db_return_values (proc_frame->proc_rec, FALSE); } /* We have consumed any saved values, so clear them. */ diff --git a/app/plug-in/gimppluginmanager-run.c b/app/plug-in/gimppluginmanager-run.c index 47ff9e2f5f..0f2a253c22 100644 --- a/app/plug-in/gimppluginmanager-run.c +++ b/app/plug-in/gimppluginmanager-run.c @@ -55,7 +55,7 @@ static Argument * plug_in_temp_run (ProcRecord *proc_rec, GimpContext *context, GimpProgress *progress, Argument *args, - gint argc); + gint n_args); static Argument * plug_in_get_return_vals (PlugIn *plug_in, PlugInProcFrame *proc_frame); @@ -68,7 +68,7 @@ plug_in_run (Gimp *gimp, GimpProgress *progress, ProcRecord *proc_rec, Argument *args, - gint argc, + gint n_args, gboolean synchronous, gboolean destroy_return_vals, gint gdisp_ID) @@ -80,11 +80,11 @@ plug_in_run (Gimp *gimp, g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL); g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL); g_return_val_if_fail (proc_rec != NULL, NULL); - g_return_val_if_fail (argc == 0 || args != NULL, NULL); + g_return_val_if_fail (n_args == 0 || args != NULL, NULL); if (proc_rec->proc_type == GIMP_TEMPORARY) { - return_vals = plug_in_temp_run (proc_rec, context, progress, args, argc); + return_vals = plug_in_temp_run (proc_rec, context, progress, args, n_args); goto done; } @@ -128,14 +128,14 @@ plug_in_run (Gimp *gimp, config.monitor_number = monitor; proc_run.name = proc_rec->original_name; - proc_run.nparams = argc; - proc_run.params = plug_in_args_to_params (args, argc, FALSE); + proc_run.nparams = n_args; + proc_run.params = plug_in_args_to_params (args, n_args, FALSE); if (! gp_config_write (plug_in->my_write, &config, plug_in) || ! gp_proc_run_write (plug_in->my_write, &proc_run, plug_in) || ! gimp_wire_flush (plug_in->my_write, plug_in)) { - return_vals = procedural_db_return_args (proc_rec, FALSE); + return_vals = procedural_db_return_values (proc_rec, FALSE); g_free (config.display_name); @@ -206,7 +206,6 @@ plug_in_repeat (Gimp *gimp, { PlugInProcDef *proc_def; Argument *args; - gint i; g_return_if_fail (GIMP_IS_GIMP (gimp)); g_return_if_fail (index >= 0); @@ -218,13 +217,8 @@ plug_in_repeat (Gimp *gimp, if (proc_def) { /* construct the procedures arguments */ - args = g_new (Argument, 3); + args = procedural_db_arguments (&proc_def->db_info); - /* initialize the first three argument types */ - for (i = 0; i < 3; i++) - args[i].arg_type = proc_def->db_info.args[i].arg_type; - - /* initialize the first three plug-in arguments */ args[0].value.pdb_int = (with_interface ? GIMP_RUN_INTERACTIVE : GIMP_RUN_WITH_LAST_VALS); args[1].value.pdb_int = image_ID; @@ -232,7 +226,8 @@ plug_in_repeat (Gimp *gimp, /* run the plug-in procedure */ plug_in_run (gimp, context, progress, &proc_def->db_info, - args, 3, FALSE, TRUE, display_ID); + args, 3 /* not proc_def->db_info.num_args */, + FALSE, TRUE, display_ID); g_free (args); } @@ -246,7 +241,7 @@ plug_in_temp_run (ProcRecord *proc_rec, GimpContext *context, GimpProgress *progress, Argument *args, - gint argc) + gint n_args) { Argument *return_vals = NULL; PlugIn *plug_in; @@ -262,13 +257,13 @@ plug_in_temp_run (ProcRecord *proc_rec, proc_rec); proc_run.name = proc_rec->original_name; - proc_run.nparams = argc; - proc_run.params = plug_in_args_to_params (args, argc, FALSE); + proc_run.nparams = n_args; + proc_run.params = plug_in_args_to_params (args, n_args, FALSE); if (! gp_temp_proc_run_write (plug_in->my_write, &proc_run, plug_in) || ! gimp_wire_flush (plug_in->my_write, plug_in)) { - return_vals = procedural_db_return_args (proc_rec, FALSE); + return_vals = procedural_db_return_values (proc_rec, FALSE); plug_in_proc_frame_pop (plug_in); @@ -316,7 +311,7 @@ plug_in_get_return_vals (PlugIn *plug_in, else if (proc_frame->return_vals) { /* Allocate new return values of the correct size. */ - return_vals = procedural_db_return_args (proc_frame->proc_rec, FALSE); + return_vals = procedural_db_return_values (proc_frame->proc_rec, FALSE); /* Copy all of the arguments we can. */ memcpy (return_vals, proc_frame->return_vals, @@ -331,7 +326,7 @@ plug_in_get_return_vals (PlugIn *plug_in, else { /* Just return a dummy set of values. */ - return_vals = procedural_db_return_args (proc_frame->proc_rec, FALSE); + return_vals = procedural_db_return_values (proc_frame->proc_rec, FALSE); } /* We have consumed any saved values, so clear them. */ diff --git a/app/plug-in/plug-in-run.c b/app/plug-in/plug-in-run.c index 47ff9e2f5f..0f2a253c22 100644 --- a/app/plug-in/plug-in-run.c +++ b/app/plug-in/plug-in-run.c @@ -55,7 +55,7 @@ static Argument * plug_in_temp_run (ProcRecord *proc_rec, GimpContext *context, GimpProgress *progress, Argument *args, - gint argc); + gint n_args); static Argument * plug_in_get_return_vals (PlugIn *plug_in, PlugInProcFrame *proc_frame); @@ -68,7 +68,7 @@ plug_in_run (Gimp *gimp, GimpProgress *progress, ProcRecord *proc_rec, Argument *args, - gint argc, + gint n_args, gboolean synchronous, gboolean destroy_return_vals, gint gdisp_ID) @@ -80,11 +80,11 @@ plug_in_run (Gimp *gimp, g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL); g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL); g_return_val_if_fail (proc_rec != NULL, NULL); - g_return_val_if_fail (argc == 0 || args != NULL, NULL); + g_return_val_if_fail (n_args == 0 || args != NULL, NULL); if (proc_rec->proc_type == GIMP_TEMPORARY) { - return_vals = plug_in_temp_run (proc_rec, context, progress, args, argc); + return_vals = plug_in_temp_run (proc_rec, context, progress, args, n_args); goto done; } @@ -128,14 +128,14 @@ plug_in_run (Gimp *gimp, config.monitor_number = monitor; proc_run.name = proc_rec->original_name; - proc_run.nparams = argc; - proc_run.params = plug_in_args_to_params (args, argc, FALSE); + proc_run.nparams = n_args; + proc_run.params = plug_in_args_to_params (args, n_args, FALSE); if (! gp_config_write (plug_in->my_write, &config, plug_in) || ! gp_proc_run_write (plug_in->my_write, &proc_run, plug_in) || ! gimp_wire_flush (plug_in->my_write, plug_in)) { - return_vals = procedural_db_return_args (proc_rec, FALSE); + return_vals = procedural_db_return_values (proc_rec, FALSE); g_free (config.display_name); @@ -206,7 +206,6 @@ plug_in_repeat (Gimp *gimp, { PlugInProcDef *proc_def; Argument *args; - gint i; g_return_if_fail (GIMP_IS_GIMP (gimp)); g_return_if_fail (index >= 0); @@ -218,13 +217,8 @@ plug_in_repeat (Gimp *gimp, if (proc_def) { /* construct the procedures arguments */ - args = g_new (Argument, 3); + args = procedural_db_arguments (&proc_def->db_info); - /* initialize the first three argument types */ - for (i = 0; i < 3; i++) - args[i].arg_type = proc_def->db_info.args[i].arg_type; - - /* initialize the first three plug-in arguments */ args[0].value.pdb_int = (with_interface ? GIMP_RUN_INTERACTIVE : GIMP_RUN_WITH_LAST_VALS); args[1].value.pdb_int = image_ID; @@ -232,7 +226,8 @@ plug_in_repeat (Gimp *gimp, /* run the plug-in procedure */ plug_in_run (gimp, context, progress, &proc_def->db_info, - args, 3, FALSE, TRUE, display_ID); + args, 3 /* not proc_def->db_info.num_args */, + FALSE, TRUE, display_ID); g_free (args); } @@ -246,7 +241,7 @@ plug_in_temp_run (ProcRecord *proc_rec, GimpContext *context, GimpProgress *progress, Argument *args, - gint argc) + gint n_args) { Argument *return_vals = NULL; PlugIn *plug_in; @@ -262,13 +257,13 @@ plug_in_temp_run (ProcRecord *proc_rec, proc_rec); proc_run.name = proc_rec->original_name; - proc_run.nparams = argc; - proc_run.params = plug_in_args_to_params (args, argc, FALSE); + proc_run.nparams = n_args; + proc_run.params = plug_in_args_to_params (args, n_args, FALSE); if (! gp_temp_proc_run_write (plug_in->my_write, &proc_run, plug_in) || ! gimp_wire_flush (plug_in->my_write, plug_in)) { - return_vals = procedural_db_return_args (proc_rec, FALSE); + return_vals = procedural_db_return_values (proc_rec, FALSE); plug_in_proc_frame_pop (plug_in); @@ -316,7 +311,7 @@ plug_in_get_return_vals (PlugIn *plug_in, else if (proc_frame->return_vals) { /* Allocate new return values of the correct size. */ - return_vals = procedural_db_return_args (proc_frame->proc_rec, FALSE); + return_vals = procedural_db_return_values (proc_frame->proc_rec, FALSE); /* Copy all of the arguments we can. */ memcpy (return_vals, proc_frame->return_vals, @@ -331,7 +326,7 @@ plug_in_get_return_vals (PlugIn *plug_in, else { /* Just return a dummy set of values. */ - return_vals = procedural_db_return_args (proc_frame->proc_rec, FALSE); + return_vals = procedural_db_return_values (proc_frame->proc_rec, FALSE); } /* We have consumed any saved values, so clear them. */ diff --git a/app/widgets/gimphelp.c b/app/widgets/gimphelp.c index a866b6b490..1a4b1dcdce 100644 --- a/app/widgets/gimphelp.c +++ b/app/widgets/gimphelp.c @@ -193,9 +193,8 @@ gimp_help_browser (Gimp *gimp) return FALSE; } - args = g_new (Argument, 1); + args = procedural_db_arguments (proc_rec); - args[0].arg_type = GIMP_PDB_INT32; args[0].value.pdb_int = GIMP_RUN_INTERACTIVE; plug_in_run (gimp, gimp_get_user_context (gimp), NULL, @@ -279,15 +278,11 @@ gimp_help_call (Gimp *gimp, n_domains = plug_ins_help_domains (gimp, &help_domains, &help_uris); - args = g_new (Argument, 4); + args = procedural_db_arguments (proc_rec); - args[0].arg_type = GIMP_PDB_INT32; args[0].value.pdb_int = n_domains; - args[1].arg_type = GIMP_PDB_STRINGARRAY; args[1].value.pdb_pointer = help_domains; - args[2].arg_type = GIMP_PDB_INT32; args[2].value.pdb_int = n_domains; - args[3].arg_type = GIMP_PDB_STRINGARRAY; args[3].value.pdb_pointer = help_uris; plug_in_run (gimp, gimp_get_user_context (gimp), NULL, diff --git a/app/xcf/xcf.c b/app/xcf/xcf.c index 4938342d28..c31a2fece2 100644 --- a/app/xcf/xcf.c +++ b/app/xcf/xcf.c @@ -220,7 +220,7 @@ xcf_exit (Gimp *gimp) g_return_if_fail (GIMP_IS_GIMP (gimp)); } -static Argument* +static Argument * xcf_load_invoker (ProcRecord *procedure, Gimp *gimp, GimpContext *context, @@ -228,7 +228,7 @@ xcf_load_invoker (ProcRecord *procedure, Argument *args) { XcfInfo info; - Argument *return_args; + Argument *return_vals; GimpImage *gimage = NULL; const gchar *filename; gboolean success = FALSE; @@ -298,14 +298,14 @@ xcf_load_invoker (ProcRecord *procedure, g_message (_("Could not open '%s' for reading: %s"), gimp_filename_to_utf8 (filename), g_strerror (errno)); - return_args = procedural_db_return_args (procedure, success); + return_vals = procedural_db_return_values (procedure, success); if (success) - return_args[1].value.pdb_int = gimp_image_get_ID (gimage); + return_vals[1].value.pdb_int = gimp_image_get_ID (gimage); gimp_unset_busy (gimp); - return return_args; + return return_vals; } static Argument * @@ -316,7 +316,7 @@ xcf_save_invoker (ProcRecord *procedure, Argument *args) { XcfInfo info; - Argument *return_args; + Argument *return_vals; GimpImage *gimage; const gchar *filename; gboolean success = FALSE; @@ -355,9 +355,9 @@ xcf_save_invoker (ProcRecord *procedure, g_message (_("Could not open '%s' for writing: %s"), gimp_filename_to_utf8 (filename), g_strerror (errno)); - return_args = procedural_db_return_args (procedure, success); + return_vals = procedural_db_return_values (procedure, success); gimp_unset_busy (gimp); - return return_args; + return return_vals; } diff --git a/tools/pdbgen/app.pl b/tools/pdbgen/app.pl index 0ce7a50e46..898aa43d87 100644 --- a/tools/pdbgen/app.pl +++ b/tools/pdbgen/app.pl @@ -363,7 +363,7 @@ sub marshal_outargs { my $proc = shift; my $result = <{id_ret_func}"/; } - $outargs .= "return_args[$argc].value.pdb_$type = $var;\n"; + $outargs .= "return_vals[$argc].value.pdb_$type = $var;\n"; } $outargs =~ s/^/' ' x 2/meg if $success; @@ -395,10 +395,10 @@ CODE $result .= ' ' x 4 . "{\n" if $success && $argc > 1; $result .= $outargs; $result .= ' ' x 4 . "}\n" if $success && $argc > 1; - $result .= "\n" . ' ' x 2 . "return return_args;\n"; + $result .= "\n" . ' ' x 2 . "return return_vals;\n"; } else { - $result =~ s/_args =//; + $result =~ s/_vals =//; } $result =~ s/, success\);$/, TRUE);/m unless $success; @@ -448,7 +448,7 @@ CODE else { my $invoker = ""; - $invoker .= ' ' x 2 . "Argument *return_args;\n" if scalar @outargs; + $invoker .= ' ' x 2 . "Argument *return_vals;\n" if scalar @outargs; $invoker .= &declare_args($proc, $out, 0, qw(inargs)); $invoker .= &declare_args($proc, $out, 1, qw(outargs)); diff --git a/tools/pdbgen/pdb/fileops.pdb b/tools/pdbgen/pdb/fileops.pdb index c262d134ca..4fabfea4b1 100644 --- a/tools/pdbgen/pdb/fileops.pdb +++ b/tools/pdbgen/pdb/fileops.pdb @@ -62,14 +62,14 @@ HELP NULL); if (! uri) - return procedural_db_return_args (proc_record, FALSE); + return procedural_db_return_values (proc_record, FALSE); file_proc = file_utils_find_proc (gimp->load_procs, uri); g_free (uri); if (! file_proc) - return procedural_db_return_args (proc_record, FALSE); + return procedural_db_return_values (proc_record, FALSE); proc = plug_in_proc_def_get_proc (file_proc); @@ -186,14 +186,14 @@ HELP NULL); if (! uri) - return procedural_db_return_args (proc_record, FALSE); + return procedural_db_return_values (proc_record, FALSE); file_proc = file_utils_find_proc (gimp->save_procs, uri); g_free (uri); if (! file_proc) - return procedural_db_return_args (proc_record, FALSE); + return procedural_db_return_values (proc_record, FALSE); proc = plug_in_proc_def_get_proc (file_proc);