Wrap the source code at 80 characters. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2172516 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- common/utils/utils.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/utils/utils.h b/common/utils/utils.h index 31ae73f71d66..42288a5cd422 100644 --- a/common/utils/utils.h +++ b/common/utils/utils.h @@ -41,6 +41,7 @@ extern int set_nonblock (int fd); extern char **copy_environ (char **env, ...) __attribute__ ((__sentinel__)); extern char *make_temporary_directory (void); extern ssize_t full_pread (int fd, void *buf, size_t count, off_t offset); -extern ssize_t full_pwrite (int fd, const void *buf, size_t count, off_t offset); +extern ssize_t full_pwrite (int fd, const void *buf, size_t count, + off_t offset); #endif /* NBDKIT_UTILS_H */

Wrap the source code at 80 characters. Tested with: $ nbdkit null --filter=cache cache-min-block-size=3 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2172516 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- filters/cache/cache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/filters/cache/cache.c b/filters/cache/cache.c index c379f1005754..b5486060b812 100644 --- a/filters/cache/cache.c +++ b/filters/cache/cache.c @@ -119,7 +119,8 @@ cache_config (nbdkit_next_config *next, nbdkit_backend *nxdata, if (r == -1) return -1; if (r < 4096 || !is_power_of_2 (r) || r > UINT_MAX) { - nbdkit_error ("cache-min-block-size is not a power of 2, or is too small or too large"); + nbdkit_error ("cache-min-block-size is not a power of 2, or is too small " + "or too large"); return -1; } min_block_size = r;

Wrap the source code at 80 characters. Align the backslashes in "ext2_config_help". Tested with: $ nbdkit null --filter=ext2 --help Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2172516 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- filters/ext2/ext2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/filters/ext2/ext2.c b/filters/ext2/ext2.c index f9858ca40d15..cff5dad789d8 100644 --- a/filters/ext2/ext2.c +++ b/filters/ext2/ext2.c @@ -96,9 +96,9 @@ ext2_config_complete (nbdkit_next_config_complete *next, nbdkit_backend *nxdata) return next (nxdata); } -#define ext2_config_help \ - "ext2file=<FILENAME> (required) Absolute name of file to serve inside the\n" \ - " disk image, or 'exportname' for client choice." +#define ext2_config_help \ + "ext2file=<FILENAME> (required) Absolute name of file to serve inside\n" \ + " the disk image, or 'exportname' for client choice." /* The per-connection handle. */ struct handle {

Wrap the source code at 80 characters. Align the backslashes in "noparallel_config_help". Tested with: $ nbdkit null --filter=noparallel --help Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2172516 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- filters/noparallel/noparallel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/filters/noparallel/noparallel.c b/filters/noparallel/noparallel.c index 9c871d37aa07..58b3d0a981ff 100644 --- a/filters/noparallel/noparallel.c +++ b/filters/noparallel/noparallel.c @@ -63,8 +63,9 @@ noparallel_config (nbdkit_next_config *next, nbdkit_backend *nxdata, return next (nxdata, key, value); } -#define noparallel_config_help \ - "serialize=<MODE> 'requests' (default), 'all-requests', or 'connections'.\n" \ +#define noparallel_config_help \ + "serialize=<MODE> 'requests' (default), 'all-requests', or\n" \ + " 'connections'.\n" \ /* Apply runtime reduction to thread model. */ static int

Wrap the source code at 80 characters. Tested with: $ nbdkit null --filter=partition Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2172516 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- filters/partition/partition.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/filters/partition/partition.c b/filters/partition/partition.c index b206f48c8670..c29b14bc327c 100644 --- a/filters/partition/partition.c +++ b/filters/partition/partition.c @@ -72,7 +72,8 @@ partition_config_complete (nbdkit_next_config_complete *next, nbdkit_backend *nxdata) { if (partnum == 0) { - nbdkit_error ("you must supply the partition parameter on the command line"); + nbdkit_error ("you must supply the partition parameter on the command " + "line"); return -1; }

Wrap the source code at 80 characters. In the create_virtual_floppy() function, we have a complex calculation that is not really possible to squeeze under 80 characters in width, without extracting part of it to a local variable. The problem is *naming* the new variable, plus the *type* of the new variable. By inspecting the rest of the function, I decided that the expression being extracted, namely DIV_ROUND_UP ((data_size / CLUSTER_SIZE + 2) * 4, CLUSTER_SIZE) should be called "fat_clusters". The rest of the function calculates the same quantity, only in multiple steps; the result is then assigned to "floppy->fat_clusters". Regarding the type of the new local variable: "data_size" is "uint64_t", and everything else in the expression is "int", so the result is "uint64_t" as well, in practice. Shorten the original assignment by using compound assignment, as well. Note that this patch is untested. In "make check", "tests/test-floppy.sh" passes. However, that test does not seem to pass the "size=..." option to the plugin, and the code being modified in create_virtual_floppy() is related to "size=..." -- at least it originates from commit c6d6113fa1f3 ("floppy: support FAT FSes with unused space.", 2021-06-16). Cc: Nolan Leake <nolan(a)sigbus.net&gt; Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2172516 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- Notes: context:-W plugins/floppy/directory-lfn.c | 13 +++++++++---- plugins/floppy/virtual-floppy.c | 19 +++++++++++++------ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/plugins/floppy/directory-lfn.c b/plugins/floppy/directory-lfn.c index aa9b38bac755..afa5e4cfef36 100644 --- a/plugins/floppy/directory-lfn.c +++ b/plugins/floppy/directory-lfn.c @@ -63,15 +63,20 @@ struct lfn { size_t lfn_size; /* Size *in bytes* of lfn. */ }; -static int add_volume_label (const char *label, size_t di, struct virtual_floppy *floppy); +static int add_volume_label (const char *label, size_t di, + struct virtual_floppy *floppy); static int add_dot_entries (size_t di, struct virtual_floppy *floppy); -static int add_directory_entry (const struct lfn *lfn, uint8_t attributes, uint32_t file_size, struct stat *statbuf, size_t di, struct virtual_floppy *floppy); +static int add_directory_entry (const struct lfn *lfn, uint8_t attributes, + uint32_t file_size, struct stat *statbuf, + size_t di, struct virtual_floppy *floppy); static uint8_t lfn_checksum (const struct lfn *lfn); static void set_times (const struct stat *statbuf, struct dir_entry *entry); static int convert_long_file_names (struct lfn *lfns, size_t n); -static int convert_to_utf16le (const char *name, char **out, size_t *output_len); +static int convert_to_utf16le (const char *name, char **out, + size_t *output_len); static void free_lfns (struct lfn *lfns, size_t n); -static ssize_t append_dir_table (size_t di, const struct dir_entry *entry, struct virtual_floppy *floppy); +static ssize_t append_dir_table (size_t di, const struct dir_entry *entry, + struct virtual_floppy *floppy); /* Create the on disk directory table for dirs[di]. */ int diff --git a/plugins/floppy/virtual-floppy.c b/plugins/floppy/virtual-floppy.c index 2a6871bce6be..6d2f49adb2f0 100644 --- a/plugins/floppy/virtual-floppy.c +++ b/plugins/floppy/virtual-floppy.c @@ -61,14 +61,20 @@ #define OEM_NAME "MSWIN4.1" static ssize_t visit (const char *dir, struct virtual_floppy *floppy); -static int visit_subdirectory (const char *dir, const char *name, const struct stat *statbuf, size_t di, struct virtual_floppy *floppy); -static int visit_file (const char *dir, const char *name, const struct stat *statbuf, size_t di, struct virtual_floppy *floppy); +static int visit_subdirectory (const char *dir, const char *name, + const struct stat *statbuf, size_t di, + struct virtual_floppy *floppy); +static int visit_file (const char *dir, const char *name, + const struct stat *statbuf, size_t di, + struct virtual_floppy *floppy); static int create_mbr (struct virtual_floppy *floppy); static void chs_too_large (uint8_t *out); -static int create_partition_boot_sector (const char *label, struct virtual_floppy *floppy); +static int create_partition_boot_sector (const char *label, + struct virtual_floppy *floppy); static int create_fsinfo (struct virtual_floppy *floppy); static int create_fat (struct virtual_floppy *floppy); -static void write_fat_file (uint32_t first_cluster, uint32_t nr_clusters, struct virtual_floppy *floppy); +static void write_fat_file (uint32_t first_cluster, uint32_t nr_clusters, + struct virtual_floppy *floppy); static int create_regions (struct virtual_floppy *floppy); void @@ -88,135 +94,136 @@ int create_virtual_floppy (const char *dir, const char *label, uint64_t size, struct virtual_floppy *floppy) { size_t i; uint64_t nr_bytes, nr_clusters; uint64_t data_used_size; uint32_t cluster; if (visit (dir, floppy) == -1) return -1; nbdkit_debug ("floppy: %zu directories and %zu files", floppy->dirs.len, floppy->files.len); /* Create the on disk directory tables. */ for (i = 0; i < floppy->dirs.len; ++i) { if (create_directory (i, label, floppy) == -1) return -1; } /* We now have a complete list of directories and files, and * directories have been converted to on disk directory tables. So * we can assign them to clusters and also precisely calculate the * size of the data region and hence the size of the FAT. * * The first cluster number is always 2 (0 and 1 are reserved), and * (in this implementation) always contains the root directory. */ data_used_size = 0; cluster = 2; for (i = 0; i < floppy->dirs.len; ++i) { floppy->dirs.ptr[i].first_cluster = cluster; nr_bytes = ROUND_UP (floppy->dirs.ptr[i].table.len * sizeof (struct dir_entry), CLUSTER_SIZE); data_used_size += nr_bytes; nr_clusters = nr_bytes / CLUSTER_SIZE; if (cluster + nr_clusters > UINT32_MAX) goto too_big; floppy->dirs.ptr[i].nr_clusters = nr_clusters; cluster += nr_clusters; } for (i = 0; i < floppy->files.len; ++i) { floppy->files.ptr[i].first_cluster = cluster; nr_bytes = ROUND_UP (floppy->files.ptr[i].statbuf.st_size, CLUSTER_SIZE); data_used_size += nr_bytes; nr_clusters = nr_bytes / CLUSTER_SIZE; if (cluster + nr_clusters > UINT32_MAX) goto too_big; floppy->files.ptr[i].nr_clusters = nr_clusters; cluster += nr_clusters; } if (size > 0) { uint64_t data_size = size - (2080 * SECTOR_SIZE); - data_size = data_size - 2 * DIV_ROUND_UP ((data_size / CLUSTER_SIZE + 2) * 4, - CLUSTER_SIZE) * CLUSTER_SIZE; + uint64_t fat_clusters = DIV_ROUND_UP ((data_size / CLUSTER_SIZE + 2) * 4, + CLUSTER_SIZE); + data_size -= 2 * fat_clusters * CLUSTER_SIZE; if (data_used_size > data_size) { nbdkit_error ("filesystem is larger than \"size\" bytes"); return -1; } floppy->data_size = data_size; } else { floppy->data_size = data_used_size; } floppy->data_clusters = floppy->data_size / CLUSTER_SIZE; floppy->data_used_clusters = data_used_size / CLUSTER_SIZE; /* Despite its name, FAT32 only allows 28 bit cluster numbers, so * give an error if we go beyond this. */ if (floppy->data_clusters >= 0x10000000) { too_big: nbdkit_error ("disk image is too large for the FAT32 disk format"); return -1; } nbdkit_debug ("floppy: %" PRIu64 " data clusters, " "largest cluster number %" PRIu32 ", " "%" PRIu64 " bytes", floppy->data_clusters, cluster-1, floppy->data_size); floppy->fat_entries = floppy->data_clusters + 2; floppy->fat_clusters = DIV_ROUND_UP (floppy->fat_entries * 4, CLUSTER_SIZE); nbdkit_debug ("floppy: %" PRIu64 " FAT entries", floppy->fat_entries); /* We can now decide where we will place the FATs and data region on disk. */ floppy->fat2_start_sector = 2080 + floppy->fat_clusters * SECTORS_PER_CLUSTER; floppy->data_start_sector = floppy->fat2_start_sector + floppy->fat_clusters * SECTORS_PER_CLUSTER; floppy->data_last_sector = floppy->data_start_sector + floppy->data_clusters * SECTORS_PER_CLUSTER - 1; /* We now have to go back and update the cluster numbers in the * directory entries (which we didn't have available during * create_directory above). */ for (i = 0; i < floppy->dirs.len; ++i) { if (update_directory_first_cluster (i, floppy) == -1) return -1; } /* Create MBR. */ if (create_mbr (floppy) == -1) return -1; /* Create partition first sector. */ if (create_partition_boot_sector (label, floppy) == -1) return -1; /* Create filesystem information sector. */ if (create_fsinfo (floppy) == -1) return -1; /* Allocate and populate FAT. */ if (create_fat (floppy) == -1) return -1; /* Now we know how large everything is we can create the virtual * disk regions. */ if (create_regions (floppy) == -1) return -1; /* Check that if a size was specified, we ended up with it. */ if (size > 0) assert (virtual_size (&floppy->regions) == size); return 0; }

Wrap the source code at 80 characters. Align the backslashes in "nbdplug_config_help". Tested with: $ nbdkit nbd --help Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2172516 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- plugins/nbd/nbd.c | 41 +++++++++++--------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/plugins/nbd/nbd.c b/plugins/nbd/nbd.c index 55a7f289ec24..febb985612e8 100644 --- a/plugins/nbd/nbd.c +++ b/plugins/nbd/nbd.c @@ -379,25 +379,30 @@ nbdplug_after_fork (void) return 0; } -#define nbdplug_config_help \ - "[uri=]<URI> URI of an NBD socket to connect to (if supported).\n" \ - "socket=<SOCKNAME> The Unix socket to connect to.\n" \ +#define nbdplug_config_help \ + "[uri=]<URI> URI of an NBD socket to connect to (if\n" \ + " supported).\n" \ + "socket=<SOCKNAME> The Unix socket to connect to.\n" \ "hostname=<HOST> The hostname for the TCP socket to connect to.\n" \ - "port=<PORT> TCP/VSOCK port or service name to use (default 10809).\n" \ - "vsock=<CID> The cid for the VSOCK socket to connect to.\n" \ - "command=<COMMAND> Command to run.\n" \ - "arg=<ARG> Parameters for command.\n" \ - "socket-fd=<FD> Socket file descriptor to connect to.\n" \ - "export=<NAME> Export name to connect to (default \"\").\n" \ - "dynamic-export=<BOOL> True to enable export name pass-through.\n" \ - "retry=<N> Retry connection up to N seconds (default 0).\n" \ - "shared=<BOOL> True to share one server connection among all clients,\n" \ - " rather than a connection per client (default false).\n" \ - "tls=<MODE> How to use TLS; one of 'off', 'on', or 'require'.\n" \ - "tls-certificates=<DIR> Directory containing files for X.509 certificates.\n" \ - "tls-verify=<BOOL> True (default for X.509) to validate server.\n" \ - "tls-username=<NAME> Override username presented in X.509 TLS.\n" \ - "tls-psk=<FILE> File containing Pre-Shared Key for TLS.\n" \ + "port=<PORT> TCP/VSOCK port or service name to use (default\n" \ + " 10809).\n" \ + "vsock=<CID> The cid for the VSOCK socket to connect to.\n" \ + "command=<COMMAND> Command to run.\n" \ + "arg=<ARG> Parameters for command.\n" \ + "socket-fd=<FD> Socket file descriptor to connect to.\n" \ + "export=<NAME> Export name to connect to (default \"\").\n" \ + "dynamic-export=<BOOL> True to enable export name pass-through.\n" \ + "retry=<N> Retry connection up to N seconds (default 0).\n" \ + "shared=<BOOL> True to share one server connection among all\n" \ + " clients, rather than a connection per client\n" \ + " (default false).\n" \ + "tls=<MODE> How to use TLS; one of 'off', 'on', or\n" \ + " 'require'.\n" \ + "tls-certificates=<DIR> Directory containing files for X.509\n" \ + " certificates.\n" \ + "tls-verify=<BOOL> True (default for X.509) to validate server.\n" \ + "tls-username=<NAME> Override username presented in X.509 TLS.\n" \ + "tls-psk=<FILE> File containing Pre-Shared Key for TLS.\n" \ static void nbdplug_dump_plugin (void)

Wrap the source code at 80 characters -- as widely as possible. We're still left with a stackoverflow link, embedded in a comment: https://stackoverflow.com/questions/11086549/how-to-rb-protect-everything... that makes the total width of "plugins/ruby/ruby.c" 87 characters. (But that's just one line.) Tested with: $ nbdkit ruby Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2172516 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- plugins/ruby/ruby.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/ruby/ruby.c b/plugins/ruby/ruby.c index 175a4cf6eed6..d37b6061ef4e 100644 --- a/plugins/ruby/ruby.c +++ b/plugins/ruby/ruby.c @@ -199,7 +199,8 @@ plugin_rb_config (const char *key, const char *value) int state; if (strcmp (key, "script") != 0) { - nbdkit_error ("the first parameter must be script=/path/to/ruby/script.rb"); + nbdkit_error ("the first parameter must be " + "script=/path/to/ruby/script.rb"); return -1; } script = value;

Wrap the source code at 80 characters -- as widely as possible. We're still left with a link, embedded in a comment: https://code.vmware.com/docs/11750/virtual-disk-development-kit-programmi... that makes the total width of "plugins/vddk/vddk.c" 131 characters. (But that's just one line.) Tested with: $ truncate -s 1G f (1) $ nbdkit vddk file=f (2) pushd $HOME/tmp/vddk-5.1.1/vmware-vix-disklib-distrib/lib64 ln -s libvixDiskLib.so.5 libvixDiskLib.so.8 popd nbdkit vddk file=f libdir=$HOME/tmp/vddk-5.1.1/vmware-vix-disklib-distrib (3) $ nbdkit vddk file=f create=true (4) $ nbdkit vddk file=f create=true create-size=1 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2172516 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- plugins/vddk/vddk.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/vddk/vddk.c b/plugins/vddk/vddk.c index 1233c84eed0f..df69059d4218 100644 --- a/plugins/vddk/vddk.c +++ b/plugins/vddk/vddk.c @@ -205,7 +205,8 @@ vddk_config (const char *key, const char *value) if (r64 == -1) return -1; if (r64 <= 0 || (r64 & 511) != 0) { - nbdkit_error ("create-size must be greater than zero and a multiple of 512"); + nbdkit_error ("create-size must be greater than zero and a multiple of " + "512"); return -1; } create_size = r64; @@ -361,7 +362,8 @@ vddk_config_complete (void) } if (create_size == 0) { - nbdkit_error ("if using create=true you must specify the size using the create-size parameter"); + nbdkit_error ("if using create=true you must specify the size using the " + "create-size parameter"); return -1; } } @@ -382,7 +384,8 @@ missing_required_symbol (const char *fn) { nbdkit_error ("required VDDK symbol \"%s\" is missing. " "VDDK version must be >= 6.5. " - "See nbdkit-vddk-plugin(1) man page section \"SUPPORTED VERSIONS OF VDDK\". " + "See nbdkit-vddk-plugin(1) man page " + "section \"SUPPORTED VERSIONS OF VDDK\". " "Original dlopen error: %s\n", fn, dlerror ()); exit (EXIT_FAILURE); @@ -455,7 +458,8 @@ load_library (bool load_error_is_fatal) nbdkit_error ("%s\n\n" "If '%s' is located on a non-standard path you may need to\n" "set libdir=/path/to/vmware-vix-disklib-distrib.\n\n" - "See nbdkit-vddk-plugin(1) man page section \"LIBRARY LOCATION\" for details.", + "See nbdkit-vddk-plugin(1) man page " + "section \"LIBRARY LOCATION\" for details.", orig_error ? : "(unknown error)", libs[0].soname); exit (EXIT_FAILURE); }