diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-04-14 02:45:36 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-04-14 02:45:36 +0000 |
| commit | e341626ecc5f97ac0da31c1465bb8f0d0a32b0e5 (patch) | |
| tree | 0701325a40ac04a02233321c7007dd0aac1a440f /usr.bin/cvs/add.c | |
| parent | 0e753ff5b41a1e62682b49974035397e8b97edab (diff) | |
remove a metric buttload of excessive ()
no binary change; ok ray
Diffstat (limited to 'usr.bin/cvs/add.c')
| -rw-r--r-- | usr.bin/cvs/add.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/usr.bin/cvs/add.c b/usr.bin/cvs/add.c index 2ff6947aede..3dc59d5faa1 100644 --- a/usr.bin/cvs/add.c +++ b/usr.bin/cvs/add.c @@ -1,4 +1,4 @@ -/* $OpenBSD: add.c,v 1.40 2006/01/27 12:56:28 xsa Exp $ */ +/* $OpenBSD: add.c,v 1.41 2006/04/14 02:45:35 deraadt Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> @@ -137,9 +137,9 @@ cvs_add_local(CVSFILE *cf, void *arg) added = 0; /* dont use `cvs add *' */ - if ((strcmp(cf->cf_name, ".") == 0) || - (strcmp(cf->cf_name, "..") == 0) || - (strcmp(cf->cf_name, CVS_PATH_CVSDIR) == 0)) { + if (strcmp(cf->cf_name, ".") == 0 || + strcmp(cf->cf_name, "..") == 0 || + strcmp(cf->cf_name, CVS_PATH_CVSDIR) == 0) { if (verbosity > 1) fatal("cannot add special file `%s'.", cf->cf_name); } @@ -148,8 +148,8 @@ cvs_add_local(CVSFILE *cf, void *arg) return cvs_add_directory(cf); if ((!(cf->cf_flags & CVS_FILE_ONDISK)) && - (cf->cf_cvstat != CVS_FST_LOST) && - (cf->cf_cvstat != CVS_FST_REMOVED)) { + cf->cf_cvstat != CVS_FST_LOST && + cf->cf_cvstat != CVS_FST_REMOVED) { if (verbosity > 1) cvs_log(LP_WARN, "nothing known about `%s'", cf->cf_name); @@ -170,10 +170,10 @@ cvs_add_local(CVSFILE *cf, void *arg) cf->cf_name, numbuf); return (0); - } else if ((cf->cf_cvstat == CVS_FST_CONFLICT) || - (cf->cf_cvstat == CVS_FST_LOST) || - (cf->cf_cvstat == CVS_FST_MODIFIED) || - (cf->cf_cvstat == CVS_FST_UPTODATE)) { + } else if (cf->cf_cvstat == CVS_FST_CONFLICT || + cf->cf_cvstat == CVS_FST_LOST || + cf->cf_cvstat == CVS_FST_MODIFIED || + cf->cf_cvstat == CVS_FST_UPTODATE) { if (verbosity > 1) { rcsnum_tostr(cf->cf_lrev, numbuf, sizeof(numbuf)); cvs_log(LP_WARN, @@ -244,7 +244,7 @@ cvs_add_directory(CVSFILE *cf) strlcat(rcsdir, repo, sizeof(rcsdir)) >= sizeof(rcsdir)) fatal("cvs_add_directory: path truncation"); - if ((stat(rcsdir, &st) == 0) && !(S_ISDIR(st.st_mode))) + if (stat(rcsdir, &st) == 0 && !(S_ISDIR(st.st_mode))) fatal("%s is not a directory; %s not added: %s", rcsdir, fpath, strerror(errno)); |