Save work on localization changes - prep for new bundle-based localizations,

[thirdparty/cups.git] / filter / texttops.c

diff --git a/filter/texttops.c b/filter/texttops.c
index fb5e30bf38fd54d0c6c5d8b3a34e2caed488f7d1..970964e418c1fc8fceb1a414cdde0f0deba801e4 100644 (file)
--- a/filter/texttops.c
+++ b/filter/texttops.c
@@ -176,13 +176,28 @@ WriteProlog(const char *title,            /* I - Title of job */
   if (SizeColumns <= 0 || SizeColumns > 32767 ||
       SizeLines <= 0 || SizeLines > 32767)
   {
-    _cupsLangPrintf(stderr, _("ERROR: Unable to print %dx%d text page\n"),
-                    SizeColumns, SizeLines);
+    _cupsLangPrintFilter(stderr, "ERROR",
+                         _("Unable to print %dx%d text page.\n"),
+                         SizeColumns, SizeLines);
+    exit(1);
+  }
+
+  if ((Page = calloc(sizeof(lchar_t *), SizeLines)) == NULL)
+  {
+    _cupsLangPrintFilter(stderr, "ERROR",
+                         _("Unable to print %dx%d text page.\n"),
+                         SizeColumns, SizeLines);
+    exit(1);
+  }
+
+  if ((Page[0] = calloc(sizeof(lchar_t), SizeColumns * SizeLines)) == NULL)
+  {
+    _cupsLangPrintFilter(stderr, "ERROR",
+                         _("Unable to print %dx%d text page.\n"),
+                         SizeColumns, SizeLines);
     exit(1);
   }
 
-  Page    = calloc(sizeof(lchar_t *), SizeLines);
-  Page[0] = calloc(sizeof(lchar_t), SizeColumns * SizeLines);
   for (i = 1; i < SizeLines; i ++)
     Page[i] = Page[0] + i * SizeColumns;
 
@@ -197,8 +212,8 @@ WriteProlog(const char *title,              /* I - Title of job */
 
   if (ColumnWidth <= 0)
   {
-    _cupsLangPrintf(stderr, _("ERROR: Unable to print %d text columns\n"),
-                    PageColumns);
+    _cupsLangPrintFilter(stderr, "ERROR",
+                         _("Unable to print %d text columns.\n"), PageColumns);
     exit(1);
   }