Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/sysinst sysinst: remove trailing whitespace from *....



details:   https://anonhg.NetBSD.org/src/rev/e9888ae536e8
branches:  trunk
changeset: 980335:e9888ae536e8
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Jan 31 22:45:46 2021 +0000

description:
sysinst: remove trailing whitespace from *.c *.h

In contrast to the messages files, this whitespace is not significant.

diffstat:

 usr.sbin/sysinst/bsddisklabel.c |  18 ++++++------
 usr.sbin/sysinst/checkrc.c      |   4 +-
 usr.sbin/sysinst/configmenu.c   |   6 ++--
 usr.sbin/sysinst/defs.h         |   6 ++--
 usr.sbin/sysinst/disklabel.c    |   4 +-
 usr.sbin/sysinst/disks.c        |  14 +++++-----
 usr.sbin/sysinst/geom.c         |   8 ++--
 usr.sbin/sysinst/gpt.c          |  10 +++---
 usr.sbin/sysinst/label.c        |  30 ++++++++++----------
 usr.sbin/sysinst/main.c         |  10 +++---
 usr.sbin/sysinst/mbr.c          |   9 ++---
 usr.sbin/sysinst/net.c          |  10 +++---
 usr.sbin/sysinst/part_edit.c    |   6 ++--
 usr.sbin/sysinst/partitions.h   |   4 +-
 usr.sbin/sysinst/partman.c      |  50 ++++++++++++++++++------------------
 usr.sbin/sysinst/target.c       |  56 ++++++++++++++++++++--------------------
 usr.sbin/sysinst/txtwalk.c      |   4 +-
 usr.sbin/sysinst/util.c         |  14 +++++-----
 usr.sbin/sysinst/wskbd.c        |   6 ++--
 19 files changed, 134 insertions(+), 135 deletions(-)

diffs (truncated from 1119 to 300 lines):

diff -r 517b55e12334 -r e9888ae536e8 usr.sbin/sysinst/bsddisklabel.c
--- a/usr.sbin/sysinst/bsddisklabel.c   Sun Jan 31 22:19:24 2021 +0000
+++ b/usr.sbin/sysinst/bsddisklabel.c   Sun Jan 31 22:45:46 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsddisklabel.c,v 1.56 2020/10/13 17:26:28 martin Exp $ */
+/*     $NetBSD: bsddisklabel.c,v 1.57 2021/01/31 22:45:46 rillig Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -386,7 +386,7 @@
        struct part_usage_info *p;
        menu_ent *men;
        int num_men, i;
- 
+
        if (!select_partitions(&selected, pm->parts))
                return 0;
 
@@ -625,7 +625,7 @@
 
                if (is_ram_size) {
                        new_size_val = parse_ram_size(answer, &is_percent);
-                       if (is_percent && 
+                       if (is_percent &&
                            (new_size_val < 0 || new_size_val > 100))
                                continue;
                        if (!is_percent && new_size_val < 0)
@@ -1507,7 +1507,7 @@
                        want->cur_part_id = new_part_id;
 
                        want->flags |= PUIFLG_ADD_INNER|PUIFLG_IS_OUTER;
-                       from = roundup(infos[i].start + 
+                       from = roundup(infos[i].start +
                            infos[i].size, outer_align);
                }
        }
@@ -1656,7 +1656,7 @@
                                new_part_id = wanted->parts->pscheme->
                                    add_partition(
                                    wanted->parts, &infos[i], NULL);
-               
+
                        if (new_part_id == NO_PART)
                                continue;       /* failed to add, skip */
                }
@@ -1818,7 +1818,7 @@
                /* calc available disk area for the NetBSD partitions */
                p_start = pm->ptstart;
                p_size = pm->ptsize;
-               if (parts->parent != NULL && 
+               if (parts->parent != NULL &&
                    parts->parent->pscheme->guess_install_target != NULL)
                        parts->parent->pscheme->guess_install_target(
                            parts->parent, &p_start, &p_size);
@@ -1826,7 +1826,7 @@
        if (layoutkind == LY_OTHERSCHEME) {
                parts->pscheme->destroy_part_scheme(parts);
                return -1;
-       } else if (layoutkind == LY_USEDEFAULT) { 
+       } else if (layoutkind == LY_USEDEFAULT) {
                replace_by_default(parts, p_start, p_size,
                    &wanted);
        } else if (layoutkind == LY_SETSIZES) {
@@ -1861,7 +1861,7 @@
                        struct disk_part_info info;
 
                        if (wanted.infos[i].type != PT_root ||
-                           strcmp(wanted.infos[i].mount, "/") != 0) 
+                           strcmp(wanted.infos[i].mount, "/") != 0)
                                continue;
                        wanted.infos[i].cur_flags |= PTI_INSTALL_TARGET;
 
@@ -1900,7 +1900,7 @@
                        daddr_t ps = wanted.infos[i].cur_start;
                        daddr_t pe = ps + wanted.infos[i].size;
                        if (target_start >= 0 &&
-                          (ps >= target_start || pe >= target_start)) 
+                          (ps >= target_start || pe >= target_start))
                                continue;
                        boot_part = i;
                        break;
diff -r 517b55e12334 -r e9888ae536e8 usr.sbin/sysinst/checkrc.c
--- a/usr.sbin/sysinst/checkrc.c        Sun Jan 31 22:19:24 2021 +0000
+++ b/usr.sbin/sysinst/checkrc.c        Sun Jan 31 22:45:46 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: checkrc.c,v 1.2 2019/08/18 11:11:48 martin Exp $ */
+/* $NetBSD: checkrc.c,v 1.3 2021/01/31 22:45:46 rillig Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
 create_script(const char *varname, int filetocheck)
 {
        FILE    *fp;
-       
+
        if ((fp = fopen(target_expand(RC_CHECK_SCRIPT), "w")) == NULL) {
                if (logfp)
                        fprintf(logfp,"Could not open %s for writing",
diff -r 517b55e12334 -r e9888ae536e8 usr.sbin/sysinst/configmenu.c
--- a/usr.sbin/sysinst/configmenu.c     Sun Jan 31 22:19:24 2021 +0000
+++ b/usr.sbin/sysinst/configmenu.c     Sun Jan 31 22:45:46 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: configmenu.c,v 1.11 2019/11/16 20:26:59 martin Exp $ */
+/* $NetBSD: configmenu.c,v 1.12 2021/01/31 22:45:46 rillig Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -206,7 +206,7 @@
 set_root_shell(struct menudesc *menu, void *arg)
 {
        configinfo **confp = arg;
-       
+
        process_menu(MENU_rootsh, &confp[menu->cursel]->setting);
        if (run_program(RUN_PROGRESS | RUN_CHROOT,
                "chpass -s %s root", confp[menu->cursel]->setting) != 0)
@@ -303,7 +303,7 @@
                        confp[menu->cursel]->setting = MSG_abandoned;
                        return 0;
                }
-               
+
                make_url(pkgpath, &pkg, pkg_dir);
                if (run_program(RUN_DISPLAY | RUN_PROGRESS | RUN_CHROOT,
                        "pkg_add %s/pkgin", pkgpath) == 0) {
diff -r 517b55e12334 -r e9888ae536e8 usr.sbin/sysinst/defs.h
--- a/usr.sbin/sysinst/defs.h   Sun Jan 31 22:19:24 2021 +0000
+++ b/usr.sbin/sysinst/defs.h   Sun Jan 31 22:45:46 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.69 2020/11/04 14:29:40 martin Exp $ */
+/*     $NetBSD: defs.h,v 1.70 2021/01/31 22:45:46 rillig Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -157,7 +157,7 @@
     SET_MD_2,          /* Machine dependent set */
     SET_MD_3,          /* Machine dependent set */
     SET_MD_4,          /* Machine dependent set */
-    
+
     /* Source sets */
     SET_SYSSRC,
     SET_SRC,
@@ -382,7 +382,7 @@
 struct install_partition_desc {
        size_t num;                             /* how many entries in infos */
        struct part_usage_info *infos;          /* individual partitions */
-       struct disk_partitions **write_back;    /* partition tables from 
+       struct disk_partitions **write_back;    /* partition tables from
                                                 * which we did delete some
                                                 * partitions and that need
                                                 * updating, even if no
diff -r 517b55e12334 -r e9888ae536e8 usr.sbin/sysinst/disklabel.c
--- a/usr.sbin/sysinst/disklabel.c      Sun Jan 31 22:19:24 2021 +0000
+++ b/usr.sbin/sysinst/disklabel.c      Sun Jan 31 22:45:46 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.c,v 1.42 2020/10/13 17:26:28 martin Exp $    */
+/*     $NetBSD: disklabel.c,v 1.43 2021/01/31 22:45:46 rillig Exp $    */
 
 /*
  * Copyright 2018 The NetBSD Foundation, Inc.
@@ -431,7 +431,7 @@
                            (uint32_t)(lp[i].p_fsize *
                            lp[i].p_frag),
                            'a'+i, (uint32_t)lp[i].p_fsize);
-       
+
                if (i < parts->l.d_npartitions - 1)
                        scripting_fprintf(f, "\\\n");
                else
diff -r 517b55e12334 -r e9888ae536e8 usr.sbin/sysinst/disks.c
--- a/usr.sbin/sysinst/disks.c  Sun Jan 31 22:19:24 2021 +0000
+++ b/usr.sbin/sysinst/disks.c  Sun Jan 31 22:45:46 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disks.c,v 1.71 2020/10/13 17:26:28 martin Exp $ */
+/*     $NetBSD: disks.c,v 1.72 2021/01/31 22:45:46 rillig Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -690,7 +690,7 @@
                            "for partition #%zu\n", p);
                }
        }
-       fprintf(stderr, "%" PRIu64 " sectors free, disk size %" PRIu64 
+       fprintf(stderr, "%" PRIu64 " sectors free, disk size %" PRIu64
            " sectors, %zu partitions used\n", parts->free_space,
            parts->disk_size, parts->num_part);
 }
@@ -710,7 +710,7 @@
 
 
 static void
-convert_copy(struct disk_partitions *old_parts, 
+convert_copy(struct disk_partitions *old_parts,
     struct disk_partitions *new_parts)
 {
        struct disk_part_info oinfo, ninfo;
@@ -1130,7 +1130,7 @@
                fsname = NULL;
 
                if (ptn->size == 0 || parts == NULL|| ptn->type == PT_swap)
-                       continue;                       
+                       continue;
 
                if (parts->pscheme->get_part_device(parts, ptn->cur_part_id,
                    devdev, sizeof devdev, &partno, parent_device_only, false,
@@ -1229,7 +1229,7 @@
                        error = target_mount_do(mnt_opts, devdev,
                            ptn->mount);
                        if (error) {
-                               msg_display_subst(MSG_mountfail, 2, devdev, 
+                               msg_display_subst(MSG_mountfail, 2, devdev,
                                    ptn->mount);
                                hit_enter_to_continue(NULL, NULL);
                                return error;
@@ -2329,7 +2329,7 @@
 
 static int
 cancel_clone(struct menudesc *m, void *arg)
-{      
+{
        struct part_selection_and_all_parts *sel = arg;
 
        sel->cancelled = true;
@@ -2570,7 +2570,7 @@
            raw_dev_name, true, true))
                return false;
 
-       return run_program(RUN_DISPLAY | RUN_PROGRESS, 
+       return run_program(RUN_DISPLAY | RUN_PROGRESS,
            "progress -f %s -b 1m dd bs=1m of=%s",
            src_dev, target_dev) == 0;
 }
diff -r 517b55e12334 -r e9888ae536e8 usr.sbin/sysinst/geom.c
--- a/usr.sbin/sysinst/geom.c   Sun Jan 31 22:19:24 2021 +0000
+++ b/usr.sbin/sysinst/geom.c   Sun Jan 31 22:45:46 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: geom.c,v 1.3 2019/06/21 21:54:39 christos Exp $        */
+/*     $NetBSD: geom.c,v 1.4 2021/01/31 22:45:46 rillig Exp $  */
 
 /*
  * Copyright (c) 1995, 1997 Jason R. Thorpe.
@@ -54,7 +54,7 @@
 
        /* Open the disk. */
        fd = opendisk(disk, O_RDONLY, diskpath, sizeof(diskpath), 0);
-       if (fd == -1) 
+       if (fd == -1)
                return false;
 
        if (ioctl(fd, cmd, d) == -1) {
@@ -101,10 +101,10 @@
 {
        char buf[MAXPATHLEN];
        int fd, error;
-           
+
        if ((fd = opendisk(disk, O_RDONLY, buf, sizeof(buf), 0)) == -1)
                return false;
-  
+
        error = getdiskinfo(disk, fd, NULL, d, NULL);
        close(fd);
        if (error < 0) {
diff -r 517b55e12334 -r e9888ae536e8 usr.sbin/sysinst/gpt.c
--- a/usr.sbin/sysinst/gpt.c    Sun Jan 31 22:19:24 2021 +0000
+++ b/usr.sbin/sysinst/gpt.c    Sun Jan 31 22:45:46 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gpt.c,v 1.22 2020/10/14 04:17:43 martin Exp $  */
+/*     $NetBSD: gpt.c,v 1.23 2021/01/31 22:45:46 rillig Exp $  */
 
 /*
  * Copyright 2018 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
        const char *name;
        uint fstype;
        enum part_type ptype;
-       uint fsflags;   
+       uint fsflags;
 } gpt_fs_types[] = {
        { .name = "ffs",        .fstype = FS_BSDFFS,    .ptype = PT_root,
          .fsflags = GLM_LIKELY_FFS },
@@ -133,7 +133,7 @@
        const char *last_mounted;       /* last mounted if known */
        uint fs_type, fs_sub_type,      /* FS_* and maybe sub type */
            fs_opt1, fs_opt2, fs_opt3;  /* transient file system options */
-       uint gp_flags;  
+       uint gp_flags;
 #define        GPEF_ON_DISK    1               /* This entry exists on-disk */
 #define        GPEF_MODIFIED   2               /* this entry has been changed */
 #define        GPEF_WEDGE      4               /* wedge for this exists */
@@ -299,7 +299,7 @@
        (void)strtok(textbuf, "\n"); /* ignore first line */
        while ((t = strtok(NULL, "\n")) != NULL) {
                i = 0; p_start = 0; p_size = 0; p_index = 0;
-               p_type[0] = 0; 
+               p_type[0] = 0;
                while ((tt = strsep(&t, " \t")) != NULL) {
                        if (strlen(tt) == 0)



Home | Main Index | Thread Index | Old Index