[Nmh-commits] nmh ChangeLog uip/mhlistsbr.c uip/mhlsbr.c uip/...

[David Levine]

CVSROOT:        /sources/nmh
Module name:    nmh
Changes by:     David Levine <levine>   09/12/30 01:42:45

Modified files:
        .              : ChangeLog 
        uip            : mhlistsbr.c mhlsbr.c picksbr.c 

Log message:
                * uip/mhlistsbr.c, uip/mhlsbr.c, uip/picksbr.c: cast
                pointers to unsigned long before casting to unsigned int
                to avoid warnings on 64-bit about casting from pointer
                to int of different size.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/ChangeLog?cvsroot=nmh&r1=1.307&r2=1.308
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mhlistsbr.c?cvsroot=nmh&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/mhlsbr.c?cvsroot=nmh&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/nmh/uip/picksbr.c?cvsroot=nmh&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/nmh/nmh/ChangeLog,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -b -r1.307 -r1.308
--- ChangeLog   30 Dec 2009 01:41:47 -0000      1.307
+++ ChangeLog   30 Dec 2009 01:42:45 -0000      1.308
@@ -1,5 +1,10 @@
 2009-12-29  David Levine <address@hidden>
 
+       * uip/mhlistsbr.c, uip/mhlsbr.c, uip/picksbr.c: cast
+       pointers to unsigned long before casting to unsigned int
+       to avoid warnings on 64-bit about casting from pointer
+       to int of different size.
+
        * uip/new.c: cast folder_len to int to avoid warning on
        64-bit about passing a size_t to an int conversion specifier.
 

Index: uip/mhlistsbr.c
===================================================================
RCS file: /sources/nmh/nmh/uip/mhlistsbr.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- uip/mhlistsbr.c     6 Jan 2006 21:51:44 -0000       1.7
+++ uip/mhlistsbr.c     30 Dec 2009 01:42:45 -0000      1.8
@@ -3,7 +3,7 @@
  * mhlistsbr.c -- routines to list information about the
  *             -- contents of MIME messages
  *
- * $Id: mhlistsbr.c,v 1.7 2006/01/06 21:51:44 bress Exp $
+ * $Id: mhlistsbr.c,v 1.8 2009/12/30 01:42:45 levine Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -263,7 +263,8 @@
 
     /* print internal flags for type/subtype */
     fprintf (stderr, "    type 0x%x subtype 0x%x params 0x%x\n",
-            ct->c_type, ct->c_subtype, (unsigned int) ct->c_ctparams);
+            ct->c_type, ct->c_subtype,
+            (unsigned int)(unsigned long) ct->c_ctparams);
 
     fprintf (stderr, "    showproc  \"%s\"\n", empty (ct->c_showproc));
     fprintf (stderr, "    termproc  \"%s\"\n", empty (ct->c_termproc));
@@ -275,7 +276,7 @@
 
     /* print internal flags for transfer encoding */
     fprintf (stderr, "    transfer encoding 0x%x params 0x%x\n",
-            ct->c_encoding, (unsigned int) ct->c_cefile);
+            ct->c_encoding, (unsigned int)(unsigned long) ct->c_cefile);
 
     /* print Content-ID */
     if (ct->c_id)
@@ -286,7 +287,7 @@
        fprintf (stderr, "  %s:%s", DESCR_FIELD, ct->c_descr);
 
     fprintf (stderr, "    read fp 0x%x file \"%s\" begin %ld end %ld\n",
-            (unsigned int) ct->c_fp, empty (ct->c_file),
+            (unsigned int)(unsigned long) ct->c_fp, empty (ct->c_file),
             ct->c_begin, ct->c_end);
 
     /* print more information about transfer encoding */
@@ -425,7 +426,8 @@
 
     if ((ce = ct->c_cefile))
        fprintf (stderr, "    decoded fp 0x%x file \"%s\"\n",
-                (unsigned int) ce->ce_fp, ce->ce_file ? ce->ce_file : "");
+                (unsigned int)(unsigned long) ce->ce_fp,
+                ce->ce_file ? ce->ce_file : "");
 
     return OK;
 }

Index: uip/mhlsbr.c
===================================================================
RCS file: /sources/nmh/nmh/uip/mhlsbr.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- uip/mhlsbr.c        16 Jan 2009 02:28:55 -0000      1.13
+++ uip/mhlsbr.c        30 Dec 2009 01:42:45 -0000      1.14
@@ -2,7 +2,7 @@
 /*
  * mhlsbr.c -- main routines for nmh message lister
  *
- * $Id: mhlsbr.c,v 1.13 2009/01/16 02:28:55 kenh Exp $
+ * $Id: mhlsbr.c,v 1.14 2009/12/30 01:42:45 levine Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -619,7 +619,8 @@
            fprintf (stderr, "c1: name=\"%s\" text=\"%s\" ovtxt=\"%s\"\n",
                    c1->c_name, c1->c_text, c1->c_ovtxt);
            fprintf (stderr, "\tnfs=0x%x fmt=0x%x\n",
-                   (unsigned int) c1->c_nfs, (unsigned int) c1->c_fmt);
+                    (unsigned int)(unsigned long) c1->c_nfs,
+                    (unsigned int)(unsigned long) c1->c_fmt);
            fprintf (stderr, "\toffset=%d ovoff=%d width=%d cwidth=%d 
length=%d\n",
                    c1->c_offset, c1->c_ovoff, c1->c_width,
                    c1->c_cwidth, c1->c_length);

Index: uip/picksbr.c
===================================================================
RCS file: /sources/nmh/nmh/uip/picksbr.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- uip/picksbr.c       29 Apr 2007 22:57:36 -0000      1.12
+++ uip/picksbr.c       30 Dec 2009 01:42:45 -0000      1.13
@@ -2,7 +2,7 @@
 /*
  * picksbr.c -- routines to help pick along...
  *
- * $Id: picksbr.c,v 1.12 2007/04/29 22:57:36 pm215 Exp $
+ * $Id: picksbr.c,v 1.13 2009/12/30 01:42:45 levine Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -538,7 +538,8 @@
                dasctime (&n->n_tws, TW_NULL));
        return;
     }
-    fprintf (stderr, "UNKNOWN(0x%x)\n", (unsigned int) (*n->n_action));
+    fprintf (stderr, "UNKNOWN(0x%x)\n",
+            (unsigned int)(unsigned long) (*n->n_action));
 }