maint: avoid syntax-check failures from recent commits

* cfg.mk: Avoid spellcheck failures.
* src/copy-file-data.c: Avoid sc_tight_scope and long_lines failure.
* src/copy.h: Avoid indentation issues.

diff --git a/cfg.mk b/cfg.mk
index 093305c2b41dfc04266f667265092d2cd8614083..0abb5c2262dbd07eb6336dc0c5e0c7467c19b3a0 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -994,7 +994,7 @@ _gl_TS_dir = .
 _gl_TS_obj_files = src/*.$(OBJEXT)
 # Settings for running codespell.
 csiwl_1 = debbugs,clen,te,bu,shs,linke,fo,souch,inout,outin
-csiwl_2 = kno,ois,afile,whats,hda,indx,ot,nam
+csiwl_2 = kno,ois,afile,whats,hda,indx,ot,nam,ist
 codespell_ignore_words_list = $(csiwl_1),$(csiwl_2)
 exclude_file_name_regexp--sc_codespell = \
   ^(THANKS\.in|tests/pr/.*(F|tn?|l(o|m|i)|bl))$$

diff --git a/src/copy-file-data.c b/src/copy-file-data.c
index dba14d954938073d1d3ab8c2d88efb75a2ced020..44b542de0053c32710d36939409a6ae094a75b9e 100644 (file)
--- a/src/copy-file-data.c
+++ b/src/copy-file-data.c
@@ -512,10 +512,11 @@ infer_scantype (int fd, struct stat const *sb, off_t pos,
    If successful, return the number of bytes copied;
    otherwise, diagnose the error and return -1.  */
 
-intmax_t
+extern intmax_t
 copy_file_data (int ifd, struct stat const *ist, off_t ipos, char const *iname,
                 int ofd, struct stat const *ost, off_t opos, char const *oname,
-                count_t ibytes, struct cp_options const *x, struct copy_debug *debug)
+                count_t ibytes, struct cp_options const *x,
+                struct copy_debug *debug)
 {
   /* Choose a suitable buffer size; it may be adjusted later.  */
   idx_t buf_size = io_blksize (ost);

diff --git a/src/copy.h b/src/copy.h
index 24b5303156375b1767ae79f305e5464c3c96a52a..1f2b2bb4d658538bdf97e1194c6707162823d632 100644 (file)
--- a/src/copy.h
+++ b/src/copy.h
@@ -324,7 +324,7 @@ struct copy_debug
 /* The type of a large counter.  Although it is always nonnegative,
    it is signed to help signed overflow checking catch any bugs.  */
 typedef intmax_t count_t;
-#define COUNT_MAX INTMAX_MAX
+# define COUNT_MAX INTMAX_MAX
 
 bool copy (char const *src_name, char const *dst_name,
            int dst_dirfd, char const *dst_relname,