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 /epan/filesystem.h | |
parent | 6d24b27606da5b9a86bb13d3de3bd195d249a757 (diff) |
"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 'epan/filesystem.h')
-rw-r--r-- | epan/filesystem.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/epan/filesystem.h b/epan/filesystem.h index 4f013f66bd..d965c26300 100644 --- a/epan/filesystem.h +++ b/epan/filesystem.h @@ -26,16 +26,9 @@ #define FILESYSTEM_H /* - * Given a pathname, return a pointer to the last pathname separator - * character in the pathname, or NULL if the pathname contains no - * separators. - */ -char *find_last_pathname_separator(char *); - -/* * Given a pathname, return the last component. */ -char *get_basename(char *); +const char *get_basename(const char *); /* * Given a pathname, return a string containing everything but the |