fix a few lines of unusual length
authortedu <tedu@openbsd.org>
Tue, 27 Jun 2017 21:49:47 +0000 (21:49 +0000)
committertedu <tedu@openbsd.org>
Tue, 27 Jun 2017 21:49:47 +0000 (21:49 +0000)
bin/cp/cp.c
bin/rm/rm.c

index f999dc7..532edbb 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cp.c,v 1.45 2017/06/27 21:43:46 tedu Exp $    */
+/*     $OpenBSD: cp.c,v 1.46 2017/06/27 21:49:47 tedu Exp $    */
 /*     $NetBSD: cp.c,v 1.14 1995/09/07 06:14:51 jtc Exp $      */
 
 /*
@@ -430,7 +430,8 @@ copy(char *argv[], enum op type, int fts_options)
                case S_IFBLK:
                case S_IFCHR:
                        if (Rflag) {
-                               if (copy_special(curr->fts_statp, !fts_dne(curr)))
+                               if (copy_special(curr->fts_statp,
+                                   !fts_dne(curr)))
                                        rval = 1;
                        } else
                                if (copy_file(curr, fts_dne(curr)))
@@ -458,7 +459,7 @@ copy(char *argv[], enum op type, int fts_options)
                                rval = 1;
                        else if (vflag)
                                (void)fprintf(stdout, "%s -> %s\n",
-                                       curr->fts_path, to.p_path);
+                                   curr->fts_path, to.p_path);
                        break;
                }
        }
index 7beec3b..90e6503 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rm.c,v 1.41 2017/06/27 21:43:46 tedu Exp $    */
+/*     $OpenBSD: rm.c,v 1.42 2017/06/27 21:49:47 tedu Exp $    */
 /*     $NetBSD: rm.c,v 1.19 1995/09/07 06:48:50 jtc Exp $      */
 
 /*-
@@ -206,7 +206,7 @@ rm_tree(char **argv)
                        if (!rmdir(p->fts_accpath) ||
                            (fflag && errno == ENOENT)) {
                                if (vflag)
-                                       (void)fprintf(stdout, "%s\n", p->fts_path);
+                                       fprintf(stdout, "%s\n", p->fts_path);
                                continue;
                        }
                        break;
@@ -221,7 +221,7 @@ rm_tree(char **argv)
                        if (!unlink(p->fts_accpath) ||
                            (fflag && errno == ENOENT)) {
                                if (vflag)
-                                       (void)fprintf(stdout, "%s\n", p->fts_path);
+                                       fprintf(stdout, "%s\n", p->fts_path);
                                continue;
                        }
                }
@@ -396,7 +396,7 @@ check(char *path, char *name, struct stat *sp)
  * Since POSIX.2 defines basename as the final portion of a path after
  * trailing slashes have been removed, we'll remove them here.
  */
-#define ISDOT(a)       ((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2])))
+#define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2])))
 void
 checkdot(char **argv)
 {