diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-08-02 13:13:06 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-08-02 13:13:06 +0000 |
| commit | 3d02d34c754be0af71c45f7c98d0a471ff529343 (patch) | |
| tree | 85001974baefbf2b2c1f82bce9cfd587b562449e /usr.sbin/pkg_install/add/perform.c | |
| parent | a48179c2faf756dff8c1ada4d76b41fdedd63c35 (diff) | |
Cosmetics: replace dozen instances of "(tmp = getenv(PKG_DBDIR) ? tmp : DEF_LOG_DIR)"
with macro.
MFC after: 1 month
Notes
Notes:
svn path=/head/; revision=81049
Diffstat (limited to 'usr.sbin/pkg_install/add/perform.c')
| -rw-r--r-- | usr.sbin/pkg_install/add/perform.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c index dfa6269aff2d..06c50283efe6 100644 --- a/usr.sbin/pkg_install/add/perform.c +++ b/usr.sbin/pkg_install/add/perform.c @@ -234,7 +234,7 @@ pkg_do(char *pkg) PkgName = (p = find_plist(&Plist, PLIST_NAME)) ? p->name : "anonymous"; /* See if we're already registered */ - sprintf(LogDir, "%s/%s", (tmp = getenv(PKG_DBDIR)) ? tmp : DEF_LOG_DIR, PkgName); + sprintf(LogDir, "%s/%s", LOG_DIR, PkgName); if (isdir(LogDir) && !Force) { warnx("package '%s' already recorded as installed", PkgName); code = 1; @@ -403,7 +403,7 @@ pkg_do(char *pkg) code = 1; goto success; /* well, partial anyway */ } - sprintf(LogDir, "%s/%s", (tmp = getenv(PKG_DBDIR)) ? tmp : DEF_LOG_DIR, PkgName); + sprintf(LogDir, "%s/%s", LOG_DIR, PkgName); zapLogDir = 1; if (Verbose) printf("Attempting to record package into %s..\n", LogDir); @@ -440,8 +440,8 @@ pkg_do(char *pkg) continue; if (Verbose) printf("Attempting to record dependency on package '%s'\n", p->name); - sprintf(contents, "%s/%s/%s", (tmp = getenv(PKG_DBDIR)) ? tmp : DEF_LOG_DIR, - basename_of(p->name), REQUIRED_BY_FNAME); + sprintf(contents, "%s/%s/%s", LOG_DIR, basename_of(p->name), + REQUIRED_BY_FNAME); cfile = fopen(contents, "a"); if (!cfile) warnx("can't open dependency file '%s'!\n" |