removed 'KILL_TAIL_CALL()', no longer needed

25 files changed, 0 insertions, 39 deletions

diff --git a/test/monniaux/jpeg-6b/jcapimin.c b/test/monniaux/jpeg-6b/jcapimin.c
index 038797e0..71334e6e 100644
--- a/test/monniaux/jpeg-6b/jcapimin.c
+++ b/test/monniaux/jpeg-6b/jcapimin.c
@@ -222,14 +222,12 @@ jpeg_write_m_header (j_compress_ptr cinfo, int marker, unsigned int datalen)
     ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
 
   (*cinfo->marker->write_marker_header) (cinfo, marker, datalen);
-  KILL_TAIL_CALL();
 }
 
 GLOBAL(void)
 jpeg_write_m_byte (j_compress_ptr cinfo, int val)
 {
   (*cinfo->marker->write_marker_byte) (cinfo, val);
-  KILL_TAIL_CALL();
 }
 
 
@@ -281,5 +279,4 @@ jpeg_write_tables (j_compress_ptr cinfo)
    * An app that prefers the old behavior can call jpeg_abort for itself after
    * each call to jpeg_write_tables().
    */
-  KILL_TAIL_CALL();
 }
diff --git a/test/monniaux/jpeg-6b/jccoefct.c b/test/monniaux/jpeg-6b/jccoefct.c
index e0cb42a4..2a0812fd 100644
--- a/test/monniaux/jpeg-6b/jccoefct.c
+++ b/test/monniaux/jpeg-6b/jccoefct.c
@@ -126,7 +126,6 @@ start_pass_coef (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
     ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
     break;
   }
-  KILL_TAIL_CALL();
 }
 
 
diff --git a/test/monniaux/jpeg-6b/jccolor.c b/test/monniaux/jpeg-6b/jccolor.c
index edc9f831..0a8a4b5d 100644
--- a/test/monniaux/jpeg-6b/jccolor.c
+++ b/test/monniaux/jpeg-6b/jccolor.c
@@ -456,5 +456,4 @@ jinit_color_converter (j_compress_ptr cinfo)
     cconvert->pub.color_convert = null_convert;
     break;
   }
-  KILL_TAIL_CALL();
 }
diff --git a/test/monniaux/jpeg-6b/jcinit.c b/test/monniaux/jpeg-6b/jcinit.c
index 578fbe81..5efffe33 100644
--- a/test/monniaux/jpeg-6b/jcinit.c
+++ b/test/monniaux/jpeg-6b/jcinit.c
@@ -69,5 +69,4 @@ jinit_compress_master (j_compress_ptr cinfo)
    * This lets application insert special markers after the SOI.
    */
   (*cinfo->marker->write_file_header) (cinfo);
-  KILL_TAIL_CALL();
 }
diff --git a/test/monniaux/jpeg-6b/jcmainct.c b/test/monniaux/jpeg-6b/jcmainct.c
index 6ae91018..e0279a7e 100644
--- a/test/monniaux/jpeg-6b/jcmainct.c
+++ b/test/monniaux/jpeg-6b/jcmainct.c
@@ -100,7 +100,6 @@ start_pass_main (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
     ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
     break;
   }
-  KILL_TAIL_CALL();
 }
 
 
@@ -291,5 +290,4 @@ jinit_c_main_controller (j_compress_ptr cinfo, boolean need_full_buffer)
 	 (JDIMENSION) (compptr->v_samp_factor * DCTSIZE));
     }
   }
-  KILL_TAIL_CALL();
 }
diff --git a/test/monniaux/jpeg-6b/jcmarker.c b/test/monniaux/jpeg-6b/jcmarker.c
index ed98ef9f..3d1e6c6d 100644
--- a/test/monniaux/jpeg-6b/jcmarker.c
+++ b/test/monniaux/jpeg-6b/jcmarker.c
@@ -115,7 +115,6 @@ emit_byte (j_compress_ptr cinfo, int val)
     if (! (*dest->empty_output_buffer) (cinfo))
       ERREXIT(cinfo, JERR_CANT_SUSPEND);
   }
-  KILL_TAIL_CALL();
 }
 
 
diff --git a/test/monniaux/jpeg-6b/jcmaster.c b/test/monniaux/jpeg-6b/jcmaster.c
index fd136535..0f206557 100644
--- a/test/monniaux/jpeg-6b/jcmaster.c
+++ b/test/monniaux/jpeg-6b/jcmaster.c
@@ -492,7 +492,6 @@ pass_startup (j_compress_ptr cinfo)
 
   (*cinfo->marker->write_frame_header) (cinfo);
   (*cinfo->marker->write_scan_header) (cinfo);
-  KILL_TAIL_CALL();
 }
 
 
diff --git a/test/monniaux/jpeg-6b/jconfig.h b/test/monniaux/jpeg-6b/jconfig.h
index 1c6bd8af..90bf22dd 100644
--- a/test/monniaux/jpeg-6b/jconfig.h
+++ b/test/monniaux/jpeg-6b/jconfig.h
@@ -40,16 +40,12 @@ extern long long __compcert_i64_smod(long long a, long long b);
 #define INT_DIV(a, b) __compcert_i64_sdiv(a, b)
 #define LONG_DIV(a, b) __compcert_i64_sdiv(a, b)
 
-#define KILL_TAIL_CALL() { int x=1; }
-
 #else
 #define INT_UMOD(a, b) ((a) % (b))
 #define INT_MOD(a, b) ((a) % (b))
 #define INT_UDIV(a, b) ((a) / (b))
 #define INT_DIV(a, b) ((a) / (b))
 #define LONG_DIV(a, b) ((a) / (b))
-
-#define KILL_TAIL_CALL() {  }
 #endif
 
 /* Does your compiler support the declaration "unsigned char" ?
diff --git a/test/monniaux/jpeg-6b/jcparam.c b/test/monniaux/jpeg-6b/jcparam.c
index f6c90f47..d462afed 100644
--- a/test/monniaux/jpeg-6b/jcparam.c
+++ b/test/monniaux/jpeg-6b/jcparam.c
@@ -380,7 +380,6 @@ jpeg_default_colorspace (j_compress_ptr cinfo)
   default:
     ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
   }
-  KILL_TAIL_CALL();
 }
 
 
@@ -467,7 +466,6 @@ jpeg_set_colorspace (j_compress_ptr cinfo, J_COLOR_SPACE colorspace)
   default:
     ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
   }
-  KILL_TAIL_CALL();
 }
 
 
diff --git a/test/monniaux/jpeg-6b/jcsample.c b/test/monniaux/jpeg-6b/jcsample.c
index 5cd42abd..d2693198 100644
--- a/test/monniaux/jpeg-6b/jcsample.c
+++ b/test/monniaux/jpeg-6b/jcsample.c
@@ -516,5 +516,4 @@ jinit_downsampler (j_compress_ptr cinfo)
   if (cinfo->smoothing_factor && !smoothok)
     TRACEMS(cinfo, 0, JTRC_SMOOTH_NOTIMPL);
 #endif
-  KILL_TAIL_CALL();
 }
diff --git a/test/monniaux/jpeg-6b/jdapimin.c b/test/monniaux/jpeg-6b/jdapimin.c
index ef09983b..cf608443 100644
--- a/test/monniaux/jpeg-6b/jdapimin.c
+++ b/test/monniaux/jpeg-6b/jdapimin.c
@@ -422,7 +422,6 @@ jpeg_consume_input (j_decompress_ptr cinfo)
     ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
   }
 #endif
-  KILL_TAIL_CALL();
   return retcode;
 }
 
diff --git a/test/monniaux/jpeg-6b/jdatadst.c b/test/monniaux/jpeg-6b/jdatadst.c
index 08fa7b62..a8f6fb0e 100644
--- a/test/monniaux/jpeg-6b/jdatadst.c
+++ b/test/monniaux/jpeg-6b/jdatadst.c
@@ -117,7 +117,6 @@ term_destination (j_compress_ptr cinfo)
   /* Make sure we wrote the output file OK */
   if (ferror(dest->outfile))
     ERREXIT(cinfo, JERR_FILE_WRITE);
-  KILL_TAIL_CALL();
 }
 
 
diff --git a/test/monniaux/jpeg-6b/jdmainct.c b/test/monniaux/jpeg-6b/jdmainct.c
index 4d49d26f..0de6a394 100644
--- a/test/monniaux/jpeg-6b/jdmainct.c
+++ b/test/monniaux/jpeg-6b/jdmainct.c
@@ -336,7 +336,6 @@ start_pass_main (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)
     ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
     break;
   }
-  KILL_TAIL_CALL();
 }
 
 
@@ -467,7 +466,6 @@ process_data_crank_post (j_decompress_ptr cinfo,
   (*cinfo->post->post_process_data) (cinfo, (JSAMPIMAGE) NULL,
 				     (JDIMENSION *) NULL, (JDIMENSION) 0,
 				     output_buf, out_row_ctr, out_rows_avail);
-  KILL_TAIL_CALL();
 }
 
 #endif /* QUANT_2PASS_SUPPORTED */
diff --git a/test/monniaux/jpeg-6b/jdmarker.c b/test/monniaux/jpeg-6b/jdmarker.c
index 71feff86..f4cca8cc 100644
--- a/test/monniaux/jpeg-6b/jdmarker.c
+++ b/test/monniaux/jpeg-6b/jdmarker.c
@@ -653,7 +653,6 @@ examine_app0 (j_decompress_ptr cinfo, JOCTET FAR * data,
     /* Start of APP0 does not match "JFIF" or "JFXX", or too short */
     TRACEMS1(cinfo, 1, JTRC_APP0, (int) totallen);
   }
-  KILL_TAIL_CALL();
 }
 
 
@@ -685,7 +684,6 @@ examine_app14 (j_decompress_ptr cinfo, JOCTET FAR * data,
     /* Start of APP14 does not match "Adobe", or too short */
     TRACEMS1(cinfo, 1, JTRC_APP14, (int) (datalen + remaining));
   }
-  KILL_TAIL_CALL();
 }
 
 
@@ -1338,7 +1336,6 @@ jpeg_save_markers (j_decompress_ptr cinfo, int marker_code,
     marker->length_limit_APPn[marker_code - (int) M_APP0] = length_limit;
   } else
     ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code);
-  KILL_TAIL_CALL();
 }
 
 #endif /* SAVE_MARKERS_SUPPORTED */
@@ -1360,5 +1357,4 @@ jpeg_set_marker_processor (j_decompress_ptr cinfo, int marker_code,
     marker->process_APPn[marker_code - (int) M_APP0] = routine;
   else
     ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code);
-  KILL_TAIL_CALL();
 }
diff --git a/test/monniaux/jpeg-6b/jdmaster.c b/test/monniaux/jpeg-6b/jdmaster.c
index 512bd679..2802c5b7 100644
--- a/test/monniaux/jpeg-6b/jdmaster.c
+++ b/test/monniaux/jpeg-6b/jdmaster.c
@@ -529,7 +529,6 @@ jpeg_new_colormap (j_decompress_ptr cinfo)
     master->pub.is_dummy_pass = FALSE; /* just in case */
   } else
     ERREXIT(cinfo, JERR_MODE_CHANGE);
-  KILL_TAIL_CALL();
 }
 
 #endif /* D_MULTISCAN_FILES_SUPPORTED */
diff --git a/test/monniaux/jpeg-6b/jerror.c b/test/monniaux/jpeg-6b/jerror.c
index e1b585e9..c98aed76 100644
--- a/test/monniaux/jpeg-6b/jerror.c
+++ b/test/monniaux/jpeg-6b/jerror.c
@@ -143,7 +143,6 @@ emit_message (j_common_ptr cinfo, int msg_level)
     if (err->trace_level >= msg_level)

       (*err->output_message) (cinfo);

   }

-  KILL_TAIL_CALL();

 }

 

 

diff --git a/test/monniaux/jpeg-6b/jmemmgr.c b/test/monniaux/jpeg-6b/jmemmgr.c
index 01533319..b636f1be 100644
--- a/test/monniaux/jpeg-6b/jmemmgr.c
+++ b/test/monniaux/jpeg-6b/jmemmgr.c
@@ -222,7 +222,6 @@ out_of_memory (j_common_ptr cinfo, int which)
   cinfo->err->trace_level = 2;	/* force self_destruct to report stats */

 #endif

   ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, which);

-  KILL_TAIL_CALL();

 }

 

 

diff --git a/test/monniaux/jpeg-6b/jmemnobs.c b/test/monniaux/jpeg-6b/jmemnobs.c
index 02e14a1a..eb8c3377 100644
--- a/test/monniaux/jpeg-6b/jmemnobs.c
+++ b/test/monniaux/jpeg-6b/jmemnobs.c
@@ -88,7 +88,6 @@ jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
 			 long total_bytes_needed)
 {
   ERREXIT(cinfo, JERR_NO_BACKING_STORE);
-  KILL_TAIL_CALL();
 }
 
 
diff --git a/test/monniaux/jpeg-6b/jquant1.c b/test/monniaux/jpeg-6b/jquant1.c
index 9f5d67bc..698e4846 100644
--- a/test/monniaux/jpeg-6b/jquant1.c
+++ b/test/monniaux/jpeg-6b/jquant1.c
@@ -787,7 +787,6 @@ start_pass_1_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
     ERREXIT(cinfo, JERR_NOT_COMPILED);
     break;
   }
-  KILL_TAIL_CALL();
 }
 
 
@@ -811,7 +810,6 @@ METHODDEF(void)
 new_color_map_1_quant (j_decompress_ptr cinfo)
 {
   ERREXIT(cinfo, JERR_MODE_CHANGE);
-  KILL_TAIL_CALL();
 }
 
 
diff --git a/test/monniaux/jpeg-6b/rdbmp.c b/test/monniaux/jpeg-6b/rdbmp.c
index e999a56b..29b1d484 100644
--- a/test/monniaux/jpeg-6b/rdbmp.c
+++ b/test/monniaux/jpeg-6b/rdbmp.c
@@ -230,7 +230,6 @@ preload_image (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
 
   /* And read the first row */
   int ret= (*source->pub.get_pixel_rows) (cinfo, sinfo);
-  KILL_TAIL_CALL();
   return ret;
 }
 
diff --git a/test/monniaux/jpeg-6b/rdcolmap.c b/test/monniaux/jpeg-6b/rdcolmap.c
index 95d97358..42b34376 100644
--- a/test/monniaux/jpeg-6b/rdcolmap.c
+++ b/test/monniaux/jpeg-6b/rdcolmap.c
@@ -248,7 +248,6 @@ read_color_map (j_decompress_ptr cinfo, FILE * infile)
     ERREXIT(cinfo, JERR_BAD_CMAP_FILE);
     break;
   }
-  KILL_TAIL_CALL();
 }
 
 #endif /* QUANT_2PASS_SUPPORTED */
diff --git a/test/monniaux/jpeg-6b/wrbmp.c b/test/monniaux/jpeg-6b/wrbmp.c
index 0d13482c..3283b0f1 100644
--- a/test/monniaux/jpeg-6b/wrbmp.c
+++ b/test/monniaux/jpeg-6b/wrbmp.c
@@ -379,7 +379,6 @@ finish_output_bmp (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
   fflush(outfile);
   if (ferror(outfile))
     ERREXIT(cinfo, JERR_FILE_WRITE);
-  KILL_TAIL_CALL();
 }
 
 
diff --git a/test/monniaux/jpeg-6b/wrgif.c b/test/monniaux/jpeg-6b/wrgif.c
index 6d3eaf39..65acd437 100644
--- a/test/monniaux/jpeg-6b/wrgif.c
+++ b/test/monniaux/jpeg-6b/wrgif.c
@@ -349,7 +349,6 @@ finish_output_gif (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
   fflush(dest->pub.output_file);
   if (ferror(dest->pub.output_file))
     ERREXIT(cinfo, JERR_FILE_WRITE);
-  KILL_TAIL_CALL();
 }
 
 
diff --git a/test/monniaux/jpeg-6b/wrppm.c b/test/monniaux/jpeg-6b/wrppm.c
index 47dd19b4..6c6d9088 100644
--- a/test/monniaux/jpeg-6b/wrppm.c
+++ b/test/monniaux/jpeg-6b/wrppm.c
@@ -194,7 +194,6 @@ start_output_ppm (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
   default:
     ERREXIT(cinfo, JERR_PPM_COLORSPACE);
   }
-  KILL_TAIL_CALL();
 }
 
 
@@ -209,7 +208,6 @@ finish_output_ppm (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
   fflush(dinfo->output_file);
   if (ferror(dinfo->output_file))
     ERREXIT(cinfo, JERR_FILE_WRITE);
-  KILL_TAIL_CALL();
 }
 
 
diff --git a/test/monniaux/jpeg-6b/wrtarga.c b/test/monniaux/jpeg-6b/wrtarga.c
index 7bfe2a44..cf104d2d 100644
--- a/test/monniaux/jpeg-6b/wrtarga.c
+++ b/test/monniaux/jpeg-6b/wrtarga.c
@@ -200,7 +200,6 @@ start_output_tga (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
   } else {
     ERREXIT(cinfo, JERR_TGA_COLORSPACE);
   }
-  KILL_TAIL_CALL();
 }
 
 
@@ -215,7 +214,6 @@ finish_output_tga (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
   fflush(dinfo->output_file);
   if (ferror(dinfo->output_file))
     ERREXIT(cinfo, JERR_FILE_WRITE);
-  KILL_TAIL_CALL();
 }