diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-07-16 10:43:01 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-07-16 10:43:01 -0400 |
| commit | 614efb7a87f1dd4626e158709944f9e649fea0ba (patch) | |
| tree | d00d6fe4ff822e73a0998d57e53552fb62d5eece /scheduler | |
| parent | c5dcd7ecffa6ec2575424d67b0937fc39230f706 (diff) | |
| download | cups-614efb7a87f1dd4626e158709944f9e649fea0ba.tar.gz | |
Don't default printer-info, printer-location, printer-geo-location (Issue #5603)
Diffstat (limited to 'scheduler')
| -rw-r--r-- | scheduler/printers.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/scheduler/printers.c b/scheduler/printers.c index 3fb46dc89..75ef4c0d2 100644 --- a/scheduler/printers.c +++ b/scheduler/printers.c @@ -1072,8 +1072,7 @@ cupsdLoadAllPrinters(void) } else if (!_cups_strcasecmp(line, "Info")) { - if (value) - cupsdSetString(&p->info, value); + cupsdSetString(&p->info, value ? value : ""); } else if (!_cups_strcasecmp(line, "MakeModel")) { @@ -1082,23 +1081,19 @@ cupsdLoadAllPrinters(void) } else if (!_cups_strcasecmp(line, "Location")) { - if (value) - cupsdSetString(&p->location, value); + cupsdSetString(&p->location, value ? value : ""); } else if (!_cups_strcasecmp(line, "GeoLocation")) { - if (value) - cupsdSetString(&p->geo_location, value); + cupsdSetString(&p->geo_location, value ? value : ""); } else if (!_cups_strcasecmp(line, "Organization")) { - if (value) - cupsdSetString(&p->organization, value); + cupsdSetString(&p->organization, value ? value : ""); } else if (!_cups_strcasecmp(line, "OrganizationalUnit")) { - if (value) - cupsdSetString(&p->organizational_unit, value); + cupsdSetString(&p->organizational_unit, value ? value : ""); } else if (!_cups_strcasecmp(line, "DeviceURI")) { |