Split initialize device proc into two.

The device initialize function currently performs 2 jobs. Firstly,
it fills out the device_procs. Secondly, it performs any minimal
initialization required by the device (typically none).

At various points in the code we want to be able to copy procs
from one 'prototype' device to another, so we call initialize
for that. This populates the device procs, but does other work
that typically requires a 'derived device' structure rather
than a vanilla gx_device to work in.

Accordingly, we split the job into two; initialize_device_procs
(the first part) and initialize_device (the second part). The
initialize_device_procs function will set up the initialize_device
function pointer along with the rest if required.

29 files changed, 204 insertions, 387 deletions

diff --git a/contrib/eplaser/gdevescv.c b/contrib/eplaser/gdevescv.c
index 9410fddc4..6b9ae3905 100644
--- a/contrib/eplaser/gdevescv.c
+++ b/contrib/eplaser/gdevescv.c
@@ -97,8 +97,8 @@ gs_public_st_suffix_add0_final(st_device_escv, gx_device_escv,
 /* for ESC/Page-Color */
 #define escv_device_body(name) \
 {\
-  escv_device_full_body(gx_device_escv, escv_initialize, name, \
-                        &st_device_escv,\
+  escv_device_full_body(gx_device_escv, escv_initialize_device_procs,\
+                        name, &st_device_escv,\
 /* width & height */    ESCPAGE_DEFAULT_WIDTH, ESCPAGE_DEFAULT_HEIGHT,\
 /* default resolution */X_DPI, Y_DPI,\
 /* color info */        3, 24, 255, 255, 256, 256,\
@@ -113,8 +113,8 @@ gs_public_st_suffix_add0_final(st_device_escv, gx_device_escv,
 /* for ESC/Page (Monochrome) */
 #define esmv_device_body(name) \
 {\
-  esmv_device_full_body(gx_device_escv, esmv_initialize, name, \
-                        &st_device_escv,\
+  esmv_device_full_body(gx_device_escv, esmv_initialize_device_procs,\
+                        name, &st_device_escv,\
 /* width & height */    ESCPAGE_DEFAULT_WIDTH, ESCPAGE_DEFAULT_HEIGHT,\
 /* default resolution */X_DPI, Y_DPI,\
 /* color info */        1, 8, 255, 255, 256, 256,\
@@ -126,8 +126,8 @@ gs_public_st_suffix_add0_final(st_device_escv, gx_device_escv,
   esmv_init_code\
 }
 
-static int
-esc_initialize(gx_device *dev)
+static void
+esc_initialize_device_procs(gx_device *dev)
 {
     set_dev_proc(dev, open_device, escv_open);
     set_dev_proc(dev, output_page, escv_output_page);
@@ -145,28 +145,26 @@ esc_initialize(gx_device *dev)
     set_dev_proc(dev, fill_parallelogram, gdev_vector_fill_parallelogram);
     set_dev_proc(dev, fill_triangle, gdev_vector_fill_triangle);
     set_dev_proc(dev, begin_typed_image, escv_begin_typed_image);
-
-    return 0;
 }
 
 /* for ESC/Page-Color */
-static int
-escv_initialize(gx_device *dev)
+static void
+escv_initialize_device_procs(gx_device *dev)
 {
     set_dev_proc(dev, map_rgb_color, gx_default_rgb_map_rgb_color);
     set_dev_proc(dev, map_color_rgb, gx_default_rgb_map_color_rgb);
 
-    return esc_initialize(dev);
+    esc_initialize_device_procs(dev);
 }
 
 /* for ESC/Page (Monochrome) */
-static int
-esmv_initialize(gx_device *dev)
+static void
+esmv_initialize_device_procs(gx_device *dev)
 {
     set_dev_proc(dev, map_rgb_color, gx_default_gray_map_rgb_color);
     set_dev_proc(dev, map_color_rgb, gx_default_gray_map_color_rgb);
 
-    return esc_initialize(dev);
+    esc_initialize_device_procs(dev);
 }
 
 #define	escv_init_code_common \
diff --git a/contrib/gdevadmp.c b/contrib/gdevadmp.c
index 840233baf..9e3d74a4b 100644
--- a/contrib/gdevadmp.c
+++ b/contrib/gdevadmp.c
@@ -119,7 +119,7 @@ static dev_proc_print_page(dmp_print_page);
 
 /* Standard DMP device */
 const gx_device_printer far_data gs_appledmp_device =
-prn_device(gdev_prn_initialize_mono_bg, "appledmp",	/* The print_page proc is compatible with allowing bg printing */
+prn_device(gdev_prn_initialize_device_procs_mono_bg, "appledmp",	/* The print_page proc is compatible with allowing bg printing */
         85,				/* width_10ths, 8.5" */
         110,				/* height_10ths, 11" */
         120, 72,			/* X_DPI, Y_DPI */
@@ -128,7 +128,7 @@ prn_device(gdev_prn_initialize_mono_bg, "appledmp",	/* The print_page proc is co
 
 /*  lowrez Imagewriter device */
 const gx_device_printer far_data gs_iwlo_device =
-prn_device(gdev_prn_initialize_mono_bg, "iwlo",	/* The print_page proc is compatible with allowing bg printing */
+prn_device(gdev_prn_initialize_device_procs_mono_bg, "iwlo",	/* The print_page proc is compatible with allowing bg printing */
         85,				/* width_10ths, 8.5" */
         110,				/* height_10ths, 11" */
         160, 72,			/* X_DPI, Y_DPI */
@@ -137,7 +137,7 @@ prn_device(gdev_prn_initialize_mono_bg, "iwlo",	/* The print_page proc is compat
 
 /*  hirez Imagewriter device */
 const gx_device_printer far_data gs_iwhi_device =
-prn_device(gdev_prn_initialize_mono_bg, "iwhi",	/* The print_page proc is compatible with allowing bg printing */
+prn_device(gdev_prn_initialize_device_procs_mono_bg, "iwhi",	/* The print_page proc is compatible with allowing bg printing */
         85,				/* width_10ths, 8.5" */
         110,				/* height_10ths, 11" */
         160, 144,			/* X_DPI, Y_DPI */
@@ -146,7 +146,7 @@ prn_device(gdev_prn_initialize_mono_bg, "iwhi",	/* The print_page proc is compat
 
 /* LQ hirez Imagewriter device */
 const gx_device_printer far_data gs_iwlq_device =
-prn_device(gdev_prn_initialize_mono_bg, "iwlq",	/* The print_page proc is compatible with allowing bg printing */
+prn_device(gdev_prn_initialize_device_procs_mono_bg, "iwlq",	/* The print_page proc is compatible with allowing bg printing */
         85,				/* width_10ths, 8.5" */
         110,				/* height_10ths, 11" */
         320, 216,
diff --git a/contrib/gdevbjc_.c b/contrib/gdevbjc_.c
index ae02d703a..89a73c5c8 100644
--- a/contrib/gdevbjc_.c
+++ b/contrib/gdevbjc_.c
@@ -211,13 +211,10 @@ static media_t media_codes[] = {
 /* ------------------------- 1 bit Monochrome ---------------------------- */
 /***************************************************************************/
 
-static int
-bjcmono_initialize(gx_device *dev)
+static void
+bjcmono_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs(dev);
 
     set_dev_proc(dev, get_params, gdev_bjc_get_params);
     set_dev_proc(dev, put_params, gdev_bjc_put_params);
@@ -225,13 +222,11 @@ bjcmono_initialize(gx_device *dev)
     set_dev_proc(dev, map_rgb_color, NULL);
     set_dev_proc(dev, encode_color, NULL);
     set_dev_proc(dev, decode_color, NULL);
-
-    return 0;
 }
 
 
 const gx_device_bjc_printer gs_bjcmono_device =
-bjc_device(bjcmono_initialize, "bjcmono",
+bjc_device(bjcmono_initialize_device_procs, "bjcmono",
            DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
            X_DPI, Y_DPI,
            (float)(3.4 / 25.4), (float)(7.0 / 25.4),
@@ -248,13 +243,10 @@ bjc_device(bjcmono_initialize, "bjcmono",
 /* -------------------------- 8 bit Grayscale ---------------------------- */
 /***************************************************************************/
 
-static int
-bjcgray_initialize(gx_device *dev)
+static void
+bjcgray_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_gray(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_gray(dev);
 
     set_dev_proc(dev, get_params, gdev_bjc_get_params);
     set_dev_proc(dev, put_params, gdev_bjc_put_params);
@@ -264,12 +256,10 @@ bjcgray_initialize(gx_device *dev)
      * by the system to the default. For compatibility we do the same. */
     set_dev_proc(dev, encode_color, NULL);
     set_dev_proc(dev, decode_color, NULL);
-
-    return 0;
 }
 
 const gx_device_bjc_printer gs_bjcgray_device =
-bjc_device(bjcgray_initialize, "bjcgray",
+bjc_device(bjcgray_initialize_device_procs, "bjcgray",
            DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
            X_DPI, Y_DPI,
            (float)(3.4 / 25.4), (float)(7.0 / 25.4),
@@ -286,13 +276,10 @@ bjc_device(bjcgray_initialize, "bjcgray",
 /* --------------------------- 3 bit CMYK Color -------------------------- */
 /***************************************************************************/
 
-static int
-bjccmyk_initialize(gx_device *dev)
+static void
+bjccmyk_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_cmyk1(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_cmyk1(dev);
 
     set_dev_proc(dev, get_params, gdev_bjc_get_params);
     set_dev_proc(dev, put_params, gdev_bjc_put_params);
@@ -302,12 +289,10 @@ bjccmyk_initialize(gx_device *dev)
      * by the system to the default. For compatibility we do the same. */
     set_dev_proc(dev, encode_color, NULL);
     set_dev_proc(dev, decode_color, NULL);
-
-    return 0;
 }
 
 const gx_device_bjc_printer gs_bjccmyk_device =
-bjc_device(bjccmyk_initialize, "bjccmyk",
+bjc_device(bjccmyk_initialize_device_procs, "bjccmyk",
            DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
            X_DPI, Y_DPI,
            (float)(3.4 / 25.4), (float)(7.0 / 25.4),
@@ -324,13 +309,10 @@ bjc_device(bjccmyk_initialize, "bjccmyk",
 /* --------------------------- 24 bit TrueColor -------------------------- */
 /***************************************************************************/
 
-static int
-bjc_truecolor_initialize(gx_device *dev)
+static void
+bjc_truecolor_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_cmyk8(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_cmyk8(dev);
 
     set_dev_proc(dev, get_params, gdev_bjc_get_params);
     set_dev_proc(dev, put_params, gdev_bjc_put_params);
@@ -340,12 +322,10 @@ bjc_truecolor_initialize(gx_device *dev)
      * by the system to the default. For compatibility we do the same. */
     set_dev_proc(dev, encode_color, NULL);
     set_dev_proc(dev, decode_color, NULL);
-
-    return 0;
 }
 
 const gx_device_bjc_printer gs_bjccolor_device =
-bjc_device(bjc_truecolor_initialize, "bjccolor",
+bjc_device(bjc_truecolor_initialize_device_procs, "bjccolor",
            DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
            X_DPI, Y_DPI,
            (float)(3.4 / 25.4), (float)(7.0 / 25.4),
diff --git a/contrib/gdevcd8.c b/contrib/gdevcd8.c
index 6b124adfc..a4d3a0156 100644
--- a/contrib/gdevcd8.c
+++ b/contrib/gdevcd8.c
@@ -768,13 +768,10 @@ static void
 static void
      cdnj500_terminate_page(gx_device_printer * pdev, gp_file * prn_stream);
 
-static int
-cdj670_initialize(gx_device *dev)
+static void
+cdj670_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs(dev);
 
     set_dev_proc(dev, open_device, hp_colour_open);
     set_dev_proc(dev, map_rgb_color, NULL);
@@ -788,17 +785,12 @@ cdj670_initialize(gx_device *dev)
      * by the system to the default. For compatibility we do the same. */
     set_dev_proc(dev, encode_color, NULL);
     set_dev_proc(dev, decode_color, NULL);
-
-    return 0;
 }
 
-static int
-cdj1600_initialize(gx_device *dev)
+static void
+cdj1600_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs(dev);
 
     set_dev_proc(dev, open_device, hp_colour_open);
     set_dev_proc(dev, map_rgb_color, gdev_pcl_map_rgb_color);
@@ -812,17 +804,12 @@ cdj1600_initialize(gx_device *dev)
      * by the system to the default. For compatibility we do the same. */
     set_dev_proc(dev, encode_color, NULL);
     set_dev_proc(dev, decode_color, NULL);
-
-    return 0;
 }
 
-static int
-chp2200_initialize(gx_device *dev)
+static void
+chp2200_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs(dev);
 
     set_dev_proc(dev, open_device, hp_colour_open);
     set_dev_proc(dev, map_rgb_color, gx_default_rgb_map_rgb_color);
@@ -836,40 +823,38 @@ chp2200_initialize(gx_device *dev)
      * by the system to the default. For compatibility we do the same. */
     set_dev_proc(dev, encode_color, NULL);
     set_dev_proc(dev, decode_color, NULL);
-
-    return 0;
 }
 
 const gx_device_cdj850 gs_cdj670_device =
-cdj_850_device(cdj670_initialize, "cdj670", 600, 600, 32, cdj850_print_page, 0,
+cdj_850_device(cdj670_initialize_device_procs, "cdj670", 600, 600, 32, cdj850_print_page, 0,
                PRESENTATION, PLAIN_PAPER, 2, DJ670C, 9,
                1.0, 0.0, 0.0, 0.0, 0.0, 1.0,
                cdj850_start_raster_mode, cdj850_print_non_blank_lines,
                cdj850_terminate_page);
 
 const gx_device_cdj850 gs_cdj850_device =
-cdj_850_device(cdj670_initialize, "cdj850", 600, 600, 32, cdj850_print_page, 0,
+cdj_850_device(cdj670_initialize_device_procs, "cdj850", 600, 600, 32, cdj850_print_page, 0,
                PRESENTATION, PLAIN_PAPER, 4, DJ850C, 9,
                1.0, 0.0, 0.0, 0.0, 0.0, 1.0,
                cdj850_start_raster_mode, cdj850_print_non_blank_lines,
                cdj850_terminate_page);
 
 const gx_device_cdj850 gs_cdj880_device =
-cdj_850_device(cdj670_initialize, "cdj880", 600, 600, 32, cdj850_print_page, 0,
+cdj_850_device(cdj670_initialize_device_procs, "cdj880", 600, 600, 32, cdj850_print_page, 0,
                PRESENTATION, PLAIN_PAPER, 4, DJ880C, 2,
                1.0, 0.0, 0.0, 0.0, 0.0, 1.0,
                cdj880_start_raster_mode, cdj880_print_non_blank_lines,
                cdj880_terminate_page);
 
 const gx_device_cdj850 gs_cdj890_device =
-cdj_850_device(cdj670_initialize, "cdj890", 600, 600, 32, cdj850_print_page, 0,
+cdj_850_device(cdj670_initialize_device_procs, "cdj890", 600, 600, 32, cdj850_print_page, 0,
                PRESENTATION, PLAIN_PAPER, 4, DJ890C, 9,
                1.0, 0.0, 0.0, 0.0, 0.0, 1.0,
                cdj850_start_raster_mode, cdj850_print_non_blank_lines,
                cdj850_terminate_page);
 
 const gx_device_cdj850 gs_cdj1600_device =
-cdj_1600_device(cdj1600_initialize, "cdj1600", 300, 300, 24, cdj850_print_page, 0,
+cdj_1600_device(cdj1600_initialize_device_procs, "cdj1600", 300, 300, 24, cdj850_print_page, 0,
                 PRESENTATION, PLAIN_PAPER, 2, DJ1600C, 3,
                 1.0, 0.0, 0.0, 0.0, 0.0, 1.0,
                 cdj1600_start_raster_mode, cdj1600_print_non_blank_lines,
@@ -877,7 +862,7 @@ cdj_1600_device(cdj1600_initialize, "cdj1600", 300, 300, 24, cdj850_print_page,
 
 /* HP2200 does not need color matching and halftoning parameters */
 const gx_device_cdj850 gs_chp2200_device =
-chp_2200_device(chp2200_initialize, "chp2200", 300, 300, 24, chp2200_print_page, 0,
+chp_2200_device(chp2200_initialize_device_procs, "chp2200", 300, 300, 24, chp2200_print_page, 0,
                NORMAL, PLAIN_PAPER, 0 /*unused*/, HP2200C, 10,
                0.0, 0.0, 0.0, 0.0, 0.0, 0.0, /*all unused*/
                chp2200_start_raster_mode, NULL /*unused*/,
@@ -885,7 +870,7 @@ chp_2200_device(chp2200_initialize, "chp2200", 300, 300, 24, chp2200_print_page,
 
 /* DNJ500 does not need color matching and halftoning parameters */
 const gx_device_cdj850 gs_cdnj500_device =
-chp_2200_device(chp2200_initialize, "cdnj500", 300, 300, 24, cdnj500_print_page, 0,
+chp_2200_device(chp2200_initialize_device_procs, "cdnj500", 300, 300, 24, cdnj500_print_page, 0,
                NORMAL, PLAIN_PAPER, 0 /*unused*/, DNJ500C, 10,
                0.0, 0.0, 0.0, 0.0, 0.0, 0.0, /*all unused*/
                cdnj500_start_raster_mode, NULL /*unused*/,
diff --git a/contrib/gdevdj9.c b/contrib/gdevdj9.c
index a7d6ab915..87a62b320 100644
--- a/contrib/gdevdj9.c
+++ b/contrib/gdevdj9.c
@@ -510,13 +510,10 @@ typedef struct
     terminate_page\
 }
 
-static int
-cdj970_initialize(gx_device *dev)
+static void
+cdj970_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs(dev);
 
     set_dev_proc(dev, open_device, hp_colour_open);
     set_dev_proc(dev, close_device, cdj970_close);
@@ -531,8 +528,6 @@ cdj970_initialize(gx_device *dev)
      * by the system to the default. For compatibility we do the same. */
     set_dev_proc(dev, encode_color, NULL);
     set_dev_proc(dev, decode_color, NULL);
-
-    return 0;
 }
 
 static void
@@ -549,7 +544,8 @@ static void
 cdj970_terminate_page(gx_device_printer * pdev, gp_file * prn_stream);
 
 const gx_device_cdj970 gs_cdj970_device =
-cdj_970_device(cdj970_initialize, "cdj970", 600, 600, 32, cdj970_print_page, 0,
+cdj_970_device(cdj970_initialize_device_procs, "cdj970",
+               600, 600, 32, cdj970_print_page, 0,
                NORMAL, PLAIN_PAPER, NONE, 4, DJ970C, 2,
                1.0, 0.0, 0.0, 0.0, 0.0, 1.0,
                cdj970_start_raster_mode, cdj970_print_non_blank_lines,
diff --git a/contrib/gdevgdi.c b/contrib/gdevgdi.c
index ee30abf48..cfe69a418 100644
--- a/contrib/gdevgdi.c
+++ b/contrib/gdevgdi.c
@@ -94,22 +94,17 @@ static dev_proc_open_device(gdi_open);
 static dev_proc_close_device(gdi_close);
 static dev_proc_print_page(gdi_print_page);
 
-static int
-gdi_initialize(gx_device *dev)
+static void
+gdi_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, open_device, gdi_open);
     set_dev_proc(dev, close_device, gdi_close);
-
-    return 0;
 }
 
 gx_device_printer far_data gs_gdi_device =
-  prn_device(gdi_initialize, "gdi",
+  prn_device(gdi_initialize_device_procs, "gdi",
         DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, /* paper size (unit : 10/72 inch size) */
         X_DPI2, Y_DPI2,
         0.20, 0.25, 0.25, 0.25,		/* margins filled in by gdi_open */
@@ -117,7 +112,7 @@ gx_device_printer far_data gs_gdi_device =
         gdi_print_page);
 
 gx_device_printer far_data gs_samsunggdi_device =
-  prn_device(gdi_initialize, "samsunggdi",
+  prn_device(gdi_initialize_device_procs, "samsunggdi",
         DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, /* paper size (unit : 10/72 inch size) */
         X_DPI2, Y_DPI2,
         0.20, 0.25, 0.25, 0.25,		/* margins filled in by gdi_open */
diff --git a/contrib/gdevhl12.c b/contrib/gdevhl12.c
index 3cf4272c5..860d365a8 100644
--- a/contrib/gdevhl12.c
+++ b/contrib/gdevhl12.c
@@ -159,24 +159,20 @@ static dev_proc_print_page_copies(hl1250_print_page_copies);
 static dev_proc_get_params(hl1250_get_params);
 static dev_proc_put_params(hl1250_put_params);
 
-static int
-hl1250_initialize(gx_device *dev)
+static void
+hl1250_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, open_device, hl1250_open);
     set_dev_proc(dev, close_device, hl1250_close);
     set_dev_proc(dev, get_params, hl1250_get_params);
     set_dev_proc(dev, put_params, hl1250_put_params);
-
-    return 0;
 }
 
 #define hl1250_device_copies(dname, xdpi, ydpi)\
-{   prn_device_std_body_copies(gx_device_hl1250, hl1250_initialize,\
+{   prn_device_std_body_copies(gx_device_hl1250,\
+                               hl1250_initialize_device_procs,\
                                dname,\
                                DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,\
                                xdpi, ydpi,\
diff --git a/contrib/gdevln03.c b/contrib/gdevln03.c
index f569a695f..c5f087e30 100644
--- a/contrib/gdevln03.c
+++ b/contrib/gdevln03.c
@@ -51,17 +51,12 @@ static dev_proc_print_page(ln03_print_page);
 
 /* We have to supply our own procs, since we have to intercept */
 /* output_page so we can open the printer in text mode. */
-static int
-sixel_initialize(gx_device *dev)
+static void
+sixel_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, output_page, sixel_output_page);
-
-    return 0;
 }
 
 #ifdef A4
@@ -70,7 +65,7 @@ sixel_initialize(gx_device *dev)
 #  define BOTTOM_MARGIN 0.4
 #endif
 gx_device_printer gs_ln03_device =
-    prn_device(sixel_initialize, "ln03",
+    prn_device(sixel_initialize_device_procs, "ln03",
                DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
                300, 300,		/* x_dpi, y_dpi */
                0, BOTTOM_MARGIN, 0, 0,	/* left, bottom, right, top margin */
@@ -107,7 +102,7 @@ ln03_print_page(gx_device_printer *pdev, gp_file *prn_stream)
  */
 static dev_proc_print_page(dl2100_print_page);
 gx_device_printer gs_dl2100_device =
-    prn_device(sixel_initialize, "dl2100",
+    prn_device(sixel_initialize_device_procs, "dl2100",
                DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
                300, 300,		/* x_dpi, y_dpi */
                0, 0, 0, 0,	/* left, bottom, right, top margin */
@@ -132,7 +127,7 @@ dl2100_print_page(gx_device_printer *pdev, gp_file *prn_stream)
  */
 static dev_proc_print_page(la50_print_page);
 gx_device_printer gs_la50_device =
-    prn_device(sixel_initialize, "la50",
+    prn_device(sixel_initialize_device_procs, "la50",
                85,
                110,
                144, 72,
@@ -159,7 +154,7 @@ la50_print_page(gx_device_printer *pdev, gp_file *prn_stream)
  */
 static dev_proc_print_page(la70_print_page);
 gx_device_printer gs_la70_device =
-    prn_device(sixel_initialize, "la70",
+    prn_device(sixel_initialize_device_procs, "la70",
                85,
                110,
                144, 144,
@@ -185,7 +180,7 @@ la70_print_page(gx_device_printer *pdev, gp_file *prn_stream)
  */
 static dev_proc_print_page(la75_print_page);
 gx_device_printer gs_la75_device =
-    prn_device(sixel_initialize, "la75",
+    prn_device(sixel_initialize_device_procs, "la75",
                85,
                110,
                144, 72,
@@ -212,7 +207,7 @@ la75_print_page(gx_device_printer *pdev, gp_file *prn_stream)
  */
 static dev_proc_print_page(la75plus_print_page);
 gx_device_printer gs_la75plus_device =
-    prn_device(sixel_initialize, "la75plus",
+    prn_device(sixel_initialize_device_procs, "la75plus",
                85,
                110,
                180, 180,
@@ -246,7 +241,7 @@ la75plus_print_page(gx_device_printer *pdev, gp_file *prn_stream)
  */
 static dev_proc_print_page(sxlcrt_print_page);
 gx_device_printer gs_sxlcrt_device =
-    prn_device(sixel_initialize,
+    prn_device(sixel_initialize_device_procs,
                "sxlcrt",
                180,
                110,
diff --git a/contrib/gdevlx32.c b/contrib/gdevlx32.c
index 12ff12532..6724b6bc9 100644
--- a/contrib/gdevlx32.c
+++ b/contrib/gdevlx32.c
@@ -257,13 +257,10 @@ static int print_photo_page(pagedata *gendata);
  */
 
 /* Device procedures */
-static int
-lxm3200_initialize(gx_device *dev)
+static void
+lxm3200_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs(dev);
 
     set_dev_proc(dev, open_device, lxm3200_open);
     set_dev_proc(dev, map_rgb_color, lxm3200_map_rgb_color);
@@ -276,8 +273,6 @@ lxm3200_initialize(gx_device *dev)
      * by the system to the default. For compatibility we do the same. */
     set_dev_proc(dev, encode_color, NULL);
     set_dev_proc(dev, decode_color, NULL);
-
-    return 0;
 }
 
 /* Define an extension (subclass) of gx_device_printer. */
@@ -326,7 +321,7 @@ struct lxm_device_s
 lxm_device far_data gs_lxm3200_device =
 {
         prn_device_body(lxm_device,
-                lxm3200_initialize,
+                lxm3200_initialize_device_procs,
                 "lxm3200",
                 DEFAULT_WIDTH_10THS,
                 DEFAULT_HEIGHT_10THS,
diff --git a/contrib/gdevlx7.c b/contrib/gdevlx7.c
index 7412244e3..d4fb44a5a 100644
--- a/contrib/gdevlx7.c
+++ b/contrib/gdevlx7.c
@@ -107,18 +107,13 @@ static dev_proc_get_params(lxm_get_params);
 static dev_proc_put_params(lxm_put_params);
 
 /* set up dispatch table.  I follow gdevdjet in using gdev_prn_output_page */
-static int
-lxm7000m_initialize(gx_device *dev)
+static void
+lxm7000m_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, get_params, lxm_get_params);
     set_dev_proc(dev, put_params, lxm_put_params);
-
-    return 0;
 }
 
 /* The device descriptors */
@@ -150,7 +145,7 @@ typedef struct lxm_device_s { /* a sub-class of gx_device_printer */
 #define LXR_1200 2
 
 lxm_device far_data gs_lex7000_device = {
-    prn_device_std_body(lxm_device, lxm7000m_initialize, "lex7000",
+    prn_device_std_body(lxm_device, lxm7000m_initialize_device_procs, "lex7000",
         DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
         /* total width & height in 10x " - A4 or letter compiled in.
          * may be overriden by -sPAPERSIZE=a4 of -sPAPERSIZE=letter
@@ -173,7 +168,7 @@ lxm_device far_data gs_lex7000_device = {
 };
 
 lxm_device far_data gs_lex5700_device = {
-    prn_device_std_body(lxm_device, lxm7000m_initialize, "lex5700",
+    prn_device_std_body(lxm_device, lxm7000m_initialize_device_procs, "lex5700",
         DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
         /* total width & height in 10x " - A4 or letter compiled in.
          * may be overriden by -sPAPERSIZE=a4 of -sPAPERSIZE=letter
@@ -196,7 +191,7 @@ lxm_device far_data gs_lex5700_device = {
 };
 
 lxm_device far_data gs_lex3200_device = {
-    prn_device_std_body(lxm_device, lxm7000m_initialize, "lex3200",
+    prn_device_std_body(lxm_device, lxm7000m_initialize_device_procs, "lex3200",
         DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
         /* total width & height in 10x " - A4 or letter compiled in.
          * may be overriden by -sPAPERSIZE=a4 of -sPAPERSIZE=letter
@@ -219,7 +214,7 @@ lxm_device far_data gs_lex3200_device = {
 };
 
 lxm_device far_data gs_lex2050_device = {
-    prn_device_std_body(lxm_device, lxm7000m_initialize, "lex2050",
+    prn_device_std_body(lxm_device, lxm7000m_initialize_device_procs, "lex2050",
         DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
         /* total width & height in 10x " - A4 or letter compiled in.
          * may be overriden by -sPAPERSIZE=a4 of -sPAPERSIZE=letter
diff --git a/contrib/gdevmd2k.c b/contrib/gdevmd2k.c
index 0f1c2123f..826846f96 100644
--- a/contrib/gdevmd2k.c
+++ b/contrib/gdevmd2k.c
@@ -64,13 +64,10 @@ typedef struct gx_device_alps_s gx_device_alps;
 
 #define dev_alps ((gx_device_alps *) pdev)
 
-static int
-alps_initialize(gx_device *dev)
+static void
+alps_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs(dev);
 
     set_dev_proc(dev, open_device, alps_open);
     set_dev_proc(dev, map_color_rgb, alps_map_color_rgb);
@@ -83,13 +80,11 @@ alps_initialize(gx_device *dev)
      * by the system to the default. For compatibility we do the same. */
     set_dev_proc(dev, encode_color, NULL);
     set_dev_proc(dev, decode_color, NULL);
-
-    return 0;
 }
 
 #define alps_device(dname, print_page) \
 {\
-    prn_device_body(gx_device_alps, alps_initialize, dname,\
+    prn_device_body(gx_device_alps, alps_initialize_device_procs, dname,\
                     DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,\
                     600, 600,\
                     0, 0, 0, 0, /* margin */\
diff --git a/contrib/gdevop4w.c b/contrib/gdevop4w.c
index d6e3d7966..4d5a38f5c 100644
--- a/contrib/gdevop4w.c
+++ b/contrib/gdevop4w.c
@@ -94,22 +94,17 @@ static dev_proc_open_device(oki4w_open);
 static dev_proc_close_device(oki4w_close);
 static dev_proc_print_page(oki4w_print_page);
 
-static int
-oki4w_initialize(gx_device *dev)
+static void
+oki4w_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, open_device, oki4w_open);
     set_dev_proc(dev, close_device, oki4w_close);
-
-    return 0;
 }
 
 gx_device_printer far_data gs_oki4w_device =
-  prn_device(oki4w_initialize, "oki4w",
+  prn_device(oki4w_initialize_device_procs, "oki4w",
         DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
         X_DPI, Y_DPI,
         0, 0, 0, 0,		/* margins filled in by oki4w_open */
diff --git a/contrib/gdevxes.c b/contrib/gdevxes.c
index cbe85d82e..0f2db969a 100644
--- a/contrib/gdevxes.c
+++ b/contrib/gdevxes.c
@@ -49,17 +49,12 @@ static int sixel_print_page(gx_device_printer *pdev,
 static dev_proc_output_page(sixel_output_page);
 static dev_proc_print_page(xes_print_page);
 
-static int
-sixel_initialize(gx_device *dev)
+static void
+sixel_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, output_page, sixel_output_page);
-
-    return 0;
 }
 
 
@@ -72,7 +67,7 @@ sixel_initialize(gx_device *dev)
 #endif
 
 gx_device_printer gs_xes_device =
-    prn_device(sixel_initialize, "xes",
+    prn_device(sixel_initialize_device_procs, "xes",
                DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
                300, 300,		/* x_dpi, y_dpi */
                0, BOTTOM_MARGIN, 0, 0,	/* left, bottom, right, top margin */
diff --git a/contrib/japanese/gdev10v.c b/contrib/japanese/gdev10v.c
index 6f341f43d..0bd3cec02 100644
--- a/contrib/japanese/gdev10v.c
+++ b/contrib/japanese/gdev10v.c
@@ -63,35 +63,28 @@ bj10v_get_initial_matrix(gx_device *dev, gs_matrix *pmat)
         pmat->ty -= dev_t_margin(dev) * dev->y_pixels_per_inch;
 }
 
-static int
-bj10v_initialize(gx_device *dev)
+static void
+bj10v_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, get_initial_matrix, bj10v_get_initial_matrix);
-
-    return 0;
 }
 
 #else
 
-static int
-bj10v_initialize(gx_device *dev)
+static void
+bj10v_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, open_device, bj10v_open);
-
-    return 0;
 }
 
 #endif
 
 gx_device_printer gs_bj10v_device =
-  prn_device(bj10v_initialize, "bj10v",
+  prn_device(bj10v_initialize_device_procs, "bj10v",
         DEFAULT_WIDTH_10THS,		/* width_10ths */
         DEFAULT_HEIGHT_10THS,	/* height_10ths */
         360,				/* x_dpi */
@@ -100,7 +93,7 @@ gx_device_printer gs_bj10v_device =
         1, bj10v_print_page);
 
 gx_device_printer gs_bj10vh_device =
-  prn_device(bj10v_initialize, "bj10vh",
+  prn_device(bj10v_initialize_device_procs, "bj10vh",
         DEFAULT_WIDTH_10THS,		/* width_10ths */
         DEFAULT_HEIGHT_10THS,  	/* height_10ths */
         360,				/* x_dpi */
diff --git a/contrib/japanese/gdevalps.c b/contrib/japanese/gdevalps.c
index 0af77999b..c04f69efc 100644
--- a/contrib/japanese/gdevalps.c
+++ b/contrib/japanese/gdevalps.c
@@ -57,21 +57,16 @@ static dev_proc_print_page(md50m_print_page);
 static dev_proc_print_page(md50e_print_page);
 static dev_proc_print_page(md1xm_print_page);
 
-static int
-md_initialize(gx_device *dev)
+static void
+md_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, open_device, md_open);
-
-    return 0;
 }
 
 gx_device_printer far_data gs_md50Mono_device =
-  prn_device(md_initialize, "md50Mono",
+  prn_device(md_initialize_device_procs, "md50Mono",
         DEFAULT_WIDTH_10THS,
         DEFAULT_HEIGHT_10THS,
         600,				/* x_dpi */
@@ -80,7 +75,7 @@ gx_device_printer far_data gs_md50Mono_device =
         1, md50m_print_page);
 
 gx_device_printer far_data gs_md50Eco_device =
-  prn_device(md_initialize, "md50Eco",
+  prn_device(md_initialize_device_procs, "md50Eco",
         DEFAULT_WIDTH_10THS,
         DEFAULT_HEIGHT_10THS,
         600,				/* x_dpi */
@@ -89,7 +84,7 @@ gx_device_printer far_data gs_md50Eco_device =
         1, md50e_print_page);
 
 gx_device_printer far_data gs_md1xMono_device =
-  prn_device(md_initialize, "md1xMono",
+  prn_device(md_initialize_device_procs, "md1xMono",
         DEFAULT_WIDTH_10THS,
         DEFAULT_HEIGHT_10THS,
         600,				/* x_dpi */
diff --git a/contrib/japanese/gdevespg.c b/contrib/japanese/gdevespg.c
index e312e3669..4ce7b718c 100644
--- a/contrib/japanese/gdevespg.c
+++ b/contrib/japanese/gdevespg.c
@@ -42,44 +42,34 @@ static dev_proc_image_out(escpage_image_out);
 static void escpage_printer_initialize(gx_device_printer * pdev, gp_file * fp, int);
 static void escpage_paper_set(gx_device_printer * pdev, gp_file * fp);
 
-static int
-lp2000_initialize(gx_device *dev)
+static void
+lp2000_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, open_device, lp2000_open);
     set_dev_proc(dev, get_params, lprn_get_params);
     set_dev_proc(dev, put_params, lprn_put_params);
-
-    return code;
 }
 
-static int
-escpage_initialize(gx_device *dev)
+static void
+escpage_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, open_device, escpage_open);
     set_dev_proc(dev, close_device, escpage_close);
     set_dev_proc(dev, get_params, lprn_get_params);
     set_dev_proc(dev, put_params, lprn_put_params);
-
-    return code;
 }
 
 gx_device_lprn far_data gs_lp2000_device =
-lprn_device(gx_device_lprn, lp2000_initialize, "lp2000",
+lprn_device(gx_device_lprn, lp2000_initialize_device_procs, "lp2000",
             DPI, DPI, 0.0, 0.0, 0.0, 0.0, 1,
             lp2000_print_page_copies, escpage_image_out);
 
 gx_device_lprn far_data gs_escpage_device =
-lprn_duplex_device(gx_device_lprn, escpage_initialize, "escpage",
+lprn_duplex_device(gx_device_lprn, escpage_initialize_device_procs, "escpage",
                    DPI, DPI, 0.0, 0.0, 0.0, 0.0, 1,
                    escpage_print_page_copies, escpage_image_out);
 
diff --git a/contrib/japanese/gdevfmlbp.c b/contrib/japanese/gdevfmlbp.c
index 568f3c304..6901d383c 100644
--- a/contrib/japanese/gdevfmlbp.c
+++ b/contrib/japanese/gdevfmlbp.c
@@ -41,24 +41,19 @@ copies.  */
 /* The device descriptors */
 static dev_proc_print_page(fmlbp_print_page);
 
-static int fmlbp_initialize(gx_device *dev)
+static void fmlbp_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, encode_color, NULL);
     set_dev_proc(dev, decode_color, NULL);
-
-    return 0;
 }
 
 #ifdef FMLBP_NOADJUST_MARGIN
-#define PRNFML_INIT fmlbp_initialize
+#define PRNFML_INIT fmlbp_initialize_device_procs
 #else
 /* Adjust margin for ghostscript 2.6.1 */
-#define PRNFML_INIT fmlbp_initialize_with_matrix
+#define PRNFML_INIT fmlbp_initialize_device_procs_with_matrix
 
 /* Shift the origin from the top left corner of the pysical page to the
    first printable pixel, as defined by the top and left margins. */
@@ -70,16 +65,11 @@ fmlbp_get_initial_matrix(gx_device *dev, gs_matrix *pmat)
   pmat->ty -= (dev->t_margin * dev->y_pixels_per_inch);
 }
 
-static int fmlbp_initialize_with_matrix(gx_device *dev)
+static void fmlbp_initialize_device_procs_with_matrix(gx_device *dev)
 {
-    int code = fmlbp_initialize(dev);
-
-    if (code < 0)
-        return code;
+    fmlbp_initialize_device_procs(dev);
 
     set_dev_proc(dev, get_initial_matrix, fmlbp_get_initial_matrix);
-
-    return 0;
 }
 #endif/*FMLBP_NOADJUST_MARGIN*/
 
diff --git a/contrib/japanese/gdevfmpr.c b/contrib/japanese/gdevfmpr.c
index b134926de..3e4aaefdc 100644
--- a/contrib/japanese/gdevfmpr.c
+++ b/contrib/japanese/gdevfmpr.c
@@ -30,7 +30,7 @@ static dev_proc_print_page(fmpr_print_page);
 
 /* The device descriptor */
 gx_device_printer gs_fmpr_device =
-  prn_device(gdev_prn_initialize_mono, "fmpr",
+  prn_device(gdev_prn_initialize_device_procs_mono, "fmpr",
              DEFAULT_WIDTH_10THS,
              DEFAULT_HEIGHT_10THS,
              180,		/* x_dpi */
diff --git a/contrib/japanese/gdevj100.c b/contrib/japanese/gdevj100.c
index 6582cf33c..8305e1c46 100644
--- a/contrib/japanese/gdevj100.c
+++ b/contrib/japanese/gdevj100.c
@@ -29,7 +29,7 @@ static dev_proc_print_page(jj100_print_page);
 
 /* The device descriptor */
 gx_device_printer gs_jj100_device =
-  prn_device(gdev_prn_initialize_mono, "jj100",
+  prn_device(gdev_prn_initialize_device_procs_mono, "jj100",
         82,                  /* width_10ths, 8.2" = 210mm(A4) */
         115 /*113, 117*/,    /* height_10ths, 11.7" = 297mm(A4) */
         360,			/* x_dpi */
diff --git a/contrib/japanese/gdevlbp3.c b/contrib/japanese/gdevlbp3.c
index ade84b210..8042d4db0 100644
--- a/contrib/japanese/gdevlbp3.c
+++ b/contrib/japanese/gdevlbp3.c
@@ -15,7 +15,7 @@ static dev_proc_print_page(lbp310PrintPage);
 static dev_proc_print_page(lbp320PrintPage);
 
 gx_device_printer far_data gs_lbp310_device =
-        prn_device(gdev_prn_initialize_mono,
+        prn_device(gdev_prn_initialize_device_procs_mono,
         "lbp310",
         DEFAULT_WIDTH_10THS,
         DEFAULT_HEIGHT_10THS,
@@ -27,7 +27,7 @@ gx_device_printer far_data gs_lbp310_device =
         1, lbp310PrintPage);
 
 gx_device_printer far_data gs_lbp320_device =
-        prn_device(gdev_prn_initialize_mono,
+        prn_device(gdev_prn_initialize_device_procs_mono,
         "lbp320",
         DEFAULT_WIDTH_10THS,
         DEFAULT_HEIGHT_10THS,
diff --git a/contrib/japanese/gdevmjc.c b/contrib/japanese/gdevmjc.c
index 423e2de6f..591f75fd6 100644
--- a/contrib/japanese/gdevmjc.c
+++ b/contrib/japanese/gdevmjc.c
@@ -208,94 +208,74 @@ typedef struct gx_device_mj_s gx_device_mj;
          (bpp == 32 ? 3 : 1), dns, r, g, b, k, drct, mcrwv, dtsz \
 }
 
-static int
-mj_initialize(gx_device *dev)
+static void
+mj_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs(dev);
 
     set_dev_proc(dev, map_rgb_color, gdev_mjc_map_rgb_color);
     set_dev_proc(dev, map_color_rgb, gdev_mjc_map_color_rgb);
     set_dev_proc(dev, get_params, mj_get_params);
     set_dev_proc(dev, encode_color, gdev_mjc_encode_color);
     set_dev_proc(dev, decode_color, gdev_mjc_decode_color);
-
-    return 0;
 }
 
-static int
-mj700v2c_initialize(gx_device *dev)
+static void
+mj700v2c_initialize_device_procs(gx_device *dev)
 {
-    int code = mj_initialize(dev);
-
-    if (code < 0)
-        return code;
+    mj_initialize_device_procs(dev);
 
     set_dev_proc(dev, open_device, mj700v2c_open);
     set_dev_proc(dev, put_params, mj700v2c_put_params);
-
-    return 0;
 }
 
-static int
-mj500c_initialize(gx_device *dev)
+static void
+mj500c_initialize_device_procs(gx_device *dev)
 {
-    int code = mj_initialize(dev);
-
-    if (code < 0)
-        return code;
+    mj_initialize_device_procs(dev);
 
     set_dev_proc(dev, open_device, mj500c_open);
     set_dev_proc(dev, put_params, mj500c_put_params);
-
-    return 0;
 }
 
-static int
-mj6000c_initialize(gx_device *dev)
+static void
+mj6000c_initialize_device_procs(gx_device *dev)
 {
-    int code = mj_initialize(dev);
-
-    if (code < 0)
-        return code;
+    mj_initialize_device_procs(dev);
 
     set_dev_proc(dev, open_device, mj6000c_open);
     set_dev_proc(dev, put_params, mj700v2c_put_params);
-
-    return 0;
 }
 
-static int
-mj8000c_initialize(gx_device *dev)
+static void
+mj8000c_initialize_device_procs(gx_device *dev)
 {
-    int code = mj_initialize(dev);
-
-    if (code < 0)
-        return code;
+    mj_initialize_device_procs(dev);
 
     set_dev_proc(dev, open_device, mj8000c_open);
     set_dev_proc(dev, put_params, mj700v2c_put_params);
-
-    return 0;
 }
 
 gx_device_mj far_data gs_mj700v2c_device =
-mjcmyk_device(mj700v2c_initialize, "mj700v2c", 360, 360, BITSPERPIXEL,
-          mj700v2c_print_page, 1024, 1024, 1024, 1024, 1024, 0, 1, 1);
+mjcmyk_device(mj700v2c_initialize_device_procs, "mj700v2c",
+              360, 360, BITSPERPIXEL,
+              mj700v2c_print_page,
+              1024, 1024, 1024, 1024, 1024, 0, 1, 1);
 
 gx_device_mj far_data gs_mj500c_device =
-mjcmy_device(mj500c_initialize, "mj500c", 360, 360, BITSPERPIXEL,
-          mj500c_print_page, 1024, 1024, 1024, 1024, 1024, 0, 1, 1);
+mjcmy_device(mj500c_initialize_device_procs, "mj500c",
+             360, 360, BITSPERPIXEL,
+             mj500c_print_page, 1024, 1024, 1024, 1024, 1024, 0, 1, 1);
 
 gx_device_mj far_data gs_mj6000c_device =
-mjcmyk_device(mj6000c_initialize, "mj6000c", 360, 360, BITSPERPIXEL,
-          mj6000c_print_page, 1024, 1024, 1024, 1024, 1024, 0, 1, 1);
+mjcmyk_device(mj6000c_initialize_device_procs, "mj6000c",
+              360, 360, BITSPERPIXEL,
+              mj6000c_print_page, 1024, 1024, 1024, 1024, 1024, 0, 1, 1);
 
 gx_device_mj far_data gs_mj8000c_device =
-mjcmyk_device(mj8000c_initialize, "mj8000c", 360, 360, BITSPERPIXEL,
-          mj8000c_print_page, 1024, 1024, 1024, 1024, 1024, 0, 1, 1);
+mjcmyk_device(mj8000c_initialize_device_procs, "mj8000c",
+              360, 360, BITSPERPIXEL,
+              mj8000c_print_page, 1024, 1024, 1024, 1024, 1024, 0, 1, 1);
 
 /* Get the paper size code, based on width and height. */
 static int
diff --git a/contrib/japanese/gdevml6.c b/contrib/japanese/gdevml6.c
index 6aff86ae5..9ea1fbb57 100644
--- a/contrib/japanese/gdevml6.c
+++ b/contrib/japanese/gdevml6.c
@@ -32,22 +32,17 @@ static dev_proc_open_device(ml600_open);
 static dev_proc_close_device(ml600_close);
 static dev_proc_print_page(ml600_print_page);
 
-static int
-ml600_initialize(gx_device *dev)
+static void
+ml600_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, open_device, ml600_open);
     set_dev_proc(dev, close_device, ml600_close);
-
-    return code;
 }
 
 gx_device_printer gs_ml600_device =
-  prn_device(ml600_initialize, "ml600",
+  prn_device(ml600_initialize_device_procs, "ml600",
         83,				/* width_10ths, 8.3" */
         117,				/* height_10ths, 11.7" */
         600, 600,
diff --git a/contrib/japanese/gdevnpdl.c b/contrib/japanese/gdevnpdl.c
index 590510624..9c6d6bbac 100644
--- a/contrib/japanese/gdevnpdl.c
+++ b/contrib/japanese/gdevnpdl.c
@@ -118,24 +118,19 @@ static dev_proc_print_page_copies(npdl_print_page_copies);
 static dev_proc_put_params(npdl_put_params);
 static dev_proc_image_out(npdl_image_out);
 
-static int
-npdl_initialize(gx_device *dev)
+static void
+npdl_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, open_device, npdl_open);
     set_dev_proc(dev, close_device, npdl_close);
     set_dev_proc(dev, get_params, lprn_get_params);
     set_dev_proc(dev, put_params, npdl_put_params);
-
-    return code;
 }
 
 gx_device_lprn far_data gs_npdl_device =
-lprn_duplex_device(gx_device_lprn, npdl_initialize, "npdl",
+lprn_duplex_device(gx_device_lprn, npdl_initialize_device_procs, "npdl",
             X_DPI, Y_DPI,	/* default resolution */
             0.0, 0.0, 0.0, 0.0,	/* margins */
             1, npdl_print_page_copies, npdl_image_out);
diff --git a/contrib/japanese/gdevp201.c b/contrib/japanese/gdevp201.c
index dc8b368e3..43fc8b977 100644
--- a/contrib/japanese/gdevp201.c
+++ b/contrib/japanese/gdevp201.c
@@ -41,7 +41,7 @@ static dev_proc_print_page(pr201_print_page);
 
 /* The device descriptor */
 gx_device_printer gs_pr201_device =
-  prn_device(gdev_prn_initialize_mono, "pr201",
+  prn_device(gdev_prn_initialize_device_procs_mono, "pr201",
         WIDTH,
         HEIGHT,
         160,
@@ -50,7 +50,7 @@ gx_device_printer gs_pr201_device =
         1, pr201_print_page);
 
 gx_device_printer gs_pr1000_device =
-  prn_device(gdev_prn_initialize_mono, "pr1000",
+  prn_device(gdev_prn_initialize_device_procs_mono, "pr1000",
         WIDTH,
         HEIGHT,
         240,
@@ -59,7 +59,7 @@ gx_device_printer gs_pr1000_device =
         1, pr201_print_page);
 
 gx_device_printer gs_pr150_device =
-  prn_device(gdev_prn_initialize_mono, "pr150",
+  prn_device(gdev_prn_initialize_device_procs_mono, "pr150",
         WIDTH,
         HEIGHT,
         320,
@@ -68,7 +68,7 @@ gx_device_printer gs_pr150_device =
         1, pr201_print_page);
 
 gx_device_printer gs_pr1000_4_device =
-  prn_device(gdev_prn_initialize, "pr1000_4",
+  prn_device(gdev_prn_initialize_device_procs, "pr1000_4",
         WIDTH,
         HEIGHT,
         400,
diff --git a/contrib/japanese/gdevrpdl.c b/contrib/japanese/gdevrpdl.c
index 05a83c600..dbb0249c9 100644
--- a/contrib/japanese/gdevrpdl.c
+++ b/contrib/japanese/gdevrpdl.c
@@ -34,24 +34,19 @@ static dev_proc_image_out(rpdl_image_out);
 static void rpdl_printer_initialize(gx_device_printer * pdev, gp_file * prn_stream, int num_copies);
 static void rpdl_paper_set(gx_device_printer * pdev, gp_file * prn_stream);
 
-static int
-rpdl_initialize(gx_device *dev)
+static void
+rpdl_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, open_device, rpdl_open);
     set_dev_proc(dev, close_device, rpdl_close);
     set_dev_proc(dev, get_params, lprn_get_params);
     set_dev_proc(dev, put_params, lprn_put_params);
-
-    return code;
 }
 
 gx_device_lprn far_data gs_rpdl_device =
-lprn_device(gx_device_lprn, rpdl_initialize, "rpdl",
+lprn_device(gx_device_lprn, rpdl_initialize_device_procs, "rpdl",
             DPI, DPI, 0.0, 0.0, 0.0, 0.0, 1,
             rpdl_print_page_copies, rpdl_image_out);
 
diff --git a/contrib/lips4/gdevl4r.c b/contrib/lips4/gdevl4r.c
index e679791c9..3b5100c4c 100644
--- a/contrib/lips4/gdevl4r.c
+++ b/contrib/lips4/gdevl4r.c
@@ -99,72 +99,52 @@ struct gx_device_lips4_s {
     lips4_params_common;
 };
 
-static int
-lips2p_initialize(gx_device *dev)
+static void
+lips2p_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, open_device, lips2p_open);
     set_dev_proc(dev, close_device, lips_close);
     set_dev_proc(dev, get_params, lips_get_params);
     set_dev_proc(dev, put_params, lips_put_params);
-
-    return 0;
 };
 
-static int
-lips3_initialize(gx_device *dev)
+static void
+lips3_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, open_device, lips3_open);
     set_dev_proc(dev, close_device, lips_close);
     set_dev_proc(dev, get_params, lips_get_params);
     set_dev_proc(dev, put_params, lips_put_params);
-
-    return 0;
 };
 
-static int
-bjc880j_initialize(gx_device *dev)
+static void
+bjc880j_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, open_device, bjc880j_open);
     set_dev_proc(dev, close_device, lips_close);
     set_dev_proc(dev, get_params, lips4_get_params);
     set_dev_proc(dev, put_params, lips4_put_params);
-
-    return 0;
 };
 
-static int
-lips4_initialize(gx_device *dev)
+static void
+lips4_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize_mono(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs_mono(dev);
 
     set_dev_proc(dev, open_device, lips4_open);
     set_dev_proc(dev, close_device, lips_close);
     set_dev_proc(dev, get_params, lips4_get_params);
     set_dev_proc(dev, put_params, lips4_put_params);
-
-    return 0;
 };
 
 gx_device_lips far_data gs_lips2p_device =
-lips_device(gx_device_lips, lips2p_initialize, "lips2p",
+lips_device(gx_device_lips, lips2p_initialize_device_procs, "lips2p",
             LIPS2P_DPI_DEFAULT,
             LIPS2P_DPI_DEFAULT,
             LIPS2P_LEFT_MARGIN_DEFAULT,
@@ -176,7 +156,7 @@ lips_device(gx_device_lips, lips2p_initialize, "lips2p",
             LIPS_USERNAME_DEFAULT);
 
 gx_device_lips far_data gs_lips3_device =
-lips_device(gx_device_lips, lips3_initialize, "lips3",
+lips_device(gx_device_lips, lips3_initialize_device_procs, "lips3",
             LIPS3_DPI_DEFAULT,
             LIPS3_DPI_DEFAULT,
             LIPS3_LEFT_MARGIN_DEFAULT,
@@ -188,7 +168,7 @@ lips_device(gx_device_lips, lips3_initialize, "lips3",
             LIPS_USERNAME_DEFAULT);
 
 gx_device_lips4 far_data gs_bjc880j_device =
-lips4_device(gx_device_lips4, bjc880j_initialize, "bjc880j",
+lips4_device(gx_device_lips4, bjc880j_initialize_device_procs, "bjc880j",
              BJC880J_DPI_DEFAULT,
              BJC880J_DPI_DEFAULT,
              BJC880J_LEFT_MARGIN_DEFAULT,
@@ -200,7 +180,7 @@ lips4_device(gx_device_lips4, bjc880j_initialize, "bjc880j",
              LIPS_USERNAME_DEFAULT);
 
 gx_device_lips4 far_data gs_lips4_device =
-lips4_device(gx_device_lips4, lips4_initialize, "lips4",
+lips4_device(gx_device_lips4, lips4_initialize_device_procs, "lips4",
              LIPS4_DPI_DEFAULT,
              LIPS4_DPI_DEFAULT,
              LIPS4_LEFT_MARGIN_DEFAULT,
diff --git a/contrib/lips4/gdevl4v.c b/contrib/lips4/gdevl4v.c
index 32613fe60..5cba57119 100644
--- a/contrib/lips4/gdevl4v.c
+++ b/contrib/lips4/gdevl4v.c
@@ -145,7 +145,8 @@ gs_public_st_suffix_add0_final(st_device_lips4v, gx_device_lips4v,
         std_device_part3_()
 
 #define lips4v_device_body\
-  lips_device_full_body(gx_device_lips4v, lips4v_initialize, "lips4v",\
+  lips_device_full_body(gx_device_lips4v,\
+                        lips4v_initialize_device_procs, "lips4v",\
                         &st_device_lips4v,\
                         DEFAULT_WIDTH_10THS * X_DPI / 10,\
                         DEFAULT_HEIGHT_10THS * Y_DPI / 10,\
@@ -156,8 +157,8 @@ gs_public_st_suffix_add0_final(st_device_lips4v, gx_device_lips4v,
                         LIPS4_RIGHT_MARGIN_DEFAULT,\
                         LIPS4_TOP_MARGIN_DEFAULT)
 
-static int
-lips4v_initialize(gx_device *dev)
+static void
+lips4v_initialize_device_procs(gx_device *dev)
 {
     set_dev_proc(dev, open_device, lips4v_open);
     set_dev_proc(dev, get_initial_matrix, gx_upright_get_initial_matrix);
@@ -178,8 +179,6 @@ lips4v_initialize(gx_device *dev)
     set_dev_proc(dev, fill_parallelogram, gdev_vector_fill_parallelogram);
     set_dev_proc(dev, fill_triangle, gdev_vector_fill_triangle);
     set_dev_proc(dev, begin_typed_image, lips4v_begin_typed_image);
-
-    return 0;
 }
 
 gx_device_lips4v far_data gs_lips4v_device = {
diff --git a/contrib/opvp/gdevopvp.c b/contrib/opvp/gdevopvp.c
index 6d9793478..844b46cd3 100644
--- a/contrib/opvp/gdevopvp.c
+++ b/contrib/opvp/gdevopvp.c
@@ -296,13 +296,10 @@ gs_public_st_suffix_add0_final(
     NULL /* *docInfo */
 
 /* device procs */
-static int
-opvp_initialize(gx_device *dev)
+static void
+opvp_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs(dev);
 
     set_dev_proc(dev, open_device, opvp_open);
     set_dev_proc(dev, get_initial_matrix, opvp_get_initial_matrix);
@@ -328,8 +325,6 @@ opvp_initialize(gx_device *dev)
      * by the system to the default. For compatibility we do the same. */
     set_dev_proc(dev, encode_color, NULL);
     set_dev_proc(dev, decode_color, NULL);
-
-    return 0;
 }
 
 /* vector procs */
@@ -364,7 +359,7 @@ const   gx_device_opvp          gs_opvp_device =
 {
     std_device_dci_type_body(
         gx_device_opvp,
-        opvp_initialize,
+        opvp_initialize_device_procs,
         "opvp",
         &st_device_opvp,
         DEFAULT_WIDTH_10THS_A4  * X_DPI / 10,
@@ -381,13 +376,10 @@ const   gx_device_opvp          gs_opvp_device =
 };
 
 /* for inkjet */
-static int
-oprp_initialize(gx_device *dev)
+static void
+oprp_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs(dev);
 
     set_dev_proc(dev, open_device, oprp_open);
     set_dev_proc(dev, output_page, opvp_output_page);
@@ -402,15 +394,13 @@ oprp_initialize(gx_device *dev)
      * by the system to the default. For compatibility we do the same. */
     set_dev_proc(dev, encode_color, NULL);
     set_dev_proc(dev, decode_color, NULL);
-
-    return 0;
 }
 
 const gx_device_oprp gs_oprp_device =
 {
     prn_device_std_margins_body(
         gx_device_oprp,
-        oprp_initialize,
+        oprp_initialize_device_procs,
         "oprp",
         DEFAULT_WIDTH_10THS_A4,
         DEFAULT_HEIGHT_10THS_A4,
diff --git a/contrib/pcl3/src/gdevpcl3.c b/contrib/pcl3/src/gdevpcl3.c
index 2f964b4ae..5e3e8f802 100644
--- a/contrib/pcl3/src/gdevpcl3.c
+++ b/contrib/pcl3/src/gdevpcl3.c
@@ -93,13 +93,10 @@ static dev_proc_get_params(pcl3_get_params);
 static dev_proc_put_params(pcl3_put_params);
 
 /* Device procedures */
-static int
-eprn_initialize(gx_device *dev)
+static void
+eprn_initialize_device_procs(gx_device *dev)
 {
-    int code = gdev_prn_initialize(dev);
-
-    if (code < 0)
-        return code;
+    gdev_prn_initialize_device_procs(dev);
 
     set_dev_proc(dev, open_device, pcl3_open_device);
     set_dev_proc(dev, get_initial_matrix, eprn_get_initial_matrix);
@@ -110,8 +107,6 @@ eprn_initialize(gx_device *dev)
     set_dev_proc(dev, get_params, pcl3_get_params);
     set_dev_proc(dev, put_params, pcl3_put_params);
     set_dev_proc(dev, fillpage, eprn_fillpage);
-
-    return 0;
 };
 
 /* prn procedure implementations */
@@ -145,7 +140,7 @@ static void pcl3_flag_mismatch_reporter(
   pcl3_Device gs_##dname##_device = {                           \
     eprn_device_initdata(                                       \
       pcl3_Device,      /* device type */                       \
-      eprn_initialize,  /* initialize pointer */                \
+      eprn_initialize_device_procs, /* initialize dev_procs */  \
       #dname,           /* device name */                       \
       300.0, 300.0,     /* horizontal and vertical resolution */\
       pcl3_print_page,  /* print page routine */                \