tweaks: reshuffle code and frob comments, to reduce the number of lines

This commit is contained in:
Benno Schulenberg
2017-08-05 21:30:27 +02:00
parent 80686bb525
commit 276ab2c85e
2 changed files with 11 additions and 19 deletions

View File

@@ -1411,12 +1411,9 @@ char *safe_tempfile(FILE **f)
}
#ifndef DISABLE_OPERATINGDIR
/* Initialize full_operating_dir based on operating_dir. */
/* Change to the specified operating directory, when it's valid. */
void init_operating_dir(void)
{
if (operating_dir == NULL)
return;
full_operating_dir = get_full_path(operating_dir);
/* If the operating directory is inaccessible, fail. */
@@ -1493,17 +1490,13 @@ int prompt_failed_backupwrite(const char *filename)
return response;
}
/* Transform the specified backup directory to an absolute path. */
void init_backup_dir(void)
{
char *full_backup_dir;
char *full_backup_dir = get_full_path(backup_dir);
if (backup_dir == NULL)
return;
full_backup_dir = get_full_path(backup_dir);
/* If get_full_path() failed or the backup directory is
* inaccessible, unset backup_dir. */
/* When we can't get an absolute path, or it's not a directory,
* cancel the making of backups. */
if (full_backup_dir == NULL ||
full_backup_dir[strlen(full_backup_dir) - 1] != '/') {
free(full_backup_dir);