CVS commit: pkgsrc/textproc/scdoc

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Jul  2 12:04:38 UTC 2024

Modified Files:
        pkgsrc/textproc/scdoc: distinfo
        pkgsrc/textproc/scdoc/patches: patch-src_string.c

Log Message:
scdoc: satisfy -Werror=calloc-transposed-args (a silly GCC 14 invention)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/scdoc/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/scdoc/patches/patch-src_string.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/scdoc/distinfo
diff -u pkgsrc/textproc/scdoc/distinfo:1.5 pkgsrc/textproc/scdoc/distinfo:1.6
--- pkgsrc/textproc/scdoc/distinfo:1.5  Tue Jan  2 17:57:28 2024
+++ pkgsrc/textproc/scdoc/distinfo      Tue Jul  2 12:04:37 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2024/01/02 17:57:28 schmonz Exp $
+$NetBSD: distinfo,v 1.6 2024/07/02 12:04:37 tnn Exp $
 
 BLAKE2s (scdoc-1.10.1.tar.gz) = 844030c009ec4b928ac434be87aecd0393bec6be913664a77e02b33d7afd718a
 SHA512 (scdoc-1.10.1.tar.gz) = 2b6f86263aa7d2f3b08e00772446f8ae067178b8c4ed6d53cb0ed75a8326eb96288813af5faa403a2fbcbfca131adf6e2ca614bcac90c6c3bf979b6c15ec21ad
 Size (scdoc-1.10.1.tar.gz) = 12447 bytes
 SHA1 (patch-Makefile) = db6776d997201358c442277f8ca07ee4858e6697
 SHA1 (patch-include_str.h) = 1fc9ea0660a25eb3327ba61783c8c78cb647ce52
-SHA1 (patch-src_string.c) = ee04f0a2cf8ed3a6f430b6ed4a082c26ab9e8414
+SHA1 (patch-src_string.c) = 08cfc3aebf28af1c904fcf443559eceb54f625b7

Index: pkgsrc/textproc/scdoc/patches/patch-src_string.c
diff -u pkgsrc/textproc/scdoc/patches/patch-src_string.c:1.1 pkgsrc/textproc/scdoc/patches/patch-src_string.c:1.2
--- pkgsrc/textproc/scdoc/patches/patch-src_string.c:1.1        Tue Jan  2 17:57:29 2024
+++ pkgsrc/textproc/scdoc/patches/patch-src_string.c    Tue Jul  2 12:04:37 2024
@@ -1,15 +1,18 @@
-$NetBSD: patch-src_string.c,v 1.1 2024/01/02 17:57:29 schmonz Exp $
+$NetBSD: patch-src_string.c,v 1.2 2024/07/02 12:04:37 tnn Exp $
 
 Satisfy -Wstrict-prototypes to fix at least macOS build.
+Satisfy -Werror=calloc-transposed-args (GCC 14)
 
 --- src/string.c.orig  2020-02-14 21:38:03.000000000 +0000
 +++ src/string.c
-@@ -15,7 +15,7 @@ static int ensure_capacity(struct str *s
+@@ -15,8 +15,8 @@ static int ensure_capacity(struct str *s
        return 1;
  }
  
 -struct str *str_create() {
+-      struct str *str = calloc(sizeof(struct str), 1);
 +struct str *str_create(void) {
-       struct str *str = calloc(sizeof(struct str), 1);
++      struct str *str = calloc(1, sizeof(struct str));
        str->str = malloc(16);
        str->size = 16;
+       str->len = 0;