[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/etags-update 99571d4 2/4: constify some things
From: |
Tom Tromey |
Subject: |
[Emacs-diffs] feature/etags-update 99571d4 2/4: constify some things |
Date: |
Wed, 17 Jan 2018 18:15:10 -0500 (EST) |
branch: feature/etags-update
commit 99571d4f7208d7ee232c9e35100fa5ebeebfbd9c
Author: Tom Tromey <address@hidden>
Commit: Tom Tromey <address@hidden>
constify some things
---
lib-src/etags.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/lib-src/etags.c b/lib-src/etags.c
index e31aedb..d092e43 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -402,10 +402,10 @@ static char *skip_name (char *);
static char *savenstr (const char *, int);
static char *savestr (const char *);
static char *etags_getcwd (void);
-static char *relative_filename (char *, char *);
-static char *absolute_filename (char *, char *);
+static char *relative_filename (const char *, const char *);
+static char *absolute_filename (const char *, const char *);
static char *absolute_dirname (char *, char *);
-static bool filename_is_absolute (char *f);
+static bool filename_is_absolute (const char *f);
static void canonicalize_filename (char *);
static char *etags_mktmp (void);
static void linebuffer_init (linebuffer *);
@@ -1402,7 +1402,7 @@ main (int argc, char **argv)
* Idea by Vladimir Alexiev <address@hidden> (1998)
*/
static compressor *
-get_compressor_from_suffix (char *file, char **extptr)
+get_compressor_from_suffix (const char *file, const char **extptr)
{
compressor *compr;
char *slash, *suffix;
@@ -1482,7 +1482,7 @@ get_language_from_interpreter (char *interpreter)
* Return a language given the file name.
*/
static language *
-get_language_from_filename (char *file, int case_sensitive)
+get_language_from_filename (const char *file, int case_sensitive)
{
language *lang;
const char **name, **ext, *suffix;
@@ -1530,7 +1530,8 @@ process_file_name (char *file, language *lang)
fdesc *fdp;
compressor *compr;
char *compressed_name, *uncompressed_name;
- char *ext, *real_name UNINIT, *tmp_name UNINIT;
+ const char *ext;
+ char *real_name UNINIT, *tmp_name UNINIT;
int retval;
canonicalize_filename (file);
@@ -7086,9 +7087,10 @@ etags_mktmp (void)
/* Return a newly allocated string containing the file name of FILE
relative to the absolute directory DIR (which should end with a slash). */
static char *
-relative_filename (char *file, char *dir)
+relative_filename (const char *file, const char *dir)
{
- char *fp, *dp, *afn, *res;
+ const char *fp, *dp;
+ char *afn, *res;
int i;
/* Find the common root of file and dir (with a trailing slash). */
@@ -7125,7 +7127,7 @@ relative_filename (char *file, char *dir)
/* Return a newly allocated string containing the absolute file name
of FILE given DIR (which should end with a slash). */
static char *
-absolute_filename (char *file, char *dir)
+absolute_filename (const char *file, const char *dir)
{
char *slashp, *cp, *res;
@@ -7208,7 +7210,7 @@ absolute_dirname (char *file, char *dir)
/* Whether the argument string is an absolute file name. The argument
string must have been canonicalized with canonicalize_filename. */
static bool
-filename_is_absolute (char *fn)
+filename_is_absolute (const char *fn)
{
return (fn[0] == '/'
#ifdef DOS_NT