--- a/archivers/grp.c	Sun Mar 13 03:18:18 2005 +0000
+++ b/archivers/grp.c	Sun Mar 13 03:33:11 2005 +0000
@@ -270,11 +270,7 @@
 
     memset(info, '\0', sizeof (GRPinfo));
     info->filename = (char *) malloc(strlen(name) + 1);
-    if (info->filename == NULL)
-    {
-        __PHYSFS_setError(ERR_OUT_OF_MEMORY);
-        goto GRP_openArchive_failed;
-    } /* if */
+    GOTO_IF_MACRO(!info->filename, ERR_OUT_OF_MEMORY, GRP_openArchive_failed);
 
     if (!grp_load_entries(name, forWriting, info))
         goto GRP_openArchive_failed;

--- a/archivers/hog.c	Sun Mar 13 03:18:18 2005 +0000
+++ b/archivers/hog.c	Sun Mar 13 03:33:11 2005 +0000
@@ -309,11 +309,7 @@
     BAIL_IF_MACRO(info == NULL, ERR_OUT_OF_MEMORY, 0);
     memset(info, '\0', sizeof (HOGinfo));
     info->filename = (char *) malloc(strlen(name) + 1);
-    if (info->filename == NULL)
-    {
-        __PHYSFS_setError(ERR_OUT_OF_MEMORY);
-        goto HOG_openArchive_failed;
-    } /* if */
+    GOTO_IF_MACRO(!info->filename, ERR_OUT_OF_MEMORY, HOG_openArchive_failed);
 
     if (!hog_load_entries(name, forWriting, info))
         goto HOG_openArchive_failed;

--- a/archivers/mix.c	Sun Mar 13 03:18:18 2005 +0000
+++ b/archivers/mix.c	Sun Mar 13 03:33:11 2005 +0000
@@ -236,12 +236,8 @@
     memset(info, '\0', sizeof (MIXinfo));
 
     info->filename = (char *) malloc(strlen(name) + 1);
-    if (info->filename == NULL)
-    {
-        __PHYSFS_setError(ERR_OUT_OF_MEMORY);
-        goto MIX_openArchive_failed;
-    } /* if */
-    
+    GOTO_IF_MACRO(!info->filename, ERR_OUT_OF_MEMORY, MIX_openArchive_failed);
+
     /* store filename */
     strcpy(info->filename, name);
     
@@ -259,12 +255,8 @@
 
     /* allocate space for the entries and read the entries */
     info->entry = malloc(sizeof (MIXentry) * info->header.num_files);
-    if (info->entry == NULL)
-    {
-        __PHYSFS_setError(ERR_OUT_OF_MEMORY);
-        goto MIX_openArchive_failed;
-    } /* if */
-    
+    GOTO_IF_MACRO(!info->entry, ERR_OUT_OF_MEMORY, MIX_openArchive_failed);
+
     /* read the directory list */
     for (i = 0; i < header.num_files; i++)
     {

--- a/archivers/mvl.c	Sun Mar 13 03:18:18 2005 +0000
+++ b/archivers/mvl.c	Sun Mar 13 03:33:11 2005 +0000
@@ -268,12 +268,7 @@
     memset(info, '\0', sizeof (MVLinfo));
 
     info->filename = (char *) malloc(strlen(name) + 1);
-    if (info->filename == NULL)
-    {
-        __PHYSFS_setError(ERR_OUT_OF_MEMORY);
-        goto MVL_openArchive_failed;
-    } /* if */
-
+    GOTO_IF_MACRO(!info->filename, ERR_OUT_OF_MEMORY, MVL_openArchive_failed);
     if (!mvl_load_entries(name, forWriting, info))
         goto MVL_openArchive_failed;
 

--- a/archivers/qpak.c	Sun Mar 13 03:18:18 2005 +0000
+++ b/archivers/qpak.c	Sun Mar 13 03:33:11 2005 +0000
@@ -75,7 +75,7 @@
 } QPAKfileinfo;
 
 /* Magic numbers... */
-#define QPAK_SIGNATURE 0x4b434150   /* "PACK" in ASCII. */
+#define QPAK_SIG 0x4b434150   /* "PACK" in ASCII. */
 
 
 static void QPAK_dirClose(dvoid *opaque)
@@ -175,11 +175,7 @@
         goto openQpak_failed;
 
     buf = PHYSFS_swapULE32(buf);
-    if (buf != QPAK_SIGNATURE)
-    {
-        __PHYSFS_setError(ERR_UNSUPPORTED_ARCHIVE);
-        goto openQpak_failed;
-    } /* if */
+    GOTO_IF_MACRO(buf != QPAK_SIG, ERR_UNSUPPORTED_ARCHIVE, openQpak_failed);
 
     if (__PHYSFS_platformRead(*fh, &buf, sizeof (PHYSFS_uint32), 1) != 1)
         goto openQpak_failed;
@@ -191,11 +187,8 @@
 
     *count = PHYSFS_swapULE32(*count);
 
-    if ((*count % 64) != 0)  /* corrupted archive? */
-    {
-        __PHYSFS_setError(ERR_CORRUPTED);
-        goto openQpak_failed;
-    } /* if */
+    /* corrupted archive? */
+    GOTO_IF_MACRO((*count % 64) != 0, ERR_CORRUPTED, openQpak_failed);
 
     if (!__PHYSFS_platformSeek(*fh, buf))
         goto openQpak_failed;

--- a/archivers/wad.c	Sun Mar 13 03:18:18 2005 +0000
+++ b/archivers/wad.c	Sun Mar 13 03:33:11 2005 +0000
@@ -298,11 +298,7 @@
     memset(info, '\0', sizeof (WADinfo));
 
     info->filename = (char *) malloc(strlen(name) + 1);
-    if (info->filename == NULL)
-    {
-        __PHYSFS_setError(ERR_OUT_OF_MEMORY);
-        goto WAD_openArchive_failed;
-    } /* if */
+    GOTO_IF_MACRO(!info->filename, ERR_OUT_OF_MEMORY, WAD_openArchive_failed);
 
     if (!wad_load_entries(name, forWriting, info))
         goto WAD_openArchive_failed;

--- a/platform/unix.c	Sun Mar 13 03:18:18 2005 +0000
+++ b/platform/unix.c	Sun Mar 13 03:33:11 2005 +0000
@@ -219,11 +219,7 @@
     struct mntent *ent = NULL;
 
     mounts = setmntent("/etc/mtab", "r");
-    if (mounts == NULL)
-    {
-        __PHYSFS_setError(ERR_IO_ERROR);
-        return;
-    } /* if */
+    BAIL_IF_MACRO(mounts == NULL, ERR_IO_ERROR, /*return void*/);
 
     while ( (ent = getmntent(mounts)) != NULL )
     {