textproc/tcl-expat: fix some pkglint warnings

2 files changed, 24 insertions, 21 deletions

diff --git a/textproc/tcl-expat/distinfo b/textproc/tcl-expat/distinfo
index 95fb865128c..ce592380872 100644
--- a/textproc/tcl-expat/distinfo
+++ b/textproc/tcl-expat/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2015/11/04 02:00:12 agc Exp $
+$NetBSD: distinfo,v 1.10 2020/08/09 22:14:36 rillig Exp $
 
 SHA1 (TclExpat-1.1.tar.gz) = 232bb47305a471dc0f8bc52e684a04b7cf703b80
 RMD160 (TclExpat-1.1.tar.gz) = 2d133137d51ffd0ca7ad638433836f97782b4e29
 SHA512 (TclExpat-1.1.tar.gz) = 0969dd68621a3495510270053974c92877d0354cb1992c9157ade8de0fe7e62f48315dd39cb628da2ad70650a3334da41fb6150edf641e95031a0778fd2ed9a8
 Size (TclExpat-1.1.tar.gz) = 268538 bytes
 SHA1 (patch-aa) = 48873f49c7a0766c0a452c64b7b17434eb4090e3
-SHA1 (patch-ab) = b634ad113025fbbdaef76c82b837a5c769fec8dc
+SHA1 (patch-ab) = d5e8d8382fbc9f540e9cbf6c0b2e1c5415221b31
diff --git a/textproc/tcl-expat/patches/patch-ab b/textproc/tcl-expat/patches/patch-ab
index 20b5d373fdc..281878adcf5 100644
--- a/textproc/tcl-expat/patches/patch-ab
+++ b/textproc/tcl-expat/patches/patch-ab
@@ -1,4 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2020/08/09 22:14:36 rillig Exp $
+
+Add return values for functions.
+
 --- tclexpat.c.orig	1998-08-22 07:35:44.000000000 +0000
 +++ tclexpat.c
 @@ -19,7 +19,8 @@
@@ -11,7 +14,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
  
  /*
   * The structure below is used to refer to an expat parser object.
-@@ -814,12 +814,12 @@ TclExpatElementStartHandler(userData, na
+@@ -814,12 +815,12 @@ TclExpatElementStartHandler(userData, na
       */
  
      expat->continueCount++;
@@ -26,7 +29,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
    }
  
    /*
-@@ -847,18 +847,18 @@ TclExpatElementStartHandler(userData, na
+@@ -847,18 +848,18 @@ TclExpatElementStartHandler(userData, na
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */
@@ -48,7 +51,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
  }
  
  /*
-@@ -894,13 +894,13 @@ TclExpatElementEndHandler(userData, name
+@@ -894,13 +895,13 @@ TclExpatElementEndHandler(userData, name
  
      if (!--(expat->continueCount)) {
        expat->status = TCL_OK;
@@ -64,7 +67,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
    }
  
    /*
-@@ -917,18 +917,18 @@ TclExpatElementEndHandler(userData, name
+@@ -917,18 +918,18 @@ TclExpatElementEndHandler(userData, name
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */
@@ -86,7 +89,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
  }
  
  /*
-@@ -959,7 +959,7 @@ TclExpatCharacterDataHandler(userData, s
+@@ -959,7 +960,7 @@ TclExpatCharacterDataHandler(userData, s
  
    if (expat->datacommand == NULL ||
        expat->status != TCL_OK) {
@@ -95,7 +98,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
    }
  
    /*
-@@ -976,18 +976,18 @@ TclExpatCharacterDataHandler(userData, s
+@@ -976,18 +977,18 @@ TclExpatCharacterDataHandler(userData, s
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */
@@ -117,7 +120,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
  }
  
  /*
-@@ -1018,7 +1018,7 @@ TclExpatProcessingInstructionHandler(use
+@@ -1018,7 +1019,7 @@ TclExpatProcessingInstructionHandler(use
  
    if (expat->picommand == NULL ||
        expat->status != TCL_OK) {
@@ -126,7 +129,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
    }
  
    /*
-@@ -1036,18 +1036,18 @@ TclExpatProcessingInstructionHandler(use
+@@ -1036,18 +1037,18 @@ TclExpatProcessingInstructionHandler(use
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */
@@ -148,7 +151,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
  }
  
  /*
-@@ -1078,7 +1078,7 @@ TclExpatDefaultHandler(userData, s, len)
+@@ -1078,7 +1079,7 @@ TclExpatDefaultHandler(userData, s, len)
  
    if (expat->defaultcommand == NULL ||
        expat->status != TCL_OK) {
@@ -157,7 +160,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
    }
  
    /*
-@@ -1095,18 +1095,18 @@ TclExpatDefaultHandler(userData, s, len)
+@@ -1095,18 +1096,18 @@ TclExpatDefaultHandler(userData, s, len)
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */
@@ -179,7 +182,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
  }
  
  /*
-@@ -1140,7 +1140,7 @@ TclExpatUnparsedDeclHandler(userData, en
+@@ -1140,7 +1141,7 @@ TclExpatUnparsedDeclHandler(userData, en
  
    if (expat->unparsedcommand == NULL ||
        expat->status != TCL_OK) {
@@ -188,7 +191,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
    }
  
    /*
-@@ -1169,18 +1169,18 @@ TclExpatUnparsedDeclHandler(userData, en
+@@ -1169,18 +1170,18 @@ TclExpatUnparsedDeclHandler(userData, en
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */
@@ -210,7 +213,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
  }
  
  /*
-@@ -1213,7 +1213,7 @@ TclExpatNotationDeclHandler(userData, no
+@@ -1213,7 +1214,7 @@ TclExpatNotationDeclHandler(userData, no
  
    if (expat->notationcommand == NULL ||
        expat->status != TCL_OK) {
@@ -219,7 +222,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
    }
  
    /*
-@@ -1241,18 +1241,18 @@ TclExpatNotationDeclHandler(userData, no
+@@ -1241,18 +1242,18 @@ TclExpatNotationDeclHandler(userData, no
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */
@@ -241,7 +244,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
  }
  
  /*
-@@ -1287,7 +1287,7 @@ TclExpatUnknownEncodingHandler(encodingH
+@@ -1287,7 +1288,7 @@ TclExpatUnknownEncodingHandler(encodingH
  
    if (expat->unknownencodingcommand == NULL ||
        expat->status != TCL_OK) {
@@ -250,7 +253,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
    }
  
    /*
-@@ -1306,18 +1306,18 @@ TclExpatUnknownEncodingHandler(encodingH
+@@ -1306,18 +1307,18 @@ TclExpatUnknownEncodingHandler(encodingH
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */
@@ -272,7 +275,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
  }
  
  /*
-@@ -1350,7 +1350,7 @@ TclExpatExternalEntityRefHandler(parser,
+@@ -1350,7 +1351,7 @@ TclExpatExternalEntityRefHandler(parser,
  
    if (expat->externalentitycommand == NULL ||
        expat->status != TCL_OK) {
@@ -281,7 +284,7 @@ $NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
    }
  
    /*
-@@ -1370,18 +1370,18 @@ TclExpatExternalEntityRefHandler(parser,
+@@ -1370,18 +1371,18 @@ TclExpatExternalEntityRefHandler(parser,
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */