diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-05-12 18:20:10 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-05-12 18:20:10 +0000 |
| commit | 969307f09661cc4884f54b3e5742b9768516d2a0 (patch) | |
| tree | 5ce8cca14294df846298680d64edde3b096afc08 /backend/snmp-supplies.c | |
| parent | a0f6818ebf8158b4640a77e6dc53af36971b1d5f (diff) | |
Merge fixes from CUPS 1.4svn-r7555.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@755 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'backend/snmp-supplies.c')
| -rw-r--r-- | backend/snmp-supplies.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/backend/snmp-supplies.c b/backend/snmp-supplies.c index ef68dbcd0..366750928 100644 --- a/backend/snmp-supplies.c +++ b/backend/snmp-supplies.c @@ -142,7 +142,7 @@ backendSNMPSupplies( backend_init_supplies(snmp_fd, addr); else if (num_supplies > 0) _cupsSNMPWalk(snmp_fd, ¤t_addr, CUPS_SNMP_VERSION_1, - _cupsSNMPDefaultCommunity(), prtMarkerSuppliesLevel, 500, + _cupsSNMPDefaultCommunity(), prtMarkerSuppliesLevel, 0.5, backend_walk_cb, NULL); if (page_count) @@ -183,7 +183,7 @@ backendSNMPSupplies( hrPrinterDetectedErrorState)) return (-1); - if (!_cupsSNMPRead(snmp_fd, &packet, 500) || + if (!_cupsSNMPRead(snmp_fd, &packet, 0.5) || packet.object_type != CUPS_ASN1_OCTET_STRING) return (-1); @@ -266,7 +266,7 @@ backendSNMPSupplies( hrPrinterStatus)) return (-1); - if (!_cupsSNMPRead(snmp_fd, &packet, 500) || + if (!_cupsSNMPRead(snmp_fd, &packet, 0.5) || packet.object_type != CUPS_ASN1_INTEGER) return (-1); @@ -284,7 +284,7 @@ backendSNMPSupplies( prtMarkerLifeCount)) return (-1); - if (!_cupsSNMPRead(snmp_fd, &packet, 500) || + if (!_cupsSNMPRead(snmp_fd, &packet, 0.5) || packet.object_type != CUPS_ASN1_COUNTER) return (-1); @@ -377,7 +377,7 @@ backend_init_supplies( hrDeviceDescr)) return; - if (!_cupsSNMPRead(snmp_fd, &packet, 500) || + if (!_cupsSNMPRead(snmp_fd, &packet, 0.5) || packet.object_type != CUPS_ASN1_OCTET_STRING) { strlcpy(description, "Unknown", sizeof(description)); @@ -441,7 +441,7 @@ backend_init_supplies( */ _cupsSNMPWalk(snmp_fd, ¤t_addr, CUPS_SNMP_VERSION_1, - _cupsSNMPDefaultCommunity(), prtMarkerSuppliesEntry, 500, + _cupsSNMPDefaultCommunity(), prtMarkerSuppliesEntry, 0.5, backend_walk_cb, NULL); } @@ -475,7 +475,7 @@ backend_init_supplies( strcpy(supplies[i].color, "none"); _cupsSNMPWalk(snmp_fd, ¤t_addr, CUPS_SNMP_VERSION_1, - _cupsSNMPDefaultCommunity(), prtMarkerColorantValue, 500, + _cupsSNMPDefaultCommunity(), prtMarkerColorantValue, 0.5, backend_walk_cb, NULL); /* |