ncurses 6.0 - patch 20160924

[ncurses.git] / ncurses / tinfo / MKcaptab.sh

diff --git a/ncurses/tinfo/MKcaptab.sh b/ncurses/tinfo/MKcaptab.sh
index 5b8c4bcd0075e6e96964e0885ea1d5882416eabf..20c94a639b9ab96e74a395eee59e812f87e253af 100755 (executable)
--- a/ncurses/tinfo/MKcaptab.sh
+++ b/ncurses/tinfo/MKcaptab.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##############################################################################
 #!/bin/sh
 ##############################################################################

-# Copyright (c) 2007,2009 Free Software Foundation, Inc.                     #
+# Copyright (c) 2007-2010,2011 Free Software Foundation, Inc.                #

 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: MKcaptab.sh,v 1.12 2009/11/14 22:09:55 tom Exp $
+# $Id: MKcaptab.sh,v 1.14 2011/10/22 16:34:50 tom Exp $

 AWK=${1-awk}
 OPT1=${2-0}
 OPT2=${3-tinfo/MKcaptab.awk}
 AWK=${1-awk}
 OPT1=${2-0}
 OPT2=${3-tinfo/MKcaptab.awk}


@@ -65,7 +65,7 @@ cat <<EOF
 static void
 next_string(const char *strings, unsigned *offset)
 {
 static void
 next_string(const char *strings, unsigned *offset)
 {

-    *offset += strlen(strings + *offset) + 1;
+    *offset += (unsigned) strlen(strings + *offset) + 1;

 }
 
 static const struct name_table_entry *
 }
 
 static const struct name_table_entry *


@@ -99,12 +99,12 @@ static const struct alias *
 _nc_build_alias(struct alias **actual,
                const alias_table_data *source,
                const char *strings,
 _nc_build_alias(struct alias **actual,
                const alias_table_data *source,
                const char *strings,

-               unsigned tablesize)
+               size_t tablesize)

 {
     if (*actual == 0) {
        *actual = typeCalloc(struct alias, tablesize + 1);
        if (*actual != 0) {
 {
     if (*actual == 0) {
        *actual = typeCalloc(struct alias, tablesize + 1);
        if (*actual != 0) {

-           unsigned n;
+           size_t n;

            for (n = 0; n < tablesize; ++n) {
                add_alias(from);
                add_alias(to);
            for (n = 0; n < tablesize; ++n) {
                add_alias(from);
                add_alias(to);


@@ -178,7 +178,7 @@ tcap_hash(const char *string)
 static int
 compare_tcap_names(const char *a, const char *b)
 {
 static int
 compare_tcap_names(const char *a, const char *b)
 {

-    return !strncmp(a, b, TCAP_LEN);
+    return !strncmp(a, b, (size_t) TCAP_LEN);

 }
 
 static int
 }
 
 static int