diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-04-19 12:22:38 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-04-19 12:22:38 +0000 |
| commit | df05b119622acd975d85b62c2faddaafa792667a (patch) | |
| tree | a5a286d849512aafd95a9ef5e269d34ede92ecb3 /lib | |
| parent | f97cf22374b15c821a98b02faaf8c224310e975c (diff) | |
unifdef ENOTDIR, everyone has it
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/src/apps/apps.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/lib/libssl/src/apps/apps.c b/lib/libssl/src/apps/apps.c index 9a731fe75bc..2035d513738 100644 --- a/lib/libssl/src/apps/apps.c +++ b/lib/libssl/src/apps/apps.c @@ -1503,11 +1503,7 @@ rotate_serial(char *serialfile, char *new_suffix, char *old_suffix) BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n", serialfile, buf[1]); #endif - if (rename(serialfile, buf[1]) < 0 && errno != ENOENT -#ifdef ENOTDIR - && errno != ENOTDIR -#endif - ) { + if (rename(serialfile, buf[1]) < 0 && errno != ENOENT && errno != ENOTDIR) { BIO_printf(bio_err, "unable to rename %s to %s\n", serialfile, buf[1]); @@ -1723,11 +1719,7 @@ rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix) BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n", dbfile, buf[1]); #endif - if (rename(dbfile, buf[1]) < 0 && errno != ENOENT -#ifdef ENOTDIR - && errno != ENOTDIR -#endif - ) { + if (rename(dbfile, buf[1]) < 0 && errno != ENOENT && errno != ENOTDIR) { BIO_printf(bio_err, "unable to rename %s to %s\n", dbfile, buf[1]); @@ -1750,11 +1742,7 @@ rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix) BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n", buf[4], buf[3]); #endif - if (rename(buf[4], buf[3]) < 0 && errno != ENOENT -#ifdef ENOTDIR - && errno != ENOTDIR -#endif - ) { + if (rename(buf[4], buf[3]) < 0 && errno != ENOENT && errno != ENOTDIR) { BIO_printf(bio_err, "unable to rename %s to %s\n", buf[4], buf[3]); |