[svn:parrot] r27403 - trunk/src

[petdance]

Author: petdance
Date: Fri May  9 22:45:20 2008
New Revision: 27403

Modified:
   trunk/src/pbc_merge.c

Log:
helpful use of the PARROT_DOES_NOT_RETURN. Also, removed impossible condition 
of a function returning NULL

Modified: trunk/src/pbc_merge.c
==============================================================================
--- trunk/src/pbc_merge.c       (original)
+++ trunk/src/pbc_merge.c       Fri May  9 22:45:20 2008
@@ -170,6 +170,7 @@
 
 */
 
+PARROT_DOES_NOT_RETURN
 static void
 help(PARROT_INTERP)
 {
@@ -895,10 +896,6 @@
 
     /* Merge. */
     merged = pbc_merge_begin(interp, input_files, argc);
-    if (merged == NULL) {
-        PIO_eprintf(interp, "PBC Merge: Unknown error during merge\n");
-        Parrot_exit(interp, 1);
-    }
 
     /* Write merged packfile. */
     pbc_merge_write(interp, merged, output_file);