compile with g++ again.

diff --git a/src/cdf.c b/src/cdf.c
index 30950a26cce7aa053eeda55c418cb7529cc5340d..738bafd18bd7a8c7c5497f84c5944f7867cf0ee3 100644 (file)
--- a/src/cdf.c
+++ b/src/cdf.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: cdf.c,v 1.30 2009/05/06 14:29:47 christos Exp $")
+FILE_RCSID("@(#)$File: cdf.c,v 1.31 2009/05/08 17:41:58 christos Exp $")
 #endif
 
 #include <assert.h>
@@ -44,6 +44,9 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.30 2009/05/06 14:29:47 christos Exp $")
 #include <string.h>
 #include <time.h>
 #include <ctype.h>
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
 
 #ifndef EFTYPE
 #define EFTYPE EINVAL
@@ -344,7 +347,8 @@ cdf_read_sat(const cdf_info_t *info, cdf_header_t *h, cdf_sat_t *sat)
 
        sat->sat_len = h->h_num_sectors_in_master_sat * nsatpersec + i;
        DPRINTF(("sat_len = %zu ss = %zu\n", sat->sat_len, ss));
-       if ((sat->sat_tab = calloc(sat->sat_len, ss)) == NULL)
+       if ((sat->sat_tab = CAST(cdf_secid_t *, calloc(sat->sat_len, ss)))
+           == NULL)
                return -1;
 
        for (i = 0; i < __arraycount(h->h_master_sat); i++) {
@@ -357,7 +361,7 @@ cdf_read_sat(const cdf_info_t *info, cdf_header_t *h, cdf_sat_t *sat)
                }
        }
 
-       if ((msa = calloc(1, ss)) == NULL)
+       if ((msa = CAST(cdf_secid_t *, calloc(1, ss))) == NULL)
                goto out1;
 
        mid = h->h_secid_first_sector_in_master_sat;
@@ -543,11 +547,12 @@ cdf_read_dir(const cdf_info_t *info, const cdf_header_t *h,
        nd = ss / CDF_DIRECTORY_SIZE;
 
        dir->dir_len = ns * nd;
-       dir->dir_tab = calloc(dir->dir_len, sizeof(dir->dir_tab[0]));
+       dir->dir_tab = CAST(cdf_directory_t *, 
+           calloc(dir->dir_len, sizeof(dir->dir_tab[0])));
        if (dir->dir_tab == NULL)
                return -1;
 
-       if ((buf = malloc(ss)) == NULL) {
+       if ((buf = CAST(char *, malloc(ss))) == NULL) {
                free(dir->dir_tab);
                return -1;
        }
@@ -592,7 +597,7 @@ cdf_read_ssat(const cdf_info_t *info, const cdf_header_t *h,
        if (ssat->sat_len == (size_t)-1)
                return -1;
 
-       ssat->sat_tab = calloc(ssat->sat_len, ss);
+       ssat->sat_tab = CAST(cdf_secid_t *, calloc(ssat->sat_len, ss));
        if (ssat->sat_tab == NULL)
                return -1;
 
@@ -704,7 +709,8 @@ cdf_read_property_info(const cdf_stream_t *sst, uint32_t offs,
                errno = EFTYPE;
                goto out;
        }
-       shp = (const void *)((const char *)sst->sst_tab + offs);
+       shp = CAST(const cdf_section_header_t *, (const void *)
+           ((const char *)sst->sst_tab + offs));
        if (cdf_check_stream_offset(sst, shp, sizeof(*shp)) == -1)
                goto out;
        sh.sh_len = CDF_TOLE4(shp->sh_len);
@@ -723,19 +729,23 @@ cdf_read_property_info(const cdf_stream_t *sst, uint32_t offs,
                if (*maxcount > CDF_PROP_LIMIT)
                        goto out;
                *maxcount += sh.sh_properties;
-               inp = realloc(*info, *maxcount * sizeof(*inp));
+               inp = CAST(cdf_property_info_t *,
+                   realloc(*info, *maxcount * sizeof(*inp)));
        } else {
                *maxcount = sh.sh_properties;
-               inp = malloc(*maxcount * sizeof(*inp));
+               inp = CAST(cdf_property_info_t *,
+                   malloc(*maxcount * sizeof(*inp)));
        }
        if (inp == NULL)
                goto out;
        *info = inp;
        inp += *count;
        *count += sh.sh_properties;
-       p = (const void *)((const char *)(const void *)sst->sst_tab +
-           offs + sizeof(sh));
-       e = (const void *)(((const char *)(const void *)shp) + sh.sh_len);
+       p = CAST(const uint32_t *, (const void *)
+           ((const char *)(const void *)sst->sst_tab +
+           offs + sizeof(sh)));
+       e = CAST(const uint32_t *, (const void *)
+           (((const char *)(const void *)shp) + sh.sh_len));
        if (cdf_check_stream_offset(sst, e, 0) == -1)
                goto out;
        for (i = 0; i < sh.sh_properties; i++) {
@@ -800,7 +810,8 @@ cdf_read_property_info(const cdf_stream_t *sst, uint32_t offs,
                                    || nelements > CDF_PROP_LIMIT)
                                        goto out;
                                *maxcount += nelements;
-                               inp = realloc(*info, *maxcount * sizeof(*inp));
+                               inp = CAST(cdf_property_info_t *,
+                                   realloc(*info, *maxcount * sizeof(*inp)));
                                if (inp == NULL)
                                        goto out;
                                *info = inp;
@@ -848,9 +859,11 @@ cdf_unpack_summary_info(const cdf_stream_t *sst, cdf_summary_info_header_t *ssi,
     cdf_property_info_t **info, size_t *count)
 {
        size_t i, maxcount;
-       const cdf_summary_info_header_t *si = sst->sst_tab;
-       const cdf_section_declaration_t *sd = (const void *)
-           ((const char *)sst->sst_tab + CDF_SECTION_DECLARATION_OFFSET);
+       const cdf_summary_info_header_t *si =
+           CAST(const cdf_summary_info_header_t *, sst->sst_tab);
+       const cdf_section_declaration_t *sd =
+           CAST(const cdf_section_declaration_t *, (const void *)
+           ((const char *)sst->sst_tab + CDF_SECTION_DECLARATION_OFFSET));
 
        if (cdf_check_stream_offset(sst, si, sizeof(*si)) == -1 ||
            cdf_check_stream_offset(sst, sd, sizeof(*sd)) == -1)

diff --git a/src/file.h b/src/file.h
index 6ccdd40b285d31ada15f8f7025b7543c8a09dd28..17a81d9897a8d55c28d84bd4d2283cd962ba9eb6 100644 (file)
--- a/src/file.h
+++ b/src/file.h
@@ -27,7 +27,7 @@
  */
 /*
  * file.h - definitions for file(1) program
- * @(#)$File: file.h,v 1.119 2009/02/04 18:24:32 christos Exp $
+ * @(#)$File: file.h,v 1.120 2009/05/08 17:41:58 christos Exp $
  */
 
 #ifndef __file_h__
@@ -41,6 +41,9 @@
 #include <errno.h>
 #include <fcntl.h>     /* For open and flags */
 #ifdef HAVE_STDINT_H
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS
+#endif
 #include <stdint.h>
 #endif
 #ifdef HAVE_INTTYPES_H
@@ -298,7 +301,7 @@ struct mlist {
 #ifdef __cplusplus
 #define CAST(T, b)     static_cast<T>(b)
 #else
-#define CAST(T, b)     (T)(b)
+#define CAST(T, b)     (b)
 #endif
 
 struct level_info {

diff --git a/src/softmagic.c b/src/softmagic.c
index 933e5701d135c307b0b2c9065616831c96837ab4..cbffa254f9afb8d13080a5442639acda4251d13d 100644 (file)
--- a/src/softmagic.c
+++ b/src/softmagic.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: softmagic.c,v 1.135 2009/03/27 22:42:49 christos Exp $")
+FILE_RCSID("@(#)$File: softmagic.c,v 1.136 2009/05/08 17:41:59 christos Exp $")
 #endif /* lint */
 
 #include "magic.h"
@@ -924,7 +924,7 @@ mcopy(struct magic_set *ms, union VALUETYPE *p, int type, int indir,
        if (indir == 0) {
                switch (type) {
                case FILE_SEARCH:
-                       ms->search.s = CAST(const char *, s) + offset;
+                       ms->search.s = (const char *)s + offset;
                        ms->search.s_len = nbytes - offset;
                        ms->search.offset = offset;
                        return 0;
@@ -942,19 +942,21 @@ mcopy(struct magic_set *ms, union VALUETYPE *p, int type, int indir,
                                ms->search.s = NULL;
                                return 0;
                        }
-                       buf = CAST(const char *, s) + offset;
-                       end = last = CAST(const char *, s) + nbytes;
+                       buf = (const char *)s + offset;
+                       end = last = (const char *)s + nbytes;
                        /* mget() guarantees buf <= last */
                        for (lines = linecnt, b = buf; lines &&
-                            ((b = memchr(c = b, '\n', CAST(size_t, (end - b))))
-                            || (b = memchr(c, '\r', CAST(size_t, (end - c)))));
+                            ((b = CAST(const char *,
+                                memchr(c = b, '\n', CAST(size_t, (end - b)))))
+                            || (b = CAST(const char *,
+                                memchr(c, '\r', CAST(size_t, (end - c))))));
                             lines--, b++) {
                                last = b;
                                if (b[0] == '\r' && b[1] == '\n')
                                        b++;
                        }
                        if (lines)
-                               last = CAST(const char *, s) + nbytes;
+                               last = (const char *)s + nbytes;
 
                        ms->search.s = buf;
                        ms->search.s_len = last - buf;