ncurses 5.9 - patch 20110730

[ncurses.git] / ncurses / tinfo / lib_tparm.c

diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index d763ab9b540e09f456d673a920f48bc5ff0ef8ad..b1d79248d0fdbfb03914a1ffb3fb0d00893633be 100644 (file)
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-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            *
@@ -42,7 +42,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tparm.c,v 1.78 2010/01/09 19:52:08 tom Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.83 2011/05/21 18:11:56 tom Exp $")
 
 /*
  *     char *
@@ -139,7 +139,7 @@ save_text(const char *fmt, const char *s, int len)
 {
     size_t s_len = strlen(s);
     if (len > (int) s_len)
-       s_len = len;
+       s_len = (size_t) len;
 
     get_space(s_len + 1);
 
@@ -454,8 +454,9 @@ tparam_internal(bool use_TPARM_ARG, const char *string, va_list ap)
 {
     char *p_is_s[NUM_PARM];
     TPARM_ARG param[NUM_PARM];
-    int popcount;
+    int popcount = 0;
     int number;
+    int num_args;
     int len;
     int level;
     int x, y;
@@ -478,7 +479,13 @@ tparam_internal(bool use_TPARM_ARG, const char *string, va_list ap)
     if (TPS(fmt_buff) == 0)
        return NULL;
 
-    for (i = 0; i < max(popcount, number); i++) {
+    if (number > NUM_PARM)
+       number = NUM_PARM;
+    if (popcount > NUM_PARM)
+       popcount = NUM_PARM;
+    num_args = max(popcount, number);
+
+    for (i = 0; i < num_args; i++) {
        /*
         * A few caps (such as plab_norm) have string-valued parms.
         * We'll have to assume that the caller knows the difference, since
@@ -488,6 +495,7 @@ tparam_internal(bool use_TPARM_ARG, const char *string, va_list ap)
         */
        if (p_is_s[i] != 0) {
            p_is_s[i] = va_arg(ap, char *);
+           param[i] = 0;
        } else if (use_TPARM_ARG) {
            param[i] = va_arg(ap, TPARM_ARG);
        } else {
@@ -509,16 +517,16 @@ tparam_internal(bool use_TPARM_ARG, const char *string, va_list ap)
            if (p_is_s[i])
                spush(p_is_s[i]);
            else
-               npush(param[i]);
+               npush((int) param[i]);
        }
     }
 #ifdef TRACE
     if (USE_TRACEF(TRACE_CALLS)) {
-       for (i = 0; i < popcount; i++) {
+       for (i = 0; i < num_args; i++) {
            if (p_is_s[i] != 0)
                save_text(", %s", _nc_visbuf(p_is_s[i]), 0);
            else
-               save_number(", %d", param[i], 0);
+               save_number(", %d", (int) param[i], 0);
        }
        _tracef(T_CALLED("%s(%s%s)"), TPS(tname), _nc_visbuf(cp), TPS(out_buff));
        TPS(out_used) = 0;
@@ -565,7 +573,7 @@ tparam_internal(bool use_TPARM_ARG, const char *string, va_list ap)
                    if (p_is_s[i])
                        spush(p_is_s[i]);
                    else
-                       npush(param[i]);
+                       npush((int) param[i]);
                }
                break;