summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2014-10-01 18:34:29 +0300
committerEli Zaretskii <eliz@gnu.org>2014-10-01 18:34:29 +0300
commit1afb0ad372a1692fc5f886dd8059a9d4ef667e71 (patch)
tree67f9871419d0b7ecef0db0bcdaae4219317dc258
parent86a058029beb8c5516eed4293de2a8b9131f3438 (diff)
downloadgunmake-1afb0ad372a1692fc5f886dd8059a9d4ef667e71.tar.gz
Avoid compilation warnings.
* main.c (find_and_set_default_shell, main) [WINDOWS32]: Declare variables 'const char *' to avoid compiler warnings. * job.c (construct_command_argv_internal) [!NDEBUG]: Declare 'end' and set it only if NDEBUG is not defined, to avoid compiler warnings.
-rw-r--r--job.c4
-rw-r--r--main.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/job.c b/job.c
index d22e26c..6233026 100644
--- a/job.c
+++ b/job.c
@@ -2703,7 +2703,9 @@ construct_command_argv_internal (char *line, char **restp, const char *shell,
#endif
int i;
char *p;
+#ifndef NDEBUG
char *end;
+#endif
char *ap;
const char *cap;
const char *cp;
@@ -2807,7 +2809,9 @@ construct_command_argv_internal (char *line, char **restp, const char *shell,
/* All the args can fit in a buffer as big as LINE is. */
ap = new_argv[0] = argstr = xmalloc (i);
+#ifndef NDEBUG
end = ap + i;
+#endif
/* I is how many complete arguments have been found. */
i = 0;
diff --git a/main.c b/main.c
index 0d43575..7f14cba 100644
--- a/main.c
+++ b/main.c
@@ -890,7 +890,7 @@ find_and_set_default_shell (const char *token)
int sh_found = 0;
char *atoken = 0;
const char *search_token;
- char *tokend;
+ const char *tokend;
PATH_VAR(sh_path);
extern const char *default_shell;
@@ -1032,8 +1032,8 @@ main (int argc, char **argv, char **envp)
unsigned int restarts = 0;
unsigned int syncing = 0;
#ifdef WINDOWS32
- char *unix_path = NULL;
- char *windows32_path = NULL;
+ const char *unix_path = NULL;
+ const char *windows32_path = NULL;
SetUnhandledExceptionFilter (handle_runtime_exceptions);