Skip to content

Commit 6b1a7bc

Browse files
committed
Silenced warnings
Removed unneeded NULL checks on non-pointer fields in struct.
1 parent 924e1e6 commit 6b1a7bc

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

ppd/ppd-filter.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ ppdFilterLoadPPD(cf_filter_data_t *data) // I/O - Job and printer data
470470
choice = ppdFindMarkedChoice(ppd, ppd_attr->value);
471471
else if ((choice = ppdFindMarkedChoice(ppd, "ColorModel")) == NULL)
472472
choice = ppdFindMarkedChoice(ppd, "ColorSpace");
473-
if (choice && choice->choice && choice->choice[0])
473+
if (choice && choice->choice[0])
474474
q1_choice = choice->choice;
475475
else
476476
q1_choice = "";
@@ -481,7 +481,7 @@ ppdFilterLoadPPD(cf_filter_data_t *data) // I/O - Job and printer data
481481
choice = ppdFindMarkedChoice(ppd, ppd_attr->value);
482482
else
483483
choice = ppdFindMarkedChoice(ppd, "MediaType");
484-
if (choice && choice->choice && choice->choice[0])
484+
if (choice && choice->choice[0])
485485
q2_choice = choice->choice;
486486
else
487487
q2_choice = "";
@@ -492,7 +492,7 @@ ppdFilterLoadPPD(cf_filter_data_t *data) // I/O - Job and printer data
492492
choice = ppdFindMarkedChoice(ppd, ppd_attr->value);
493493
else
494494
choice = ppdFindMarkedChoice(ppd, "Resolution");
495-
if (choice && choice->choice && choice->choice[0])
495+
if (choice && choice->choice[0])
496496
q3_choice = choice->choice;
497497
else
498498
{
@@ -536,7 +536,7 @@ ppdFilterLoadPPD(cf_filter_data_t *data) // I/O - Job and printer data
536536
ppd_attr = ppdFindNextAttr(ppd, cm_profile_key, NULL))
537537
{
538538
// Invalid entry
539-
if (ppd_attr->spec == NULL || ppd_attr->value == NULL)
539+
if (ppd_attr->value == NULL)
540540
continue;
541541

542542
// Matches the qualifier

ppd/ppd-ipp.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,7 +1393,7 @@ ppdLoadAttributes(
13931393
if (is_texttotext)
13941394
{
13951395
if ((ppd_choice = ppdFindMarkedChoice(ppd, "OverLongLines")) != NULL &&
1396-
ppd_choice->choice && ppd_choice->choice[0])
1396+
ppd_choice->choice[0])
13971397
{
13981398
ppdPwgUnppdizeName(ppd_choice->choice, buf, sizeof(buf), NULL);
13991399
ippAddString(attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
@@ -1406,7 +1406,7 @@ ppdLoadAttributes(
14061406
"tab-width-default", i);
14071407

14081408
if ((ppd_choice = ppdFindMarkedChoice(ppd, "Pagination")) != NULL &&
1409-
ppd_choice->choice && ppd_choice->choice[0])
1409+
ppd_choice->choice[0])
14101410
{
14111411
ppdPwgUnppdizeName(ppd_choice->choice, buf, sizeof(buf), NULL);
14121412
ippAddString(attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
@@ -1434,20 +1434,20 @@ ppdLoadAttributes(
14341434
"page-bottom-default", i);
14351435

14361436
if ((ppd_choice = ppdFindMarkedChoice(ppd, "PrinterEncoding")) != NULL &&
1437-
ppd_choice->choice && ppd_choice->choice[0])
1437+
ppd_choice->choice[0])
14381438
ippAddString(attrs, IPP_TAG_PRINTER, IPP_TAG_TEXT,
14391439
"printer-encoding-default", NULL, ppd_choice->choice);
14401440

14411441
if ((ppd_choice = ppdFindMarkedChoice(ppd, "NewlineCharacters")) != NULL &&
1442-
ppd_choice->choice && ppd_choice->choice[0])
1442+
ppd_choice->choice[0])
14431443
{
14441444
ppdPwgUnppdizeName(ppd_choice->choice, buf, sizeof(buf), NULL);
14451445
ippAddString(attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
14461446
"newline-characters-default", NULL, buf);
14471447
}
14481448

14491449
if ((ppd_choice = ppdFindMarkedChoice(ppd, "SendFF")) != NULL &&
1450-
ppd_choice->choice && ppd_choice->choice[0])
1450+
ppd_choice->choice[0])
14511451
{
14521452
ppdPwgUnppdizeName(ppd_choice->choice, buf, sizeof(buf), NULL);
14531453
ippAddString(attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,

0 commit comments

Comments
 (0)