diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-01-10 17:01:44 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-01-10 17:01:44 +0000 |
| commit | 0fa6c7fa54164ee70ee9ccfa936b889a637d5ecd (patch) | |
| tree | d84095ec3813ddd6d09ac71499ab00df3f9450f2 /cups/ipp-support.c | |
| parent | c1420c8744235de1249c34b956b7c11ccafd659d (diff) | |
Merge changes from CUPS 1.7svn-r10791.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4120 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/ipp-support.c')
| -rw-r--r-- | cups/ipp-support.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cups/ipp-support.c b/cups/ipp-support.c index dfe610352..28abbba00 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -777,8 +777,8 @@ ippEnumString(const char *attrname, /* I - Attribute name */ if (!strcmp(attrname, "document-state") && enumvalue >= 3 && - enumvalue <= (3 + (int)(sizeof(ipp_document_states) / - sizeof(ipp_document_states[0])))) + enumvalue < (3 + (int)(sizeof(ipp_document_states) / + sizeof(ipp_document_states[0])))) return (ipp_document_states[enumvalue - 3]); else if (!strcmp(attrname, "finishings") || !strcmp(attrname, "finishings-actual") || @@ -787,8 +787,8 @@ ippEnumString(const char *attrname, /* I - Attribute name */ !strcmp(attrname, "finishings-supported")) { if (enumvalue >= 3 && - enumvalue <= (3 + (int)(sizeof(ipp_finishings) / - sizeof(ipp_finishings[0])))) + enumvalue < (3 + (int)(sizeof(ipp_finishings) / + sizeof(ipp_finishings[0])))) return (ipp_finishings[enumvalue - 3]); else if (enumvalue >= 0x40000000 && enumvalue <= (0x40000000 + (int)(sizeof(ipp_finishings_vendor) / @@ -798,8 +798,8 @@ ippEnumString(const char *attrname, /* I - Attribute name */ else if ((!strcmp(attrname, "job-collation-type") || !strcmp(attrname, "job-collation-type-actual")) && enumvalue >= 3 && - enumvalue <= (3 + (int)(sizeof(ipp_job_collation_types) / - sizeof(ipp_job_collation_types[0])))) + enumvalue < (3 + (int)(sizeof(ipp_job_collation_types) / + sizeof(ipp_job_collation_types[0])))) return (ipp_job_collation_types[enumvalue - 3]); else if (!strcmp(attrname, "job-state") && enumvalue >= IPP_JOB_PENDING && enumvalue <= IPP_JOB_COMPLETED) @@ -811,16 +811,16 @@ ippEnumString(const char *attrname, /* I - Attribute name */ !strcmp(attrname, "orientation-requested-default") || !strcmp(attrname, "orientation-requested-supported")) && enumvalue >= 3 && - enumvalue <= (3 + (int)(sizeof(ipp_orientation_requesteds) / - sizeof(ipp_orientation_requesteds[0])))) + enumvalue < (3 + (int)(sizeof(ipp_orientation_requesteds) / + sizeof(ipp_orientation_requesteds[0])))) return (ipp_orientation_requesteds[enumvalue - 3]); else if ((!strcmp(attrname, "print-quality") || !strcmp(attrname, "print-quality-actual") || !strcmp(attrname, "print-quality-default") || !strcmp(attrname, "print-quality-supported")) && enumvalue >= 3 && - enumvalue <= (3 + (int)(sizeof(ipp_print_qualities) / - sizeof(ipp_print_qualities[0])))) + enumvalue < (3 + (int)(sizeof(ipp_print_qualities) / + sizeof(ipp_print_qualities[0])))) return (ipp_print_qualities[enumvalue - 3]); else if (!strcmp(attrname, "printer-state") && enumvalue >= IPP_PRINTER_IDLE && enumvalue <= IPP_PRINTER_STOPPED) |