ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: reshuffle some assignments for a return value

master
Benno Schulenberg 2020-01-30 19:21:28 +01:00
parent f494bfcbb9
commit 38c5a4465b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/files.c
View File

@ -304,7 +304,7 @@ int do_lockfile(const char *filename, bool ask_the_user)
strlen(locking_suffix) + 3; strlen(locking_suffix) + 3;
char *lockfilename = charalloc(locknamesize); char *lockfilename = charalloc(locknamesize);
struct stat fileinfo; struct stat fileinfo;
int retval = -1; int retval = 0;
snprintf(lockfilename, locknamesize, "%s/%s%s%s", dirname(namecopy), snprintf(lockfilename, locknamesize, "%s/%s%s%s", dirname(namecopy),
locking_prefix, basename(secondcopy), locking_suffix); locking_prefix, basename(secondcopy), locking_suffix);
@ -322,7 +322,6 @@ int do_lockfile(const char *filename, bool ask_the_user)
if ((lockfd = open(lockfilename, O_RDONLY)) < 0) { if ((lockfd = open(lockfilename, O_RDONLY)) < 0) {
statusline(ALERT, _("Error opening lock file %s: %s"), statusline(ALERT, _("Error opening lock file %s: %s"),
lockfilename, strerror(errno)); lockfilename, strerror(errno));
retval = 0;
goto free_the_name; goto free_the_name;
} }
@ -337,7 +336,6 @@ int do_lockfile(const char *filename, bool ask_the_user)
if (readtot < 1024 || lockbuf[0] != 0x62 || lockbuf[1] != 0x30) { if (readtot < 1024 || lockbuf[0] != 0x62 || lockbuf[1] != 0x30) {
statusline(ALERT, _("Bad lock file is ignored: %s"), lockfilename); statusline(ALERT, _("Bad lock file is ignored: %s"), lockfilename);
free(lockbuf); free(lockbuf);
retval = 0;
goto free_the_name; goto free_the_name;
} }
@ -380,6 +378,7 @@ int do_lockfile(const char *filename, bool ask_the_user)
free(promptstr); free(promptstr);
if (choice < 1) { if (choice < 1) {
retval = -1;
wipe_statusbar(); wipe_statusbar();
goto free_the_name; goto free_the_name;
} }