Revision: 4130 http://geany.svn.sourceforge.net/geany/?rev=4130&view=rev Author: ntrel Date: 2009-08-26 17:25:28 +0000 (Wed, 26 Aug 2009)

Log Message: ----------- Use build_ prefix for 3 functions in build.h; add a static modifier.

Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/build.h trunk/src/project.c

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-08-26 15:32:17 UTC (rev 4129) +++ trunk/ChangeLog 2009-08-26 17:25:28 UTC (rev 4130) @@ -10,6 +10,8 @@ Use GEANY_PRIVATE to hide some fields from plugins. * src/build.c: Fix invalid memory read (#2844632, patch by Lex Trotman, thanks). + * src/build.c, src/build.h, src/project.c: + Use build_ prefix for 3 functions in build.h; add a static modifier.

2009-08-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-08-26 15:32:17 UTC (rev 4129) +++ trunk/src/build.c 2009-08-26 17:25:28 UTC (rev 4130) @@ -358,7 +358,7 @@ }

/* get pointer to the command group array */ -GeanyBuildCommand *get_build_group(GeanyBuildSource src, GeanyBuildGroup grp) +static GeanyBuildCommand *get_build_group(GeanyBuildSource src, GeanyBuildGroup grp) { GeanyDocument *doc; GeanyFiletype *ft; @@ -1820,7 +1820,7 @@ return GTK_WIDGET(table); }

-void free_build_fields(TableData table_data) +void build_free_fields(TableData table_data) { gint cmdindex; for (cmdindex=0; cmdindex<build_items_count; ++cmdindex) @@ -1929,7 +1929,7 @@ return changed; }

-gboolean read_build_commands(BuildDestination *dst, TableData table_data, gint response) +gboolean build_read_commands(BuildDestination *dst, TableData table_data, gint response) { gint cmdindex, cmd; gboolean changed = FALSE; @@ -1984,8 +1984,8 @@ prefdsts.fileregexstr = NULL; } prefdsts.nonfileregexstr = &regex_pref; - read_build_commands(&prefdsts, table_data, response); - free_build_fields(table_data); + build_read_commands(&prefdsts, table_data, response); + build_free_fields(table_data);

build_menu_update(doc); gtk_widget_destroy(dialog); @@ -2002,7 +2002,7 @@ }

/* set non_ft working directory entries to %p for project */ -void set_build_non_ft_wd_to_proj(TableData table_data) +void build_set_non_ft_wd_to_proj(TableData table_data) { gint i, start, end; start = build_groups_count[GEANY_GBG_FT];

Modified: trunk/src/build.h =================================================================== --- trunk/src/build.h 2009-08-26 15:32:17 UTC (rev 4129) +++ trunk/src/build.h 2009-08-26 17:25:28 UTC (rev 4130) @@ -167,11 +167,11 @@ /* menu configuration dialog functions */ GtkWidget *build_commands_table( GeanyDocument *doc, GeanyBuildSource dst, TableData *data, GeanyFiletype *ft );

-gboolean read_build_commands( BuildDestination *dst, TableData data, gint response ); +gboolean build_read_commands( BuildDestination *dst, TableData data, gint response );

-void free_build_fields( TableData data ); +void build_free_fields( TableData data );

-void set_build_non_ft_wd_to_proj(TableData table_data); +void build_set_non_ft_wd_to_proj(TableData table_data);

/* build response decode assistance function */ gboolean build_parse_make_dir(const gchar *string, gchar **prefix);

Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2009-08-26 15:32:17 UTC (rev 4129) +++ trunk/src/project.c 2009-08-26 17:25:28 UTC (rev 4130) @@ -386,7 +386,8 @@ static void on_set_use_base_path_clicked( GtkWidget *unused1, gpointer user_data ) { TableData td = (TableData)user_data; - set_build_non_ft_wd_to_proj(td); + + build_set_non_ft_wd_to_proj(td); }

static void create_properties_dialog(PropertyDialogElements *e) @@ -579,7 +580,7 @@ stash_group_update(indent_group, e->dialog); }

- free_build_fields( e->build_properties ); + build_free_fields( e->build_properties ); gtk_widget_destroy(e->dialog); g_free(e); } @@ -748,7 +749,7 @@ menu_dst.dst[GEANY_GBG_NON_FT] = &non_ft_proj; menu_dst.dst[GEANY_GBG_EXEC] = &exec_proj; menu_dst.nonfileregexstr = &regex_proj; - read_build_commands( &menu_dst, e->build_properties, GTK_RESPONSE_ACCEPT ); + build_read_commands( &menu_dst, e->build_properties, GTK_RESPONSE_ACCEPT ); if (ft!=NULL && ft->projfilecmds!=oldvalue && ft->project_list_entry<0) { if (p->build_filetypes_list==NULL)p->build_filetypes_list = g_ptr_array_new();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.