ncurses 5.9 - patch 20110521

[ncurses.git] / progs / tic.c

diff --git a/progs/tic.c b/progs/tic.c
index 8e89095fc67637076289c15ec71b385d1adafd31..739e7ed71ac4aa7fab979c6fdca22d176391e4a8 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -44,7 +44,7 @@
 #include <dump_entry.h>
 #include <transform.h>
 
 #include <dump_entry.h>
 #include <transform.h>
 

-MODULE_ID("$Id: tic.c,v 1.147 2011/02/12 18:39:08 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.150 2011/05/21 18:15:45 tom Exp $")

 
 const char *_nc_progname = "tic";
 
 
 const char *_nc_progname = "tic";
 


@@ -221,7 +221,7 @@ write_it(ENTRY * ep)
     }
 
     _nc_set_type(_nc_first_name(ep->tterm.term_names));
     }
 
     _nc_set_type(_nc_first_name(ep->tterm.term_names));

-    _nc_curr_line = ep->startline;
+    _nc_curr_line = (int) ep->startline;

     _nc_write_entry(&ep->tterm);
 }
 
     _nc_write_entry(&ep->tterm);
 }
 


@@ -339,23 +339,23 @@ put_translate(int c)
 static char *
 stripped(char *src)
 {
 static char *
 stripped(char *src)
 {

+    char *dst = 0;
+

     while (isspace(UChar(*src)))
        src++;
     while (isspace(UChar(*src)))
        src++;

+

     if (*src != '\0') {
     if (*src != '\0') {

-       char *dst;

        size_t len;
 
        size_t len;
 

-       if ((dst = strdup(src)) == NULL)
+       if ((dst = strdup(src)) == NULL) {

            failed("strdup");
            failed("strdup");

-
-       assert(dst != 0);
-
-       len = strlen(dst);
-       while (--len != 0 && isspace(UChar(dst[len])))
-           dst[len] = '\0';
-       return dst;
+       } else {
+           len = strlen(dst);
+           while (--len != 0 && isspace(UChar(dst[len])))
+               dst[len] = '\0';
+       }

     }
     }

-    return 0;
+    return dst;

 }
 
 static FILE *
 }
 
 static FILE *


@@ -475,7 +475,8 @@ int
 main(int argc, char *argv[])
 {
     char my_tmpname[PATH_MAX];
 main(int argc, char *argv[])
 {
     char my_tmpname[PATH_MAX];

-    int v_opt = -1, debug_level;
+    int v_opt = -1;
+    unsigned debug_level;

     int smart_defaults = TRUE;
     char *termcap;
     ENTRY *qp;
     int smart_defaults = TRUE;
     char *termcap;
     ENTRY *qp;


@@ -618,7 +619,7 @@ main(int argc, char *argv[])
        last_opt = this_opt;
     }
 
        last_opt = this_opt;
     }
 

-    debug_level = (v_opt > 0) ? v_opt : (v_opt == 0);
+    debug_level = (unsigned) ((v_opt > 0) ? v_opt : (v_opt == 0));

     set_trace_level(debug_level);
 
     if (_nc_tracing) {
     set_trace_level(debug_level);
 
     if (_nc_tracing) {


@@ -750,7 +751,7 @@ main(int argc, char *argv[])
 
            for_entry_list(qp) {
                if (matches(namelst, qp->tterm.term_names)) {
 
            for_entry_list(qp) {
                if (matches(namelst, qp->tterm.term_names)) {

-                   int j = qp->cend - qp->cstart;
+                   long j = qp->cend - qp->cstart;

                    int len = 0;
 
                    /* this is in case infotocap() generates warnings */
                    int len = 0;
 
                    /* this is in case infotocap() generates warnings */


@@ -767,7 +768,7 @@ main(int argc, char *argv[])
                    repair_acsc(&qp->tterm);
                    dump_entry(&qp->tterm, suppress_untranslatable,
                               limited, numbers, NULL);
                    repair_acsc(&qp->tterm);
                    dump_entry(&qp->tterm, suppress_untranslatable,
                               limited, numbers, NULL);

-                   for (j = 0; j < (int) qp->nuses; j++)
+                   for (j = 0; j < (long) qp->nuses; j++)

                        dump_uses(qp->uses[j].name, !capdump);
                    len = show_entry();
                    if (debug_level != 0 && !limited)
                        dump_uses(qp->uses[j].name, !capdump);
                    len = show_entry();
                    if (debug_level != 0 && !limited)


@@ -915,18 +916,18 @@ keypad_final(const char *string)
     return result;
 }
 
     return result;
 }
 

-static int
+static long

 keypad_index(const char *string)
 {
     char *test;
     const char *list = "PQRSwxymtuvlqrsPpn";   /* app-keypad except "Enter" */
     int ch;
 keypad_index(const char *string)
 {
     char *test;
     const char *list = "PQRSwxymtuvlqrsPpn";   /* app-keypad except "Enter" */
     int ch;

-    int result = -1;
+    long result = -1;

 
     if ((ch = keypad_final(string)) != '\0') {
        test = strchr(list, ch);
        if (test != 0)
 
     if ((ch = keypad_final(string)) != '\0') {
        test = strchr(list, ch);
        if (test != 0)

-           result = (test - list);
+           result = (long) (test - list);

     }
     return result;
 }
     }
     return result;
 }


@@ -1097,11 +1098,11 @@ check_keypad(TERMTYPE *tp)
        VALID_STRING(key_c1) &&
        VALID_STRING(key_c3)) {
        char final[MAX_KP + 1];
        VALID_STRING(key_c1) &&
        VALID_STRING(key_c3)) {
        char final[MAX_KP + 1];

-       int list[MAX_KP];
+       long list[MAX_KP];

        int increase = 0;
        int j, k, kk;
        int increase = 0;
        int j, k, kk;

-       int last;
-       int test;
+       long last;
+       long test;

 
        final[0] = keypad_final(key_a1);
        final[1] = keypad_final(key_a3);
 
        final[0] = keypad_final(key_a1);
        final[1] = keypad_final(key_a3);


@@ -1592,7 +1593,7 @@ check_termtype(TERMTYPE *tp, bool literal)
     for (j = 0; j < NUM_STRINGS(tp); j++) {
        char *a = tp->Strings[j];
        if (VALID_STRING(a))
     for (j = 0; j < NUM_STRINGS(tp); j++) {
        char *a = tp->Strings[j];
        if (VALID_STRING(a))

-           check_params(tp, ExtStrname(tp, j, strnames), a);
+           check_params(tp, ExtStrname(tp, (int) j, strnames), a);

     }
 
     check_acs(tp);
     }
 
     check_acs(tp);