diff options
author | Guy Harris <guy@alum.mit.edu> | 2004-12-31 00:26:36 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2004-12-31 00:26:36 +0000 |
commit | 6e622fd24edc8a6532d58dea8cdf8e6a5ec313f4 (patch) | |
tree | 738949b79c0a12c924ec7155b79a0aa9ebfc032f /gtk/main.c | |
parent | 6d24b27606da5b9a86bb13d3de3bd195d249a757 (diff) | |
download | wireshark-6e622fd24edc8a6532d58dea8cdf8e6a5ec313f4.tar.gz wireshark-6e622fd24edc8a6532d58dea8cdf8e6a5ec313f4.tar.bz2 wireshark-6e622fd24edc8a6532d58dea8cdf8e6a5ec313f4.zip |
"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
Diffstat (limited to 'gtk/main.c')
-rw-r--r-- | gtk/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/main.c b/gtk/main.c index b05076a098..87032f4125 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1525,7 +1525,7 @@ int main(int argc, char *argv[]) { #ifdef HAVE_LIBPCAP - char *command_name; + const char *command_name; #endif char *s; int i; |