tweaks: constify the result strings of getenv(), as a reminder

Also, remove an unneeded pair of braces.
master
Benno Schulenberg 2017-11-09 20:58:15 +01:00
parent e2d3bba86c
commit 2122a1a2b5
4 changed files with 9 additions and 8 deletions

View File

@ -250,7 +250,7 @@ void history_error(const char *msg, ...)
bool have_statedir(void) bool have_statedir(void)
{ {
struct stat dirstat; struct stat dirstat;
char *xdgdatadir; const char *xdgdatadir;
get_homedir(); get_homedir();
@ -269,9 +269,9 @@ bool have_statedir(void)
if (homedir == NULL && xdgdatadir == NULL) if (homedir == NULL && xdgdatadir == NULL)
return FALSE; return FALSE;
if (xdgdatadir != NULL) { if (xdgdatadir != NULL)
statedir = concatenate(xdgdatadir, "/nano/"); statedir = concatenate(xdgdatadir, "/nano/");
} else else
statedir = concatenate(homedir, XDG_DATA_FALLBACK "/nano/"); statedir = concatenate(homedir, XDG_DATA_FALLBACK "/nano/");
if (stat(statedir, &dirstat) == -1) { if (stat(statedir, &dirstat) == -1) {

View File

@ -2422,7 +2422,7 @@ int main(int argc, char **argv)
* checking is disabled, since it would allow reading from or * checking is disabled, since it would allow reading from or
* writing to files not specified on the command line). */ * writing to files not specified on the command line). */
if (!ISSET(RESTRICTED) && alt_speller == NULL) { if (!ISSET(RESTRICTED) && alt_speller == NULL) {
char *spellenv = getenv("SPELL"); const char *spellenv = getenv("SPELL");
if (spellenv != NULL) if (spellenv != NULL)
alt_speller = mallocstrcpy(NULL, spellenv); alt_speller = mallocstrcpy(NULL, spellenv);
} }

View File

@ -1215,7 +1215,7 @@ void parse_one_nanorc(void)
rcfile_error(N_("Error reading %s: %s"), nanorc, strerror(errno)); rcfile_error(N_("Error reading %s: %s"), nanorc, strerror(errno));
} }
bool have_nanorc(char *path, char *name) bool have_nanorc(const char *path, char *name)
{ {
if (path == NULL) if (path == NULL)
return FALSE; return FALSE;
@ -1229,6 +1229,8 @@ bool have_nanorc(char *path, char *name)
/* First read the system-wide rcfile, then the user's rcfile. */ /* First read the system-wide rcfile, then the user's rcfile. */
void do_rcfiles(void) void do_rcfiles(void)
{ {
const char *xdgconfdir;
nanorc = mallocstrcpy(nanorc, SYSCONFDIR "/nanorc"); nanorc = mallocstrcpy(nanorc, SYSCONFDIR "/nanorc");
/* Process the system-wide nanorc. */ /* Process the system-wide nanorc. */
@ -1242,8 +1244,7 @@ void do_rcfiles(void)
#endif #endif
get_homedir(); get_homedir();
xdgconfdir = getenv("XDG_CONFIG_HOME");
char *xdgconfdir = getenv("XDG_CONFIG_HOME");
/* Now try the to find a nanorc file in the user's home directory /* Now try the to find a nanorc file in the user's home directory
* or in the XDG configuration directories. */ * or in the XDG configuration directories. */

View File

@ -1108,7 +1108,7 @@ bool execute_command(const char *command)
{ {
int fd[2]; int fd[2];
FILE *f; FILE *f;
char *shellenv; const char *shellenv;
struct sigaction oldaction, newaction; struct sigaction oldaction, newaction;
/* Original and temporary handlers for SIGINT. */ /* Original and temporary handlers for SIGINT. */
bool sig_failed = FALSE; bool sig_failed = FALSE;