Sun Oct 26 15:56:20 2008 Michael Jennings (mej)

Remove unnecessary typecasting macros.  They were supposed to save
typing and improve readability, but I've concluded that they tend to
do neither.  More cleanups to come; there appear to be some new
warnings I need to deal with.
----------------------------------------------------------------------


SVN revision: 37181

1 files changed, 6 insertions, 6 deletions

diff --git a/src/file.c b/src/file.c
index edf3802..d44ec8c 100644
--- a/src/file.c
+++ b/src/file.c
@@ -67,20 +67,20 @@ spiftool_temp_file(spif_charptr_t ftemplate, size_t len)
     int fd;
     mode_t m;
 
-    ASSERT_RVAL(!SPIF_PTR_ISNULL(ftemplate), SPIF_CAST_C(int) -1);
-    ASSERT_RVAL(len > 0, SPIF_CAST_C(int) -1);
+    ASSERT_RVAL(!SPIF_PTR_ISNULL(ftemplate), (int) -1);
+    ASSERT_RVAL(len > 0, (int) -1);
     if (getenv("TMPDIR")) {
-        snprintf(SPIF_CAST_C(char *) buff, sizeof(buff),
+        snprintf((char *) buff, sizeof(buff),
                  "%s/%sXXXXXX", getenv("TMPDIR"), ftemplate);
     } else if (getenv("TMP")) {
-        snprintf(SPIF_CAST_C(char *) buff, sizeof(buff),
+        snprintf((char *) buff, sizeof(buff),
                  "%s/%sXXXXXX", getenv("TMP"), ftemplate);
     } else {
-        snprintf(SPIF_CAST_C(char *) buff, sizeof(buff),
+        snprintf((char *) buff, sizeof(buff),
                  "/tmp/%sXXXXXX", ftemplate);
     }
     m = umask(0077);
-    fd = mkstemp(SPIF_CAST_C(char *) buff);
+    fd = mkstemp((char *) buff);
     umask(m);
     if ((fd < 0) || fchmod(fd, (S_IRUSR | S_IWUSR))) {
         return (-1);