ncurses 5.9 - patch 20140927

[ncurses.git] / progs / infocmp.c

diff --git a/progs/infocmp.c b/progs/infocmp.c
index fc57c15502f6a9ed080882dc8b69e987de7c3828..587cbc3449beee64f18cbc787b21bc8a3c592387 100644 (file)
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2014 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            *
@@ -42,7 +42,7 @@
 
 #include <dump_entry.h>
 
-MODULE_ID("$Id: infocmp.c,v 1.127 2013/11/16 20:26:09 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.129 2014/02/01 22:11:03 tom Exp $")
 
 #define L_CURL "{"
 #define R_CURL "}"
@@ -818,7 +818,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
                if (_nc_capcmp(cp, buf2))
                    continue;
 
-#define ISRS(s)        (!strncmp((s), "is", 2) || !strncmp((s), "rs", 2))
+#define ISRS(s)        (!strncmp((s), "is", (size_t) 2) || !strncmp((s), "rs", (size_t) 2))
                /*
                 * Theoretically we just passed the test for translation
                 * (equality once the padding is stripped).  However, there
@@ -858,7 +858,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
        /* now check for standard-mode sequences */
        if (!expansion
            && (csi = skip_csi(sp)) != 0
-           && (len = strspn(sp + csi, "0123456789;"))
+           && (len = (strspn) (sp + csi, "0123456789;"))
            && (len < sizeof(buf3))
            && (next = (size_t) csi + len)
            && ((sp[next] == 'h') || (sp[next] == 'l'))) {
@@ -879,7 +879,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
        if (!expansion
            && (csi = skip_csi(sp)) != 0
            && sp[csi] == '?'
-           && (len = strspn(sp + csi + 1, "0123456789;"))
+           && (len = (strspn) (sp + csi + 1, "0123456789;"))
            && (len < sizeof(buf3))
            && (next = (size_t) csi + 1 + len)
            && ((sp[next] == 'h') || (sp[next] == 'l'))) {
@@ -899,7 +899,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
        /* now check for ECMA highlight sequences */
        if (!expansion
            && (csi = skip_csi(sp)) != 0
-           && (len = strspn(sp + csi, "0123456789;")) != 0
+           && (len = (strspn) (sp + csi, "0123456789;")) != 0
            && (len < sizeof(buf3))
            && (next = (size_t) csi + len)
            && sp[next] == 'm') {