sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use build_ prefix for 3 functions in build.h; add a static modifier.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4130 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2009-08-26 17:25:28 +00:00
parent 50471cf5f4
commit 931f14d2ae
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -10,6 +10,8 @@
Use GEANY_PRIVATE to hide some fields from plugins. Use GEANY_PRIVATE to hide some fields from plugins.
* src/build.c: * src/build.c:
Fix invalid memory read (#2844632, patch by Lex Trotman, thanks). 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> 2009-08-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

12
src/build.c
View File

@ -358,7 +358,7 @@ gchar **build_get_regex(GeanyBuildGroup grp, GeanyFiletype *ft, gint *from)
} }
/* get pointer to the command group array */ /* 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; GeanyDocument *doc;
GeanyFiletype *ft; GeanyFiletype *ft;
@ -1820,7 +1820,7 @@ GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, TableD
return GTK_WIDGET(table); return GTK_WIDGET(table);
} }
void free_build_fields(TableData table_data) void build_free_fields(TableData table_data)
{ {
gint cmdindex; gint cmdindex;
for (cmdindex=0; cmdindex<build_items_count; ++cmdindex) for (cmdindex=0; cmdindex<build_items_count; ++cmdindex)
@ -1929,7 +1929,7 @@ static gboolean read_regex(GtkWidget *regexentry, gchar **src, gchar **dst)
return changed; 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; gint cmdindex, cmd;
gboolean changed = FALSE; gboolean changed = FALSE;
@ -1984,8 +1984,8 @@ static void show_build_commands_dialog()
prefdsts.fileregexstr = NULL; prefdsts.fileregexstr = NULL;
} }
prefdsts.nonfileregexstr = &regex_pref; prefdsts.nonfileregexstr = &regex_pref;
read_build_commands(&prefdsts, table_data, response); build_read_commands(&prefdsts, table_data, response);
free_build_fields(table_data); build_free_fields(table_data);
build_menu_update(doc); build_menu_update(doc);
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
@ -2002,7 +2002,7 @@ BuildMenuItems *build_get_menu_items(gint filetype_idx)
} }
/* set non_ft working directory entries to %p for project */ /* 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; gint i, start, end;
start = build_groups_count[GEANY_GBG_FT]; start = build_groups_count[GEANY_GBG_FT];

6
src/build.h
View File

@ -167,11 +167,11 @@ void build_finalize(void);
/* menu configuration dialog functions */ /* menu configuration dialog functions */
GtkWidget *build_commands_table( GeanyDocument *doc, GeanyBuildSource dst, TableData *data, GeanyFiletype *ft ); 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 */ /* build response decode assistance function */
gboolean build_parse_make_dir(const gchar *string, gchar **prefix); gboolean build_parse_make_dir(const gchar *string, gchar **prefix);

7
src/project.c
View File

@ -386,7 +386,8 @@ void project_close(gboolean open_default)
static void on_set_use_base_path_clicked( GtkWidget *unused1, gpointer user_data ) static void on_set_use_base_path_clicked( GtkWidget *unused1, gpointer user_data )
{ {
TableData td = (TableData)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) static void create_properties_dialog(PropertyDialogElements *e)
@ -579,7 +580,7 @@ void project_properties(void)
stash_group_update(indent_group, e->dialog); stash_group_update(indent_group, e->dialog);
} }
free_build_fields( e->build_properties ); build_free_fields( e->build_properties );
gtk_widget_destroy(e->dialog); gtk_widget_destroy(e->dialog);
g_free(e); g_free(e);
} }
@ -748,7 +749,7 @@ static gboolean update_config(const PropertyDialogElements *e)
menu_dst.dst[GEANY_GBG_NON_FT] = &non_ft_proj; menu_dst.dst[GEANY_GBG_NON_FT] = &non_ft_proj;
menu_dst.dst[GEANY_GBG_EXEC] = &exec_proj; menu_dst.dst[GEANY_GBG_EXEC] = &exec_proj;
menu_dst.nonfileregexstr = &regex_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 (ft!=NULL && ft->projfilecmds!=oldvalue && ft->project_list_entry<0)
{ {
if (p->build_filetypes_list==NULL)p->build_filetypes_list = g_ptr_array_new(); if (p->build_filetypes_list==NULL)p->build_filetypes_list = g_ptr_array_new();