Change (argc < 6 || argc > 7) to (argc != 6 && argc != 7)

They both do the same thing, but the latter is more clear.

diff --git a/backend/lpd.c b/backend/lpd.c
index af68c958dbc0d717da0e0f5e37f138217e801e33..26e84171bdf48a3ffe9ee790be0d23bfc49660c4 100644 (file)
--- a/backend/lpd.c
+++ b/backend/lpd.c
@@ -165,7 +165,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
            _cupsLangString(cupsLangDefault(), _("LPD/LPR Host or Printer")));
     return (CUPS_BACKEND_OK);
   }
-  else if (argc < 6 || argc > 7)
+  else if (argc != 6 && argc != 7)
   {
     _cupsLangPrintf(stderr,
                     _("Usage: %s job-id user title copies options [file]"),

diff --git a/backend/socket.c b/backend/socket.c
index 68379e95b7b47639561c5637205718813ff2e1bc..05ee1925c0ecf1d2345ea656055e74b68d7f7758 100644 (file)
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -113,7 +113,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
            _cupsLangString(cupsLangDefault(), _("AppSocket/HP JetDirect")));
     return (CUPS_BACKEND_OK);
   }
-  else if (argc < 6 || argc > 7)
+  else if (argc != 6 && argc != 7)
   {
     _cupsLangPrintf(stderr,
                     _("Usage: %s job-id user title copies options [file]"),

diff --git a/backend/usb.c b/backend/usb.c
index e1b2c03dc9af22f27e0013d779b4728e1a2468b3..a78bb3ee515e386c727382e1f78a72b41398232e 100644 (file)
--- a/backend/usb.c
+++ b/backend/usb.c
@@ -164,7 +164,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
     list_devices();
     return (CUPS_BACKEND_OK);
   }
-  else if (argc < 6 || argc > 7)
+  else if (argc != 6 && argc != 7)
   {
     _cupsLangPrintf(stderr,
                     _("Usage: %s job-id user title copies options [file]"),

diff --git a/filter/commandtops.c b/filter/commandtops.c
index 3edcc6a0c314e10dfdef84834a158e7850416e3e..829fc95561d05fe282723990198adbcf5fc121eb 100644 (file)
--- a/filter/commandtops.c
+++ b/filter/commandtops.c
@@ -46,7 +46,7 @@ main(int  argc,                               /* I - Number of command-line arguments */
   * Check for valid arguments...
   */
 
-  if (argc < 6 || argc > 7)
+  if (argc != 6 && argc != 7)
   {
    /*
     * We don't have the correct number of arguments; write an error message

diff --git a/filter/gziptoany.c b/filter/gziptoany.c
index c2c8bc00d3dc938d5b3b38aec78f9f6203eb2a8c..78b7ebbd2d33b9d2c4c903a671408e4ae1f5964d 100644 (file)
--- a/filter/gziptoany.c
+++ b/filter/gziptoany.c
@@ -34,7 +34,7 @@ main(int  argc,                               /* I - Number of command-line arguments */
   * Check command-line...
   */
 
-  if (argc < 6 || argc > 7)
+  if (argc != 6 && argc != 7)
   {
     _cupsLangPrintf(stderr,
                     _("Usage: %s job-id user title copies options [file]"),

diff --git a/filter/pstops.c b/filter/pstops.c
index d251abb0e78f74820049ef3d9698b96d8f8c1024..5b7aeb5cd7d3bc66a6b6e893299a8c95e0b9c234 100644 (file)
--- a/filter/pstops.c
+++ b/filter/pstops.c
@@ -217,7 +217,7 @@ main(int  argc,                             /* I - Number of command-line args */
   * Check command-line...
   */
 
-  if (argc < 6 || argc > 7)
+  if (argc != 6 && argc != 7)
   {
     _cupsLangPrintf(stderr,
                     _("Usage: %s job-id user title copies options [file]"),

diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c
index be3bd5e0e16db95845a945f78313b49592390637..c815691dc71e247b1a47025005b9c0fc167a4265 100644 (file)
--- a/filter/rastertoepson.c
+++ b/filter/rastertoepson.c
@@ -988,7 +988,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
   * Check command-line...
   */
 
-  if (argc < 6 || argc > 7)
+  if (argc != 6 && argc != 7)
   {
    /*
     * We don't have the correct number of arguments; write an error message

diff --git a/filter/rastertohp.c b/filter/rastertohp.c
index 31ee0c4c9891a0cee34e47cbbf6494286bfc37d6..dd042167f8491151b3ee229a40a6a209195c7f6e 100644 (file)
--- a/filter/rastertohp.c
+++ b/filter/rastertohp.c
@@ -657,7 +657,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
   * Check command-line...
   */
 
-  if (argc < 6 || argc > 7)
+  if (argc != 6 && argc != 7)
   {
    /*
     * We don't have the correct number of arguments; write an error message

diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c
index 73ac4d76eb9c8ebaedb0e8dc78280ed9274f8785..a8c1b0b1b0e27984d80125228ce29c70547ff28b 100644 (file)
--- a/filter/rastertolabel.c
+++ b/filter/rastertolabel.c
@@ -1110,7 +1110,7 @@ main(int  argc,                           /* I - Number of command-line arguments */
   * Check command-line...
   */
 
-  if (argc < 6 || argc > 7)
+  if (argc != 6 && argc != 7)
   {
    /*
     * We don't have the correct number of arguments; write an error message

diff --git a/filter/rastertopwg.c b/filter/rastertopwg.c
index d56cecda15dc1bfb8eaefdf055ba3c9090891664..6e0ccf2312d828e662f6336a3e06b75ec8af6a78 100644 (file)
--- a/filter/rastertopwg.c
+++ b/filter/rastertopwg.c
@@ -56,7 +56,7 @@ main(int  argc,                               /* I - Number of command-line args */
   const char           *val;           /* Option value */
 
 
-  if (argc < 6 || argc > 7)
+  if (argc != 6 && argc != 7)
   {
     puts("Usage: rastertopwg job user title copies options [filename]");
     return (1);

diff --git a/monitor/bcp.c b/monitor/bcp.c
index 42c095ad1289bf4da3a5411f69b119b33e3bcebe..26d4a45c7a0bf0779d14d00395cdf7c78784c1b3 100644 (file)
--- a/monitor/bcp.c
+++ b/monitor/bcp.c
@@ -42,7 +42,7 @@ main(int  argc,                               /* I - Number of command-line args */
   * Check command-line...
   */
 
-  if (argc < 6 || argc > 7)
+  if (argc != 6 && argc != 7)
   {
     _cupsLangPrintf(stderr,
                     _("Usage: %s job-id user title copies options [file]"),

diff --git a/monitor/tbcp.c b/monitor/tbcp.c
index 20c5dcfb9c2b7f9e136af050b0d1b4df6764df96..c36a812cda6c3d3bd9bff331a0c9fcbb5eed291e 100644 (file)
--- a/monitor/tbcp.c
+++ b/monitor/tbcp.c
@@ -41,7 +41,7 @@ main(int  argc,                               /* I - Number of command-line args */
   * Check command-line...
   */
 
-  if (argc < 6 || argc > 7)
+  if (argc != 6 && argc != 7)
   {
     _cupsLangPrintf(stderr,
                     _("Usage: %s job-id user title copies options [file]"),