Ignore generated files.

[thirdparty/cups.git] / systemv / lpinfo.c

diff --git a/systemv/lpinfo.c b/systemv/lpinfo.c
index 025db791aa789187b31a936031ead8a7fc071a84..acfe50108d9ed71b0dc51d9341990163b9cb055b 100644 (file)
--- a/systemv/lpinfo.c
+++ b/systemv/lpinfo.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpinfo.c 7810 2008-07-29 01:11:15Z mike $"
+ * "$Id$"
  *
  *   "lpinfo" command for CUPS.
  *
@@ -85,7 +85,7 @@ main(int  argc,                               /* I - Number of command-line arguments */
            cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
 #else
             _cupsLangPrintf(stderr,
-                           _("%s: Sorry, no encryption support compiled in\n"),
+                           _("%s: Sorry, no encryption support."),
                            argv[0]);
 #endif /* HAVE_SSL */
            break;
@@ -100,7 +100,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
              if (i >= argc)
              {
                _cupsLangPuts(stderr,
-                             _("Error: need hostname after \'-h\' option\n"));
+                             _("Error: need hostname after \"-h\" option."));
                return (1);
               }
 
@@ -135,7 +135,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
              {
                _cupsLangPuts(stderr,
                              _("lpinfo: Expected 1284 device ID string "
-                               "after --device-id\n"));
+                               "after \"--device-id\"."));
                return (1);
              }
            }
@@ -153,7 +153,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
              {
                _cupsLangPuts(stderr,
                              _("lpinfo: Expected scheme list after "
-                               "--exclude-schemes\n"));
+                               "\"--exclude-schemes\"."));
                return (1);
              }
            }
@@ -171,7 +171,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
              {
                _cupsLangPuts(stderr,
                              _("lpinfo: Expected scheme list after "
-                               "--include-schemes\n"));
+                               "\"--include-schemes\"."));
                return (1);
              }
            }
@@ -188,7 +188,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
              {
                _cupsLangPuts(stderr,
                              _("lpinfo: Expected language after "
-                               "--language\n"));
+                               "\"--language\"."));
                return (1);
              }
            }
@@ -205,7 +205,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
              {
                _cupsLangPuts(stderr,
                              _("lpinfo: Expected make and model after "
-                               "--make-and-model\n"));
+                               "\"--make-and-model\"."));
                return (1);
              }
            }
@@ -222,7 +222,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
              {
                _cupsLangPuts(stderr,
                              _("lpinfo: Expected product string after "
-                               "--product\n"));
+                               "\"--product\"."));
                return (1);
              }
            }
@@ -238,7 +238,8 @@ main(int  argc,                             /* I - Number of command-line arguments */
              else
              {
                _cupsLangPuts(stderr,
-                             _("lpinfo: Expected timeout after --timeout\n"));
+                             _("lpinfo: Expected timeout after "
+                               "\"--timeout\"."));
                return (1);
              }
            }
@@ -248,20 +249,20 @@ main(int  argc,                           /* I - Number of command-line arguments */
            }
            else
            {
-             _cupsLangPrintf(stderr, _("lpinfo: Unknown option \'%s\'\n"),
+             _cupsLangPrintf(stderr, _("lpinfo: Unknown option \"%s\"."),
                              argv[i]);
              return (1);
            }
            break;
 
        default :
-           _cupsLangPrintf(stderr, _("lpinfo: Unknown option \'%c\'\n"),
+           _cupsLangPrintf(stderr, _("lpinfo: Unknown option \"%c\"."),
                            argv[i][1]);
            return (1);
       }
     else
     {
-      _cupsLangPrintf(stderr, _("lpinfo: Unknown argument \'%s\'\n"),
+      _cupsLangPrintf(stderr, _("lpinfo: Unknown argument \"%s\"."),
                       argv[i]);
       return (1);
     }
@@ -301,12 +302,12 @@ device_cb(
                      "        info = %s\n"
                      "        make-and-model = %s\n"
                      "        device-id = %s\n"
-                     "        location = %s\n"),
+                     "        location = %s"),
                    device_uri, device_class, device_info,
                    device_make_and_model, device_id, device_location);
   }
   else
-    _cupsLangPrintf(stdout, "%s %s\n", device_class, device_uri);
+    _cupsLangPrintf(stdout, "%s %s", device_class, device_uri);
 }
 
 
@@ -324,7 +325,7 @@ show_devices(
   if (cupsGetDevices(CUPS_HTTP_DEFAULT, timeout, include_schemes,
                      exclude_schemes, device_cb, &long_status) != IPP_OK)
   {
-    _cupsLangPrintf(stderr, "lpinfo: %s\n", cupsLastErrorString());
+    _cupsLangPrintf(stderr, "lpinfo: %s", cupsLastErrorString());
     return (1);
   }
 
@@ -403,7 +404,7 @@ show_models(
 
     if (response->request.status.status_code > IPP_OK_CONFLICT)
     {
-      _cupsLangPrintf(stderr, "lpinfo: %s\n", cupsLastErrorString());
+      _cupsLangPrintf(stderr, "lpinfo: %s", cupsLastErrorString());
       ippDelete(response);
       return (1);
     }
@@ -469,11 +470,11 @@ show_models(
                        _("Model:  name = %s\n"
                          "        natural_language = %s\n"
                          "        make-and-model = %s\n"
-                         "        device-id = %s\n"),
+                         "        device-id = %s"),
                        ppd_name, ppd_language, ppd_make_model, ppd_device_id);
       }
       else
-        _cupsLangPrintf(stdout, "%s %s\n", ppd_name, ppd_make_model);
+        _cupsLangPrintf(stdout, "%s %s", ppd_name, ppd_make_model);
 
       if (attr == NULL)
         break;
@@ -483,7 +484,7 @@ show_models(
   }
   else
   {
-    _cupsLangPrintf(stderr, "lpinfo: %s\n", cupsLastErrorString());
+    _cupsLangPrintf(stderr, "lpinfo: %s", cupsLastErrorString());
 
     return (1);
   }
@@ -493,5 +494,5 @@ show_models(
 
 
 /*
- * End of "$Id: lpinfo.c 7810 2008-07-29 01:11:15Z mike $".
+ * End of "$Id$".
  */