Skip to content

Commit ac1da20

Browse files
michaelrsweetmichaelrsweet
committed
Switch to using true instead of 1 for _cupsSetError calls.
1 parent 168a323 commit ac1da20

1 file changed

Lines changed: 24 additions & 24 deletions

File tree

‎cups/ipp.c‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5300,7 +5300,7 @@ ipp_read_io(void *src, // I - Data source
53005300
}
53015301
else if (tag == IPP_TAG_ZERO || (tag == IPP_TAG_OPERATION && ipp->curtag != IPP_TAG_ZERO))
53025302
{
5303-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Invalid group tag."), 1);
5303+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Invalid group tag."), true);
53045304
DEBUG_printf("1ipp_read_io: bad tag 0x%02x.", tag);
53055305
goto rollback;
53065306
}
@@ -5309,7 +5309,7 @@ ipp_read_io(void *src, // I - Data source
53095309
// Group tag... Set the current group and continue...
53105310
if (parent)
53115311
{
5312-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Invalid group tag."), 1);
5312+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Invalid group tag."), true);
53135313
DEBUG_printf("1ipp_read_io: bad tag 0x%02x.", tag);
53145314
goto rollback;
53155315
}
@@ -5342,7 +5342,7 @@ ipp_read_io(void *src, // I - Data source
53425342

53435343
if (n >= IPP_BUF_SIZE)
53445344
{
5345-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP name larger than 32767 bytes."), 1);
5345+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP name larger than 32767 bytes."), true);
53465346
DEBUG_printf("1ipp_read_io: bad name length %d.", n);
53475347
goto rollback;
53485348
}
@@ -5351,7 +5351,7 @@ ipp_read_io(void *src, // I - Data source
53515351

53525352
if (n && parent)
53535353
{
5354-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Invalid named IPP attribute in collection."), 1);
5354+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Invalid named IPP attribute in collection."), true);
53555355
DEBUG_puts("1ipp_read_io: bad attribute name in collection.");
53565356
goto rollback;
53575357
}
@@ -5360,7 +5360,7 @@ ipp_read_io(void *src, // I - Data source
53605360
// More values for current attribute...
53615361
if (ipp->current == NULL)
53625362
{
5363-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP attribute has no name."), 1);
5363+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP attribute has no name."), true);
53645364
DEBUG_puts("1ipp_read_io: Attribute without name and no current.");
53655365
goto rollback;
53665366
}
@@ -5379,7 +5379,7 @@ ipp_read_io(void *src, // I - Data source
53795379
// String values can sometimes come across in different forms; accept sets of differing values...
53805380
if (tag != IPP_TAG_TEXTLANG && tag != IPP_TAG_NAMELANG && (tag < IPP_TAG_TEXT || tag > IPP_TAG_MIMETYPE) && tag != IPP_TAG_NOVALUE)
53815381
{
5382-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP 1setOf attribute with incompatible value tags."), 1);
5382+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP 1setOf attribute with incompatible value tags."), true);
53835383
DEBUG_printf("1ipp_read_io: 1setOf value tag %x(%s) != %x(%s)", value_tag, ippTagString(value_tag), tag, ippTagString(tag));
53845384
goto rollback;
53855385
}
@@ -5396,7 +5396,7 @@ ipp_read_io(void *src, // I - Data source
53965396
// Integer and rangeOfInteger values can sometimes be mixed; accept sets of differing values...
53975397
if (tag != IPP_TAG_INTEGER && tag != IPP_TAG_RANGE)
53985398
{
5399-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP 1setOf attribute with incompatible value tags."), 1);
5399+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP 1setOf attribute with incompatible value tags."), true);
54005400
DEBUG_printf("1ipp_read_io: 1setOf value tag %x(%s) != %x(%s)", value_tag, ippTagString(value_tag), tag, ippTagString(tag));
54015401
goto rollback;
54025402
}
@@ -5410,7 +5410,7 @@ ipp_read_io(void *src, // I - Data source
54105410
}
54115411
else if (value_tag != tag)
54125412
{
5413-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP 1setOf attribute with incompatible value tags."), 1);
5413+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP 1setOf attribute with incompatible value tags."), true);
54145414
DEBUG_printf("1ipp_read_io: value tag %x(%s) != %x(%s)", value_tag, ippTagString(value_tag), tag, ippTagString(tag));
54155415
goto rollback;
54165416
}
@@ -5424,13 +5424,13 @@ ipp_read_io(void *src, // I - Data source
54245424
// Name must be length 0!
54255425
if (n)
54265426
{
5427-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP member name is not empty."), 1);
5427+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP member name is not empty."), true);
54285428
DEBUG_puts("1ipp_read_io: member name not empty.");
54295429
goto rollback;
54305430
}
54315431
else if (!parent)
54325432
{
5433-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP member attribute outside of collection."), 1);
5433+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP member attribute outside of collection."), true);
54345434
DEBUG_puts("1ipp_read_io: member attribute outside of collection.");
54355435
goto rollback;
54365436
}
@@ -5493,7 +5493,7 @@ ipp_read_io(void *src, // I - Data source
54935493
if (n >= IPP_BUF_SIZE)
54945494
{
54955495
_cupsSetError(IPP_STATUS_ERROR_INTERNAL,
5496-
_("IPP value larger than 32767 bytes."), 1);
5496+
_("IPP value larger than 32767 bytes."), true);
54975497
DEBUG_printf("1ipp_read_io: bad value length %d.", n);
54985498
goto rollback;
54995499
}
@@ -5505,9 +5505,9 @@ ipp_read_io(void *src, // I - Data source
55055505
if (n != 4)
55065506
{
55075507
if (tag == IPP_TAG_INTEGER)
5508-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP integer value not 4 bytes."), 1);
5508+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP integer value not 4 bytes."), true);
55095509
else
5510-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP enum value not 4 bytes."), 1);
5510+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP enum value not 4 bytes."), true);
55115511
DEBUG_printf("1ipp_read_io: bad integer value length %d.", n);
55125512
goto rollback;
55135513
}
@@ -5588,7 +5588,7 @@ ipp_read_io(void *src, // I - Data source
55885588
case IPP_TAG_DATE :
55895589
if (n != 11)
55905590
{
5591-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP date value not 11 bytes."), 1);
5591+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP date value not 11 bytes."), true);
55925592
DEBUG_printf("1ipp_read_io: bad date value length %d.", n);
55935593
goto rollback;
55945594
}
@@ -5603,7 +5603,7 @@ ipp_read_io(void *src, // I - Data source
56035603
case IPP_TAG_RESOLUTION :
56045604
if (n != 9)
56055605
{
5606-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP resolution value not 9 bytes."), 1);
5606+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP resolution value not 9 bytes."), true);
56075607
DEBUG_printf("1ipp_read_io: bad resolution value length %d.", n);
56085608
goto rollback;
56095609
}
@@ -5623,7 +5623,7 @@ ipp_read_io(void *src, // I - Data source
56235623
case IPP_TAG_RANGE :
56245624
if (n != 8)
56255625
{
5626-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP rangeOfInteger value not 8 bytes."), 1);
5626+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP rangeOfInteger value not 8 bytes."), true);
56275627
DEBUG_printf("1ipp_read_io: bad rangeOfInteger value length %d.", n);
56285628
goto rollback;
56295629
}
@@ -5669,13 +5669,13 @@ ipp_read_io(void *src, // I - Data source
56695669

56705670
if ((bufptr + 2 + n + 2) > bufend || n >= (int)sizeof(string))
56715671
{
5672-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP language length overflows value."), 1);
5672+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP language length overflows value."), true);
56735673
DEBUG_printf("1ipp_read_io: bad language value length %d.", n);
56745674
goto rollback;
56755675
}
56765676
else if (n >= IPP_MAX_LANGUAGE)
56775677
{
5678-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP language length too large."), 1);
5678+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP language length too large."), true);
56795679
DEBUG_printf("1ipp_read_io: bad language value length %d.", n);
56805680
goto rollback;
56815681
}
@@ -5690,7 +5690,7 @@ ipp_read_io(void *src, // I - Data source
56905690

56915691
if ((bufptr + 2 + n) > bufend)
56925692
{
5693-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP string length overflows value."), 1);
5693+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP string length overflows value."), true);
56945694
DEBUG_printf("1ipp_read_io: bad string value length %d.", n);
56955695
goto rollback;
56965696
}
@@ -5705,7 +5705,7 @@ ipp_read_io(void *src, // I - Data source
57055705

57065706
if (n > 0)
57075707
{
5708-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP begCollection value not 0 bytes."), 1);
5708+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP begCollection value not 0 bytes."), true);
57095709
DEBUG_puts("1ipp_read_io: begCollection tag with value length > 0.");
57105710
goto rollback;
57115711
}
@@ -5720,7 +5720,7 @@ ipp_read_io(void *src, // I - Data source
57205720
case IPP_TAG_END_COLLECTION :
57215721
if (n > 0)
57225722
{
5723-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP endCollection value not 0 bytes."), 1);
5723+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP endCollection value not 0 bytes."), true);
57245724
DEBUG_puts("1ipp_read_io: endCollection tag with value length > 0.");
57255725
goto rollback;
57265726
}
@@ -5735,7 +5735,7 @@ ipp_read_io(void *src, // I - Data source
57355735
// we need to carry over...
57365736
if (n == 0)
57375737
{
5738-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP memberName value is empty."), 1);
5738+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP memberName value is empty."), true);
57395739
DEBUG_puts("1ipp_read_io: Empty member name value.");
57405740
goto rollback;
57415741
}
@@ -5760,7 +5760,7 @@ ipp_read_io(void *src, // I - Data source
57605760
default : // Other unsupported values
57615761
if (tag == IPP_TAG_STRING && n > IPP_MAX_LENGTH)
57625762
{
5763-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP octetString length too large."), 1);
5763+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP octetString length too large."), true);
57645764
DEBUG_printf("1ipp_read_io: bad octetString value length %d.", n);
57655765
goto rollback;
57665766
}
@@ -5918,7 +5918,7 @@ ipp_set_value(ipp_t *ipp, // IO - IPP message
59185918
{
59195919
// This is a serious error!
59205920
*attr = temp;
5921-
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP attribute is not a member of the message."), 1);
5921+
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("IPP attribute is not a member of the message."), true);
59225922
DEBUG_puts("4ipp_set_value: Unable to find attribute in message.");
59235923
return (NULL);
59245924
}

0 commit comments

Comments
 (0)