From 6e622fd24edc8a6532d58dea8cdf8e6a5ec313f4 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 31 Dec 2004 00:26:36 +0000 Subject: "gtk_entry_get_text()" returns a "const char *" - assign the result to one. "get_basename()" doesn't modify its argument, and its callers don't modify the substring pointed to by the result, so make it take a "const char *" as an argument and return a "const char *". "find_last_pathname_separator()" doesn't modify its argument, so make it a "const char *" - but some of its callers pass a non-"const" "char *" and modify the result, so don't make its return value a "const char *". And, as none of its callers are outside "filesystem.c", make it static. In "about_folders_page_new()", have separate variables for pathnames returned as "const char *" (which are cached by the routine that returns them, so you can't modify them - and can't free them, so get rid of the commented-out "g_free()" calls for them) and pathnames returned as "char *" (which are allocated anew for each call, and can be modified, but have to be freed). Clean up white space. svn path=/trunk/; revision=12881 --- file.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'file.h') diff --git a/file.h b/file.h index f3ab319bca..0b91efff86 100644 --- a/file.h +++ b/file.h @@ -51,7 +51,7 @@ read_status_t cf_continue_tail(capture_file *, int, int *); read_status_t cf_finish_tail(capture_file *, int *); /* size_t read_frame_header(capture_file *); */ gboolean cf_save(char *fname, capture_file * cf, packet_range_t *range, guint save_format); -gchar *cf_get_display_name(capture_file *); +const gchar *cf_get_display_name(capture_file *); gboolean cf_merge_files(const char *out_filename, int out_fd, int in_file_count, -- cgit v1.2.3